Skip to content

Commit

Permalink
Image and video augmentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@shidende
shidende committed Oct 10, 2023
1 parent 627f530 commit 61fe179
Show file tree
Hide file tree
Showing 19 changed files with 10,864 additions and 879 deletions.
568 changes: 567 additions & 1 deletion Assets/MirageXR/Player/Prefabs/Other/ImagePrefab.prefab
View file

Large diffs are not rendered by default.

230 changes: 222 additions & 8 deletions Assets/MirageXR/Player/Prefabs/Other/VideoPrefab.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ MonoBehaviour:
_videoPlayerPortrait: {fileID: 2376565842892101925}
_audioSourceLandscape: {fileID: 3157208092819264192}
_audioSourcePortrait: {fileID: 8075781225508469744}
textCaption: {fileID: 5454303013087269590}
--- !u!65 &5609042133830193683
BoxCollider:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -464,7 +465,7 @@ RectTransform:
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -2.0999908, y: 0.068748}
m_SizeDelta: {x: 160, y: 24.662502}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -506,6 +507,141 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1980318396786567460
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2985633215248165475}
- component: {fileID: 9173040017780736719}
- component: {fileID: 5454303013087269590}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2985633215248165475
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1980318396786567460}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7184372600044767758}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -0.4, y: 6.007502}
m_SizeDelta: {x: 156.53, y: 12.02}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9173040017780736719
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1980318396786567460}
m_CullTransparentMesh: 1
--- !u!114 &5454303013087269590
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1980318396786567460}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: New Text
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 6
m_fontSizeBase: 6
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 2
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 2, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2922033339979592359
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -766,7 +902,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6435381599566030509
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -806,7 +942,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
Expand Down Expand Up @@ -1029,7 +1165,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5875089499470434264
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1069,7 +1205,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
Expand Down Expand Up @@ -1451,6 +1587,7 @@ RectTransform:
- {fileID: 5575754987389843026}
- {fileID: 6032778383644673925}
- {fileID: 6032778384582154038}
- {fileID: 7184372600044767758}
m_Father: {fileID: 5575754989155227191}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -2377,7 +2514,7 @@ RectTransform:
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -2.0999908, y: 0.068748}
m_SizeDelta: {x: 160, y: 24.662502}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -2453,7 +2590,7 @@ RectTransform:
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -0.39997745, y: -7.5}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -2495,6 +2632,83 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6347475564572232366
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7184372600044767758}
- component: {fileID: 6472862847103468120}
- component: {fileID: 4232269989191762370}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7184372600044767758
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6347475564572232366}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2985633215248165475}
m_Father: {fileID: 5575754988903563249}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 1.4, y: -38.993}
m_SizeDelta: {x: 161.79, y: 12.015}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6472862847103468120
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6347475564572232366}
m_CullTransparentMesh: 1
--- !u!114 &4232269989191762370
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6347475564572232366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.34117648}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7387277985595121549
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2529,7 +2743,7 @@ RectTransform:
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -0.39997745, y: -7.5}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down
17 changes: 16 additions & 1 deletion Assets/MirageXR/Player/Resources/Prefabs/UI/Mobile/Content/ContentEditors/ImageEditor.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab70bb6897cfb644d86ae5d7d2bf9d65, type: 3}
m_Name:
m_EditorClassIdentifier:
canBeClosedByOutTap: 1
_icon: {fileID: 2968142413625338888}
_txtLabel: {fileID: 7893652540055910048}
_btnAccept: {fileID: 5831186956329823257}
Expand All @@ -310,6 +309,22 @@ MonoBehaviour:
_btnCaptureImage: {fileID: 1685215001207776034}
_btnOpenGallery: {fileID: 6665180974283863580}
_toggleOrientation: {fileID: 330438416607440546}
_captionText: {fileID: 0}
_captionPreview: {fileID: 0}
_captionAdd: {fileID: 0}
_captionDone: {fileID: 0}
_captionEditBtn: {fileID: 0}
_captionSaveBtn: {fileID: 0}
_captionSaveBackBtn: {fileID: 0}
TopPanel: {fileID: 0}
BottomPanel: {fileID: 0}
ImageCaptionEditorPrefab: {fileID: 0}
ImageCaptionPreviewPrefab: {fileID: 0}
_btnArrow: {fileID: 0}
_panel: {fileID: 0}
_arrowDown: {fileID: 0}
_arrowUp: {fileID: 0}
_hintPrefab: {fileID: 0}
--- !u!114 &8371701705238998908
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
19 changes: 18 additions & 1 deletion Assets/MirageXR/Player/Resources/Prefabs/UI/Mobile/Content/ContentEditors/VideoEditor.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 39951ba103d907747970afe05f0baa72, type: 3}
m_Name:
m_EditorClassIdentifier:
canBeClosedByOutTap: 1
_icon: {fileID: 2968142413625338888}
_txtLabel: {fileID: 7893652540055910048}
_btnAccept: {fileID: 5831186956329823257}
Expand All @@ -265,6 +264,24 @@ MonoBehaviour:
_btnOpenGallery: {fileID: 8791471481971633058}
_toggleTrigger: {fileID: 8311966161546752781}
_toggleOrientation: {fileID: 1860030231941593399}
_btnArrow: {fileID: 0}
_panel: {fileID: 0}
_arrowDown: {fileID: 0}
_arrowUp: {fileID: 0}
_hintPrefab: {fileID: 0}
_backEditButton: {fileID: 0}
_backPreviewButton: {fileID: 0}
videoPlayer: {fileID: 0}
playButton: {fileID: 0}
editCaption: {fileID: 0}
doneEditCaption: {fileID: 0}
Toppanel: {fileID: 0}
Bottompanel: {fileID: 0}
VideoEditorPrefab: {fileID: 0}
VideoPreviePrefab: {fileID: 0}
_videoplayer: {fileID: 0}
captionGenerator: {fileID: 0}
_captionEdit: {fileID: 0}
--- !u!114 &8371701705238998908
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 61fe179

Please sign in to comment.