From 5c49ff27bc64e4e3871330f5c0fcf598a7be7e95 Mon Sep 17 00:00:00 2001 From: Nadine Ganz Date: Fri, 21 Jun 2024 17:11:07 +0200 Subject: [PATCH] Add screenshot feature as button in hand menu and controller grip button --- Viagg-io/Assets/Resources/BuildDateTime.txt | 2 +- .../Assets/Scenes/Test-HandInteraction.unity | 601 +++++++++++++++++- Viagg-io/Assets/Scenes/Test-Scene.unity | 10 +- Viagg-io/Assets/Scripts/Screenshot.cs | 37 ++ Viagg-io/Assets/Scripts/Screenshot.cs.meta | 11 + .../ProjectSettings/EditorBuildSettings.asset | 10 +- 6 files changed, 663 insertions(+), 8 deletions(-) create mode 100644 Viagg-io/Assets/Scripts/Screenshot.cs create mode 100644 Viagg-io/Assets/Scripts/Screenshot.cs.meta diff --git a/Viagg-io/Assets/Resources/BuildDateTime.txt b/Viagg-io/Assets/Resources/BuildDateTime.txt index c119470..6e6e146 100644 --- a/Viagg-io/Assets/Resources/BuildDateTime.txt +++ b/Viagg-io/Assets/Resources/BuildDateTime.txt @@ -1 +1 @@ -2024-06-19T12:17:04.0177370Z \ No newline at end of file +2024-06-21T15:02:41.9357660Z \ No newline at end of file diff --git a/Viagg-io/Assets/Scenes/Test-HandInteraction.unity b/Viagg-io/Assets/Scenes/Test-HandInteraction.unity index e603b3a..db901cc 100644 --- a/Viagg-io/Assets/Scenes/Test-HandInteraction.unity +++ b/Viagg-io/Assets/Scenes/Test-HandInteraction.unity @@ -730,6 +730,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554538647} m_CullTransparentMesh: 1 +--- !u!1 &582955979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 582955980} + m_Layer: 0 + m_Name: _HANDLERS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &582955980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 582955979} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.011165022, y: 0.041366577, z: -0.04790715} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1666833879} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &583388671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 583388672} + - component: {fileID: 583388674} + - component: {fileID: 583388673} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &583388672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 583388671} + 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: 1322038471} + m_Father: {fileID: 1676278356} + 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: 0, y: 0} + m_SizeDelta: {x: 0.8, y: 0.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &583388673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 583388671} + 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.17421682, g: 0.6809656, b: 0.8207547, 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_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!222 &583388674 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 583388671} + m_CullTransparentMesh: 1 --- !u!1 &796004280 GameObject: m_ObjectHideFlags: 0 @@ -899,7 +1007,7 @@ RectTransform: 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: 0, y: -0.036} + m_AnchoredPosition: {x: 0, y: -0.004} m_SizeDelta: {x: 0.8, y: 0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &886364714 @@ -1132,6 +1240,7 @@ RectTransform: m_Children: - {fileID: 288769800} - {fileID: 886364713} + - {fileID: 1676278356} m_Father: {fileID: 1970738700} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1685,6 +1794,272 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1205763226} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1302599254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1302599255} + - component: {fileID: 1302599256} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1302599255 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302599254} + 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: 1676278356} + 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: 0, y: 0.30800024} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!82 &1302599256 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302599254} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &1322038470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1322038471} + - component: {fileID: 1322038473} + - component: {fileID: 1322038472} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1322038471 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322038470} + 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: 583388672} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1322038472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322038470} + 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: Screenshot + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 0.1 + m_fontSizeBase: 0.1 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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!222 &1322038473 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322038470} + m_CullTransparentMesh: 1 --- !u!1 &1339180629 GameObject: m_ObjectHideFlags: 0 @@ -1787,6 +2162,229 @@ Transform: m_Children: [] m_Father: {fileID: 4297880242014464672} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!1 &1666833878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1666833879} + - component: {fileID: 1666833880} + - component: {fileID: 1666833881} + m_Layer: 0 + m_Name: Screenshot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1666833879 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666833878} + serializedVersion: 2 + 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: 582955980} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1666833880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666833878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfc0f0787805046ac82ed50e4fa7e869, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1666833881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666833878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f3657284cbc344c10b72aff76116332b, type: 3} + m_Name: + m_EditorClassIdentifier: + action: + m_Name: Action + m_Type: 0 + m_ExpectedControlType: + m_Id: c5c15fec-535d-489c-bfad-fbfd17e0e198 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: 21d9b1e2-c989-4cbc-b2fc-d2d362807535 + m_Path: {LeftHand}/gripButton + m_Interactions: + m_Processors: + m_Groups: + m_Action: Action + m_Flags: 0 + m_Flags: 0 + OnPress: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1666833880} + m_TargetAssemblyTypeName: Screenshot, Assembly-CSharp + m_MethodName: OnClickTakeScreenshot + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &1676278355 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1676278356} + - component: {fileID: 1676278359} + - component: {fileID: 1676278358} + - component: {fileID: 1676278357} + m_Layer: 0 + m_Name: Button3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1676278356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676278355} + 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: 583388672} + - {fileID: 1302599255} + m_Father: {fileID: 975139777} + 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: 0, y: -0.309} + m_SizeDelta: {x: 0.8, y: 0.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1676278357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676278355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07b3638c2f5db5b479ff24c2859713d4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PokeFollowTransform: {fileID: 583388672} + m_SmoothingSpeed: 16 + m_ReturnToInitialPosition: 1 + m_ApplyIfChildIsTarget: 1 + m_ClampToMaxDistance: 1 + m_MaxDistance: 20 +--- !u!114 &1676278358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676278355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.122774996, g: 0.6276188, b: 0.8396226, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 583388673} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1302599256} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: eeeda5dce5e1d344f8e2f6195f16cb38, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1666833880} + m_TargetAssemblyTypeName: Screenshot, Assembly-CSharp + m_MethodName: OnClickTakeScreenshot + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!222 &1676278359 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676278355} + m_CullTransparentMesh: 0 --- !u!4 &1724189810 stripped Transform: m_CorrespondingSourceObject: {fileID: 6857915713242953900, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} @@ -4203,3 +4801,4 @@ SceneRoots: - {fileID: 438189869} - {fileID: 1339180630} - {fileID: 1076927234} + - {fileID: 582955980} diff --git a/Viagg-io/Assets/Scenes/Test-Scene.unity b/Viagg-io/Assets/Scenes/Test-Scene.unity index 1dcc701..77a30cb 100644 --- a/Viagg-io/Assets/Scenes/Test-Scene.unity +++ b/Viagg-io/Assets/Scenes/Test-Scene.unity @@ -645,7 +645,7 @@ MonoBehaviour: overrideLogStringDisplay: 0 overrideDebugInternalActive: 0 overrideDebugChangesActive: 0 - instanceID: 118382 + instanceID: 78938 __behaviourTreeGenerator: {fileID: 0} taskScripts: - {fileID: 4900000, guid: f74616d1f798446b7bc3b431deb3a5cc, type: 3} @@ -2159,6 +2159,10 @@ PrefabInstance: propertyPath: m_Name value: CoryStudioDemoData_10sensor_Take03_Export04_Video01-5Mbps-bt709 objectReference: {fileID: 0} + - target: {fileID: 4763097669659078314, guid: 1230a02228fd8461b804220be13633e5, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5747397840377882803, guid: 1230a02228fd8461b804220be13633e5, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -2189,6 +2193,10 @@ PrefabInstance: propertyPath: m_Name value: CoryStudioDemoData_5sensor_Take01_Export03_Video01-5Mbps-bt709 objectReference: {fileID: 0} + - target: {fileID: 1650850521919443333, guid: ea436fa07dd3e4df1b468342eda892ac, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5150372403776852298, guid: ea436fa07dd3e4df1b468342eda892ac, type: 3} propertyPath: m_Materials.Array.data[0] value: diff --git a/Viagg-io/Assets/Scripts/Screenshot.cs b/Viagg-io/Assets/Scripts/Screenshot.cs new file mode 100644 index 0000000..4be8f0f --- /dev/null +++ b/Viagg-io/Assets/Scripts/Screenshot.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using System; + +public class Screenshot : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //StartCoroutine(TakeScreenshot()); + + /* if (Input.GetKeyDown(KeyCode.P)) + { + StartCoroutine(TakeScreenshot()); + } + */ + } + + public void OnClickTakeScreenshot() + { + StartCoroutine(TakeScreenshot()); + } + + IEnumerator TakeScreenshot() + { + yield return new WaitForEndOfFrame(); + string timpStamp = DateTime.Now.ToString("ddMMyyyyHHmmssffff"); + ScreenCapture.CaptureScreenshot("snapshot_" + timpStamp + ".png"); + } +} diff --git a/Viagg-io/Assets/Scripts/Screenshot.cs.meta b/Viagg-io/Assets/Scripts/Screenshot.cs.meta new file mode 100644 index 0000000..70c1644 --- /dev/null +++ b/Viagg-io/Assets/Scripts/Screenshot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cfc0f0787805046ac82ed50e4fa7e869 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/ProjectSettings/EditorBuildSettings.asset b/Viagg-io/ProjectSettings/EditorBuildSettings.asset index b035010..bdaf25e 100644 --- a/Viagg-io/ProjectSettings/EditorBuildSettings.asset +++ b/Viagg-io/ProjectSettings/EditorBuildSettings.asset @@ -5,12 +5,15 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Scenes/1.0-SBB.unity + guid: 6a1144d40bbf04513a9929856271d4e7 - enabled: 1 path: Assets/Scenes/Test-HandInteraction.unity guid: 6560c631efa4b492689f76d06071d916 - enabled: 1 - path: Assets/Scenes/1.0-SBB.unity - guid: 6a1144d40bbf04513a9929856271d4e7 + path: Assets/Scenes/Test-Scene.unity + guid: 5739d873cf7d24221bea4b568b59f9c1 - enabled: 1 path: Assets/Scenes/2.0-SBB.unity guid: 0492708372646415eb23036f23680178 @@ -77,9 +80,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/4.8-RBS.unity guid: 874ea9ab99ca1488b9df2832e7281f8b - - enabled: 1 - path: Assets/Scenes/Test-Scene.unity - guid: 5739d873cf7d24221bea4b568b59f9c1 m_configObjects: Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2} Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba, type: 2}