diff --git a/Assets/Materials/Furniture/24_Carat_GoldMaterial.mat b/Assets/Materials/Furniture/24_Carat_GoldMaterial.mat
index 550fe6ee..14d9b694 100644
--- a/Assets/Materials/Furniture/24_Carat_GoldMaterial.mat
+++ b/Assets/Materials/Furniture/24_Carat_GoldMaterial.mat
@@ -64,19 +64,34 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.695
- _GlossyReflections: 1
- - _Metallic: 0.839
+ - _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
diff --git a/Assets/Materials/Furniture/Black.mat b/Assets/Materials/Furniture/Black.mat
index 54c70e08..827a1e0b 100644
--- a/Assets/Materials/Furniture/Black.mat
+++ b/Assets/Materials/Furniture/Black.mat
@@ -97,7 +97,7 @@ Material:
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- - _Smoothness: 0.2
+ - _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
diff --git a/Assets/Materials/Furniture/Gray.mat b/Assets/Materials/Furniture/Gray.mat
index e9a291d7..9e924a16 100644
--- a/Assets/Materials/Furniture/Gray.mat
+++ b/Assets/Materials/Furniture/Gray.mat
@@ -64,12 +64,27 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
@@ -82,7 +97,7 @@ Material:
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- - _Smoothness: 0.5
+ - _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
diff --git a/Assets/Materials/Furniture/Metal_black.mat b/Assets/Materials/Furniture/Metal_black.mat
index 9f005300..e93545a0 100644
--- a/Assets/Materials/Furniture/Metal_black.mat
+++ b/Assets/Materials/Furniture/Metal_black.mat
@@ -110,7 +110,7 @@ Material:
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- - _Smoothness: 0.656
+ - _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
diff --git a/Assets/Materials/Video Monitor.mat b/Assets/Materials/Video Monitor.mat
new file mode 100644
index 00000000..a56be78b
--- /dev/null
+++ b/Assets/Materials/Video Monitor.mat
@@ -0,0 +1,124 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2780382996206849687
+MonoBehaviour:
+ m_ObjectHideFlags: 11
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ version: 4
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Video Monitor
+ m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_ShaderKeywords: _SPECULAR_SETUP
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BaseMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _SpecGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlphaClip: 0
+ - _Blend: 0
+ - _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
+ - _Cull: 2
+ - _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _EnvironmentReflections: 1
+ - _GlossMapScale: 0
+ - _Glossiness: 0
+ - _GlossyReflections: 0
+ - _Metallic: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.005
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Smoothness: 0
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Surface: 0
+ - _WorkflowMode: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+ - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/Video Monitor.mat.meta b/Assets/Materials/Video Monitor.mat.meta
new file mode 100644
index 00000000..54d29bb5
--- /dev/null
+++ b/Assets/Materials/Video Monitor.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e91db078e551c294ebe28046b39b12e9
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Other/Default_post_processing_profile.asset b/Assets/Other/Default_post_processing_profile.asset
index 05f9b218..dae40e92 100644
--- a/Assets/Other/Default_post_processing_profile.asset
+++ b/Assets/Other/Default_post_processing_profile.asset
@@ -1562,7 +1562,7 @@ MonoBehaviour:
active: 1
enabled:
overrideState: 1
- value: 1
+ value: 0
mode:
overrideState: 1
value: 1
diff --git a/Assets/Other/Videod.meta b/Assets/Other/Videod.meta
new file mode 100644
index 00000000..1cd3d2c8
--- /dev/null
+++ b/Assets/Other/Videod.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c9af75daca6dfa4e87590a8d7a8e501
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Main_scene.unity b/Assets/Scenes/Main_scene.unity
index c3e95a92..b0d0583c 100644
--- a/Assets/Scenes/Main_scene.unity
+++ b/Assets/Scenes/Main_scene.unity
@@ -8029,6 +8029,137 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 36588136}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &37443017
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 37443018}
+ - component: {fileID: 37443022}
+ - component: {fileID: 37443021}
+ - component: {fileID: 37443020}
+ - component: {fileID: 37443019}
+ m_Layer: 0
+ m_Name: GG Reel 2020
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &37443018
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 37443017}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 0.0492, y: 0.0051, z: 0}
+ m_LocalScale: {x: 0.01, y: 0.4, z: 0.62}
+ m_Children: []
+ m_Father: {fileID: 1485329356}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!328 &37443019
+VideoPlayer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 37443017}
+ m_Enabled: 1
+ m_VideoClip: {fileID: 0}
+ m_TargetCameraAlpha: 1
+ m_TargetCamera3DLayout: 0
+ m_TargetCamera: {fileID: 0}
+ m_TargetTexture: {fileID: 0}
+ m_TimeReference: 0
+ m_TargetMaterialRenderer: {fileID: 0}
+ m_TargetMaterialProperty: _BaseMap
+ m_RenderMode: 3
+ m_AspectRatio: 2
+ m_DataSource: 1
+ m_PlaybackSpeed: 1
+ m_AudioOutputMode: 0
+ m_TargetAudioSources:
+ - {fileID: 0}
+ m_DirectAudioVolumes:
+ - 1
+ m_Url: http://cgvr.cs.ut.ee/reel/Computer%20Graphics%20Reel%202020.mp4
+ m_EnabledAudioTracks: 00
+ m_DirectAudioMutes: 00
+ m_ControlledAudioTrackCount: 1
+ m_PlayOnAwake: 1
+ m_SkipOnDrop: 1
+ m_Looping: 1
+ m_WaitForFirstFrame: 1
+ m_FrameReadyEventEnabled: 0
+ m_VideoShaders: []
+--- !u!65 &37443020
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 37443017}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &37443021
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 37443017}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e91db078e551c294ebe28046b39b12e9, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 1140054059}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 2
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &37443022
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 37443017}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &37896975
PrefabInstance:
m_ObjectHideFlags: 0
@@ -66023,7 +66154,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249519173}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -82.706, y: 5.718, z: -4.807}
+ m_LocalPosition: {x: -82.706, y: 5.718, z: -4.811}
m_LocalScale: {x: 0.0074, y: 0.0074, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -89228,6 +89359,38 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 329741294}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &329859876
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 329859877}
+ m_Layer: 0
+ m_Name: Video player
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &329859877
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 329859876}
+ m_LocalRotation: {x: 0, y: 0, z: 0.06104851, w: 0.99813485}
+ m_LocalPosition: {x: -3.978, y: 2.585, z: 2.29}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1619961323}
+ - {fileID: 1140054059}
+ m_Father: {fileID: 1914669902}
+ m_RootOrder: 67
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7}
--- !u!1001 &331071227
PrefabInstance:
m_ObjectHideFlags: 0
@@ -134920,7 +135083,7 @@ LightProbeGroup:
- {x: -12.542393, y: 0.61893916, z: 39.65557}
- {x: -13.193514, y: -0.0016617477, z: 39.004448}
- {x: -81.40514, y: 5.7988605, z: -21.436342}
- - {x: -81.84904, y: 5.231533, z: -22.203897}
+ - {x: -81.52667, y: 5.37167, z: -22.203897}
- {x: -8.14386, y: 5.392635, z: 32.459934}
- {x: -8.769537, y: 4.5013804, z: 31.7925}
- {x: -51.816753, y: 5.430046, z: -15.943629}
@@ -256879,7 +257042,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 758354202}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -83.756, y: 5.718, z: -4.81}
+ m_LocalPosition: {x: -83.756, y: 5.718, z: -4.811}
m_LocalScale: {x: 0.0103, y: 0.0103, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -304913,6 +305076,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
+ - target: {fileID: 1425203164796196698, guid: 188c51d053f839b4fb7ca0abdafbae43,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.89
+ objectReference: {fileID: 0}
- target: {fileID: 1425203164796196698, guid: 188c51d053f839b4fb7ca0abdafbae43,
type: 3}
propertyPath: m_LocalPosition.x
@@ -346904,6 +347072,8 @@ MonoBehaviour:
m_TeleportControllerGameObject: {fileID: 1077557909}
m_TeleportModeActivate: {fileID: -8061240218431744966, guid: c348712bda248c246b8c49b3db54643f,
type: 3}
+ m_NagivationModifier: {fileID: 8092925283543877185, guid: c348712bda248c246b8c49b3db54643f,
+ type: 3}
m_TeleportModeCancel: {fileID: 2307464322626738743, guid: c348712bda248c246b8c49b3db54643f,
type: 3}
m_Turn: {fileID: -6493913391331992944, guid: c348712bda248c246b8c49b3db54643f, type: 3}
@@ -363563,6 +363733,78 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1139749620}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1140054058
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1140054059}
+ - component: {fileID: 1140054060}
+ m_Layer: 0
+ m_Name: Light Probe OverRide
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1140054059
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1140054058}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 3.9, y: -2.202, z: -0.032}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 329859877}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1140054060
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1140054058}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!1001 &1141038941
PrefabInstance:
m_ObjectHideFlags: 0
@@ -449284,10 +449526,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1445400699}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 2213c36610e3b1c4bbf886810ed9db12, type: 3}
+ m_Script: {fileID: 11500000, guid: c7e3391cd1a2c7e428f26aba850dd78f, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_System: {fileID: 1445400703}
+ m_System: {fileID: 0}
m_TurnAmount: 45
m_DebounceTime: 0.5
m_EnableTurnLeftRight: 1
@@ -449298,7 +449540,7 @@ MonoBehaviour:
m_Name: Left Hand Snap Turn
m_Type: 0
m_ExpectedControlType:
- m_Id: 5e86023d-0b15-4453-8f56-9b5a3abcfa36
+ m_Id: 3d55841e-0abf-4008-9826-2c86a24e3125
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
@@ -449310,12 +449552,24 @@ MonoBehaviour:
m_Name: Right Hand Snap Turn
m_Type: 0
m_ExpectedControlType:
- m_Id: 90f6f273-ec53-48a3-a341-2195c69ac23d
+ m_Id: cb1cd9c3-8333-4d62-b541-99f4817730a5
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Reference: {fileID: -6493913391331992944, guid: c348712bda248c246b8c49b3db54643f,
type: 3}
+ m_allowNavigation:
+ m_UseReference: 1
+ m_Action:
+ m_Name: Allow Navigation
+ m_Type: 0
+ m_ExpectedControlType:
+ m_Id: 051b8654-4347-4ff8-96e6-c3189620f84a
+ m_Processors:
+ m_Interactions:
+ m_SingletonActionBindings: []
+ m_Reference: {fileID: 8092925283543877185, guid: c348712bda248c246b8c49b3db54643f,
+ type: 3}
--- !u!1001 &1445595265
PrefabInstance:
m_ObjectHideFlags: 0
@@ -456491,7 +456745,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1468647240}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -83.231, y: 5.718, z: -4.837}
+ m_LocalPosition: {x: -83.231, y: 5.718, z: -4.811}
m_LocalScale: {x: 0.0103, y: 0.0103, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -460571,6 +460825,37 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1484965483}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1485329355
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1485329356}
+ m_Layer: 0
+ m_Name: Video player (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1485329356
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1485329355}
+ m_LocalRotation: {x: 0, y: 0, z: -0.117017336, w: 0.9931299}
+ m_LocalPosition: {x: -3.952, y: 3.242, z: 2.29}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 37443018}
+ m_Father: {fileID: 1914669902}
+ m_RootOrder: 68
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: -13.44}
--- !u!4 &1485665881 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6076390112193046243, guid: 1fcb5b2a7560b5d4d852e151ea296981,
@@ -492687,7 +492972,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1604586279}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -82.706, y: 6.444, z: -4.845}
+ m_LocalPosition: {x: -82.706, y: 6.444, z: -4.811}
m_LocalScale: {x: 0.0074, y: 0.0074, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -496556,6 +496841,137 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cd1ccc63d8ddf534fab172aab912d08d, type: 3}
+--- !u!1 &1619961322
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1619961323}
+ - component: {fileID: 1619961326}
+ - component: {fileID: 1619961325}
+ - component: {fileID: 1619961324}
+ - component: {fileID: 1619961327}
+ m_Layer: 0
+ m_Name: CGDD Reel 2020
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 1
+ m_IsActive: 1
+--- !u!4 &1619961323
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1619961322}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 0.048, y: -0, z: 0}
+ m_LocalScale: {x: 0.01, y: 0.4, z: 0.62}
+ m_Children: []
+ m_Father: {fileID: 329859877}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!65 &1619961324
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1619961322}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1619961325
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1619961322}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e91db078e551c294ebe28046b39b12e9, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 1140054059}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 2
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1619961326
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1619961322}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!328 &1619961327
+VideoPlayer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1619961322}
+ m_Enabled: 1
+ m_VideoClip: {fileID: 0}
+ m_TargetCameraAlpha: 1
+ m_TargetCamera3DLayout: 0
+ m_TargetCamera: {fileID: 0}
+ m_TargetTexture: {fileID: 0}
+ m_TimeReference: 0
+ m_TargetMaterialRenderer: {fileID: 0}
+ m_TargetMaterialProperty: _BaseMap
+ m_RenderMode: 3
+ m_AspectRatio: 2
+ m_DataSource: 1
+ m_PlaybackSpeed: 1
+ m_AudioOutputMode: 0
+ m_TargetAudioSources:
+ - {fileID: 0}
+ m_DirectAudioVolumes:
+ - 1
+ m_Url: http://cgvr.cs.ut.ee/reel/Computer%20Game%20Development%20and%20Design%20Reel%202020.mp4
+ m_EnabledAudioTracks: 00
+ m_DirectAudioMutes: 00
+ m_ControlledAudioTrackCount: 1
+ m_PlayOnAwake: 1
+ m_SkipOnDrop: 1
+ m_Looping: 1
+ m_WaitForFirstFrame: 1
+ m_FrameReadyEventEnabled: 0
+ m_VideoShaders: []
--- !u!1001 &1620343574
PrefabInstance:
m_ObjectHideFlags: 0
@@ -502017,7 +502433,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1641488934}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -83.231, y: 6.444, z: -4.843}
+ m_LocalPosition: {x: -83.231, y: 6.444, z: -4.811}
m_LocalScale: {x: 0.05, y: 0.05, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -578628,6 +579044,8 @@ Transform:
- {fileID: 1975839546}
- {fileID: 855657019}
- {fileID: 785871423}
+ - {fileID: 329859877}
+ - {fileID: 1485329356}
m_Father: {fileID: 1013189733}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -594770,7 +595188,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1973595991}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
- m_LocalPosition: {x: -82.017, y: 6.652, z: -21.801}
+ m_LocalPosition: {x: -82.033, y: 6.652, z: -21.801}
m_LocalScale: {x: 0.02, y: 0.02, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -638924,7 +639342,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2133299763}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
- m_LocalPosition: {x: -73.964, y: 6.468, z: -17.825}
+ m_LocalPosition: {x: -73.935, y: 6.468, z: -17.825}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -646366,6 +646784,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1425203164796196698, guid: 188c51d053f839b4fb7ca0abdafbae43,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.94
+ objectReference: {fileID: 0}
- target: {fileID: 1425203164796196698, guid: 188c51d053f839b4fb7ca0abdafbae43,
type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/Scenes/Main_scene_Profiles/PostProcVolume Profile.asset b/Assets/Scenes/Main_scene_Profiles/PostProcVolume Profile.asset
index 00c3295a..6e9dc50b 100644
--- a/Assets/Scenes/Main_scene_Profiles/PostProcVolume Profile.asset
+++ b/Assets/Scenes/Main_scene_Profiles/PostProcVolume Profile.asset
@@ -1373,7 +1373,7 @@ MonoBehaviour:
active: 1
enabled:
overrideState: 1
- value: 1
+ value: 0
mode:
overrideState: 1
value: 1
diff --git a/Assets/Scripts/Bow/Arrow.cs b/Assets/Scripts/Bow/Arrow.cs
index 7e7a37e1..050192e6 100644
--- a/Assets/Scripts/Bow/Arrow.cs
+++ b/Assets/Scripts/Bow/Arrow.cs
@@ -30,7 +30,7 @@ namespace Bow
}
private void FixedUpdate()
- {
+ {
if (!_inAir) return;
CheckForCollision();
_lastPosition = tip.position;
diff --git a/Assets/Scripts/UnityXR/ActionBasedControllerManager.cs b/Assets/Scripts/UnityXR/ActionBasedControllerManager.cs
index ecf834b5..cd05e50f 100644
--- a/Assets/Scripts/UnityXR/ActionBasedControllerManager.cs
+++ b/Assets/Scripts/UnityXR/ActionBasedControllerManager.cs
@@ -153,6 +153,21 @@ public class ActionBasedControllerManager : MonoBehaviour
get => m_TeleportModeActivate;
set => m_TeleportModeActivate = value;
}
+
+ // State transition actions
+ [SerializeField]
+ [Tooltip("The reference to the action of listening to teleport actions.")]
+ InputActionReference m_NagivationModifier;
+
+ ///
+ /// The reference to the action of activating the teleport mode for this controller."
+ ///
+ public InputActionReference navigationModifier
+ {
+ get => m_NagivationModifier;
+ set => m_NagivationModifier = value;
+ }
+
[SerializeField] [Tooltip("The reference to the action of canceling the teleport mode for this controller.")]
InputActionReference m_TeleportModeCancel;
@@ -448,6 +463,7 @@ public class ActionBasedControllerManager : MonoBehaviour
// Enable transitions to Teleport state
EnableAction(m_TeleportModeActivate);
EnableAction(m_TeleportModeCancel);
+ EnableAction(m_NagivationModifier);
// Enable turn and move actions
EnableAction(m_Turn);
@@ -523,11 +539,13 @@ public class ActionBasedControllerManager : MonoBehaviour
// Transition from Select state to Teleport state when the user triggers the "Teleport Mode Activate" action but not the "Cancel Teleport" action
var teleportModeAction = GetInputAction(m_TeleportModeActivate);
var cancelTeleportModeAction = GetInputAction(m_TeleportModeCancel);
+ var allowNavigationAction = GetInputAction(m_NagivationModifier);
- var triggerTeleportMode = teleportModeAction != null && teleportModeAction.triggered;
- var cancelTeleport = cancelTeleportModeAction != null && cancelTeleportModeAction.triggered;
-
- if (triggerTeleportMode && !cancelTeleport)
+ var triggerTeleportMode = teleportModeAction != null && teleportModeAction.IsPressed();
+ var cancelTeleport = cancelTeleportModeAction != null && cancelTeleportModeAction.IsPressed();
+ var allowNavigation = allowNavigationAction != null && allowNavigationAction.IsPressed();
+
+ if (triggerTeleportMode && !cancelTeleport && allowNavigation)
{
TransitionState(m_SelectState, m_TeleportState);
return;
@@ -549,10 +567,13 @@ public class ActionBasedControllerManager : MonoBehaviour
var teleportModeAction = GetInputAction(m_TeleportModeActivate);
var cancelTeleportModeAction = GetInputAction(m_TeleportModeCancel);
+ var allowNavigationAction = GetInputAction(m_NagivationModifier);
+
var cancelTeleport = cancelTeleportModeAction != null && cancelTeleportModeAction.triggered;
var releasedTeleport = teleportModeAction != null && teleportModeAction.phase == InputActionPhase.Waiting;
-
+ var allowNavigation = allowNavigationAction != null && allowNavigationAction.IsPressed();
+
if (cancelTeleport || releasedTeleport)
TransitionState(m_TeleportState, m_SelectState);
}
diff --git a/Assets/Scripts/UnityXR/CustomSnapTurnProvider.cs b/Assets/Scripts/UnityXR/CustomSnapTurnProvider.cs
new file mode 100644
index 00000000..b5a56680
--- /dev/null
+++ b/Assets/Scripts/UnityXR/CustomSnapTurnProvider.cs
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.XR.Interaction.Toolkit;
+using UnityEngine.XR.Interaction.Toolkit.Inputs;
+
+public class CustomSnapTurnProvider : ActionBasedSnapTurnProvider
+{
+ [SerializeField]
+ [Tooltip("The Input System Action that will be used to read Snap Turn data from the left hand controller. Must be a Value Vector2 Control.")]
+ InputActionProperty m_allowNavigation;
+ ///
+ /// The Input System Action that will be used to read Snap Turn data sent from the left hand controller. Must be a Control.
+ ///
+ public InputActionProperty allowNavigation
+ {
+ get => m_allowNavigation;
+ set => SetInputActionProperty(ref m_allowNavigation, value);
+ }
+
+ void SetInputActionProperty(ref InputActionProperty property, InputActionProperty value)
+ {
+ if (Application.isPlaying)
+ property.DisableDirectAction();
+
+ property = value;
+
+ if (Application.isPlaying && isActiveAndEnabled)
+ property.EnableDirectAction();
+ }
+
+ protected override Vector2 ReadInput()
+ {
+ return m_allowNavigation.action.IsPressed() ? base.ReadInput() : Vector2.zero;
+ }
+}
diff --git a/Assets/Scripts/UnityXR/CustomSnapTurnProvider.cs.meta b/Assets/Scripts/UnityXR/CustomSnapTurnProvider.cs.meta
new file mode 100644
index 00000000..3fe421e2
--- /dev/null
+++ b/Assets/Scripts/UnityXR/CustomSnapTurnProvider.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c7e3391cd1a2c7e428f26aba850dd78f
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset
index 0472d836..09c339b7 100644
--- a/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset
+++ b/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset
@@ -1,27 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!114 &-5761594705813018824
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
- m_Name: ScreenSpaceAmbientOcclusion
- m_EditorClassIdentifier:
- m_Active: 1
- m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
- m_Settings:
- Downsample: 0
- Source: 1
- NormalSamples: 1
- Intensity: 1
- DirectLightingStrength: 0.25
- Radius: 0.035
- SampleCount: 6
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -34,9 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Name: UniversalRenderPipelineAsset_Renderer
m_EditorClassIdentifier:
- m_RendererFeatures:
- - {fileID: -5761594705813018824}
- m_RendererFeatureMap: 38673e2c24b40ab0
+ m_RendererFeatures: []
+ m_RendererFeatureMap:
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
shaders:
diff --git a/Assets/XR Interaction Toolkit/1.0.0-pre.1/Default Input Actions/XRI Default Input Actions.inputactions b/Assets/XR Interaction Toolkit/1.0.0-pre.1/Default Input Actions/XRI Default Input Actions.inputactions
index 94e18432..08c8763f 100644
--- a/Assets/XR Interaction Toolkit/1.0.0-pre.1/Default Input Actions/XRI Default Input Actions.inputactions
+++ b/Assets/XR Interaction Toolkit/1.0.0-pre.1/Default Input Actions/XRI Default Input Actions.inputactions
@@ -496,9 +496,9 @@
},
{
"name": "Teleport Mode Activate",
- "type": "Value",
+ "type": "Button",
"id": "a6c7231d-c55d-4dd4-9e87-877bb5522ef5",
- "expectedControlType": "Vector2",
+ "expectedControlType": "Button",
"processors": "",
"interactions": ""
},
@@ -541,6 +541,14 @@
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
+ },
+ {
+ "name": "Navigation Modifier",
+ "type": "Button",
+ "id": "9c8e891c-04ee-4ed0-9ef5-110958c67d19",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": ""
}
],
"bindings": [
@@ -753,24 +761,13 @@
"isComposite": false,
"isPartOfComposite": true
},
- {
- "name": "",
- "id": "df117805-7b8e-414a-94b7-f5661862d77b",
- "path": "{RightHand}/primary2DAxis",
- "interactions": "Sector(directions=1)",
- "processors": "",
- "groups": "Generic XR Controller",
- "action": "Teleport Mode Activate",
- "isComposite": false,
- "isPartOfComposite": false
- },
{
"name": "",
"id": "d0da8ce3-f80e-4bf3-8a51-9692f0fa2270",
"path": "{RightHand}/primaryButton",
"interactions": "",
"processors": "",
- "groups": "Generic XR Controller",
+ "groups": "Generic XR Controller;Noncontinuous Move",
"action": "Teleport Mode Activate",
"isComposite": false,
"isPartOfComposite": false
@@ -797,6 +794,17 @@
"isComposite": false,
"isPartOfComposite": false
},
+ {
+ "name": "",
+ "id": "a5c7383b-5497-4ac2-8964-7c06885e46ba",
+ "path": "{RightHand}/trackpadPressed",
+ "interactions": "",
+ "processors": "Invert",
+ "groups": "HTC Vive Wands",
+ "action": "Teleport Select",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
{
"name": "",
"id": "ee82a989-fde3-448e-9a6f-6279a397c5bc",
@@ -807,6 +815,50 @@
"action": "Select",
"isComposite": false,
"isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "aa3ce0c0-e6c7-4234-b9b7-2c831193c75b",
+ "path": "{RightHand}/primary2DAxisClick",
+ "interactions": "",
+ "processors": "",
+ "groups": "Generic XR Controller",
+ "action": "Navigation Modifier",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "55508df7-328f-4c02-bd2a-7bc013ac780b",
+ "path": "{RightHand}/primary2DAxisTouch",
+ "interactions": "",
+ "processors": "",
+ "groups": "Generic XR Controller",
+ "action": "Navigation Modifier",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "f03a7fbb-607e-4e45-8eaa-d71abac3024f",
+ "path": "/trackpadClicked",
+ "interactions": "",
+ "processors": "",
+ "groups": "HTC Vive Wands",
+ "action": "Navigation Modifier",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "9a25275b-5838-4baa-b7f3-c72a869b76a8",
+ "path": "{RightHand}/Primary2DAxis",
+ "interactions": "Sector(directions=1)",
+ "processors": "",
+ "groups": "Noncontinuous Move;Generic XR Controller",
+ "action": "Teleport Mode Activate",
+ "isComposite": false,
+ "isPartOfComposite": false
}
]
}
@@ -869,6 +921,17 @@
"isOR": false
}
]
+ },
+ {
+ "name": "HTC Vive Wands",
+ "bindingGroup": "HTC Vive Wands",
+ "devices": [
+ {
+ "devicePath": "",
+ "isOptional": false,
+ "isOR": false
+ }
+ ]
}
]
}
\ No newline at end of file
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 735f335f..2b9019e3 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -130,6 +130,9 @@ PlayerSettings:
bundleVersion: 1
preloadedAssets:
- {fileID: 11400000, guid: b40a5c3e37c60d84b9d76e740e9817b1, type: 2}
+ - {fileID: -7799501270668957653, guid: 69fe7bdb426f5d54f964f41edab8336b, type: 2}
+ - {fileID: 11400000, guid: eab5dab8e7c6e7d4b88b877cb5d19dff, type: 2}
+ - {fileID: -4566111125232350401, guid: d9074d96c7fe25647ade97e2758ce11d, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1