diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Base.mat b/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Base.mat
index d079c08ec935d3d61691691f59e5c33b544fadf0..c54896e0162d804a302c81e7bb5794d638de4426 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Base.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Base.mat
@@ -8,18 +8,17 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Anchor Base
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
- m_ValidKeywords:
+ m_ValidKeywords: []
+ m_InvalidKeywords:
- _OCCLUSIONMAP
- m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Blue Glow.mat b/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Blue Glow.mat
index 10e1823182ee4310b7db13cc43858e83e7fd2d59..314ea6365ce4594cb4029c66d3fd52ea238fd112 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Blue Glow.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Blue Glow.mat
@@ -21,14 +21,15 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Anchor Blue Glow
- m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
+ - _ALPHABLEND_ON
+ - _EMISSION
+ m_InvalidKeywords:
- _ALPHAMODULATE_ON
- _SURFACE_TYPE_TRANSPARENT
- m_InvalidKeywords:
- - _EMISSION
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
@@ -121,7 +122,7 @@ Material:
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- - _DstBlend: 0
+ - _DstBlend: 10
- _DstBlendAlpha: 1
- _EmissionEnabled: 0
- _EnvironmentReflections: 1
@@ -148,7 +149,7 @@ Material:
- _SoftParticlesNearFadeDistance: 0
- _SpecSource: 0
- _SpecularHighlights: 1
- - _SrcBlend: 2
+ - _SrcBlend: 5
- _SrcBlendAlpha: 0
- _Surface: 1
- _UVSec: 0
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Blue Anchor Arrow.mat b/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Blue Anchor Arrow.mat
index 755fe831c0c30fb78466e89c95a428ff437ef37c..4bb691fc6af1d9a53f3c7f3ff0352345e45be0d3 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Blue Anchor Arrow.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Anchor Materials/Blue Anchor Arrow.mat
@@ -8,12 +8,13 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Blue Anchor Arrow
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
+ - _ALPHABLEND_ON
+ m_InvalidKeywords:
- _SURFACE_TYPE_TRANSPARENT
- m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Concrete Blue.mat b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Concrete Blue.mat
index d65c2779997fd30deb4d0e57cd53fb7eb8edabba..3651319ad9bd6ed505a16db7e799f802c0797a73 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Concrete Blue.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Concrete Blue.mat
@@ -8,19 +8,19 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Concrete Blue
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- - _METALLICSPECGLOSSMAP
+ - _METALLICGLOSSMAP
- _NORMALMAP
- m_InvalidKeywords: []
+ m_InvalidKeywords:
+ - _METALLICSPECGLOSSMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Concrete Grey.mat b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Concrete Grey.mat
index 9226e3301f2ee72f7eb0791f16a759457082fd3b..b1f0ff7d4c36b7d3984cd2db65f92e02a89db42d 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Concrete Grey.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Concrete Grey.mat
@@ -8,19 +8,19 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Concrete Grey
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- - _METALLICSPECGLOSSMAP
+ - _METALLICGLOSSMAP
- _NORMALMAP
- m_InvalidKeywords: []
+ m_InvalidKeywords:
+ - _METALLICSPECGLOSSMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Glass.mat b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Glass.mat
index fd8e61036120c3685963d973be369babef21e9ec..8ea881e0646abc9767872df6af22d432378dbbd8 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Glass.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Glass.mat
@@ -8,19 +8,18 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Glass
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _NORMALMAP
+ m_InvalidKeywords:
- _SURFACE_TYPE_TRANSPARENT
- m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 3000
- stringTagMap:
- RenderType: Transparent
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
@@ -97,7 +96,7 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- - _DstBlend: 10
+ - _DstBlend: 0
- _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 1
@@ -116,12 +115,12 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecSource: 0
- _SpecularHighlights: 1
- - _SrcBlend: 5
+ - _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 1
- _UVSec: 0
- _WorkflowMode: 1
- - _ZWrite: 0
+ - _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 0.5019608}
- _Color: {r: 1, g: 1, b: 1, a: 0.5019608}
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Wall Cut.mat b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Wall Cut.mat
index a5980a7869e660b8f0980f1ce00c7d78e74cbfcc..a1a98e8f4384eacbe6f54ac9be237708cdb89f1b 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Wall Cut.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Wall Cut.mat
@@ -8,20 +8,21 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Wall Cut
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- - _METALLICSPECGLOSSMAP
+ - _GLOSSYREFLECTIONS_OFF
+ - _METALLICGLOSSMAP
- _NORMALMAP
- _PARALLAXMAP
- m_InvalidKeywords: []
+ m_InvalidKeywords:
+ - _METALLICSPECGLOSSMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
@@ -100,6 +101,7 @@ Material:
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
+ - _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
@@ -109,6 +111,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
+ - _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Wall Default.mat b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Wall Default.mat
index 6d0038bc7d46c0df9956ac78b8a5127292fb59ee..56aa008f47306ea76e4d1a7d03a40aa35bd7a06d 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Environment/Wall Default.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Environment/Wall Default.mat
@@ -8,20 +8,21 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Wall Default
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- - _METALLICSPECGLOSSMAP
+ - _GLOSSYREFLECTIONS_OFF
+ - _METALLICGLOSSMAP
- _NORMALMAP
- _PARALLAXMAP
- m_InvalidKeywords: []
+ m_InvalidKeywords:
+ - _METALLICSPECGLOSSMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
@@ -100,6 +101,7 @@ Material:
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
+ - _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
@@ -109,6 +111,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
+ - _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Locomotion/BlinkLine.mat b/AVVR/Assets/VRTemplateAssets/Materials/Locomotion/BlinkLine.mat
index 61c35c921e7c9ef1b518ad3ac9b5824b0f8da580..dcdea9d7434ec38beb9357b7532711deb4a9ef7a 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Locomotion/BlinkLine.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Locomotion/BlinkLine.mat
@@ -2,18 +2,14 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
- serializedVersion: 8
+ serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlinkLine
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords:
- - _ALPHABLEND_ON
- m_InvalidKeywords: []
+ m_ShaderKeywords: _ALPHABLEND_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -22,7 +18,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- GRABPASS
- m_LockedProperties:
+ - ALWAYS
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/Primitive/Interactables 4.mat b/AVVR/Assets/VRTemplateAssets/Materials/Primitive/Interactables 4.mat
index fd469fd5b73d1ba86f9543bacb0c3bbc74dcf642..dc3f40710ad92f52f6567585befc070f24b29310 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/Primitive/Interactables 4.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/Primitive/Interactables 4.mat
@@ -21,17 +21,17 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Interactables 4
- m_Shader: {fileID: -6465566751694194690, guid: 8ccee1dee7490414ea7e8ad2b953c3e1, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
+ m_ValidKeywords:
+ - _NORMALMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
diff --git a/AVVR/Assets/VRTemplateAssets/Materials/UI/Handle.mat b/AVVR/Assets/VRTemplateAssets/Materials/UI/Handle.mat
index efed554cf41038ced1ffb9ce45c1e8f897879e63..fa55b4a3302b3a9d989655f5e3cb57271786b16c 100644
--- a/AVVR/Assets/VRTemplateAssets/Materials/UI/Handle.mat
+++ b/AVVR/Assets/VRTemplateAssets/Materials/UI/Handle.mat
@@ -21,17 +21,17 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Handle
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
+ m_ValidKeywords:
+ - _GLOSSYREFLECTIONS_OFF
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
@@ -110,6 +110,7 @@ Material:
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
+ - _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
@@ -119,6 +120,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
+ - _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorArrow.fbx b/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorArrow.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..f7fa4728696458f4b9f2a4e4f360d53f9e9e2416
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorArrow.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorBase.fbx b/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorBase.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..07fa15f0e9252510c273893526b569b327be0617
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorBase.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorFade.fbx b/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorFade.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..dbc120a4bbc67e7094c5513753d9d6e1edce0187
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Anchor/AnchorFade.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Blink/BlinkVisual.fbx b/AVVR/Assets/VRTemplateAssets/Models/Blink/BlinkVisual.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..6850048eba97083d4adf5a593d31629830b886fe
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Blink/BlinkVisual.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Controllers/UniversalController.fbx b/AVVR/Assets/VRTemplateAssets/Models/Controllers/UniversalController.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..bb95eba31f3d01bd3cc1eef3e8b6d92d964db28e
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Controllers/UniversalController.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Cursors/cursor.fbx b/AVVR/Assets/VRTemplateAssets/Models/Cursors/cursor.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..b0f5783ac9fb75956eeef9ff64568529d4727f79
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Cursors/cursor.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Environment/Arrows.fbx b/AVVR/Assets/VRTemplateAssets/Models/Environment/Arrows.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..4b3c84d01fb650ffbfba068ea00542fc254cca0a
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Environment/Arrows.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Environment/Blaster.fbx b/AVVR/Assets/VRTemplateAssets/Models/Environment/Blaster.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..1af0ac7ccf8cd21492c71ba4667974045808d15d
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Environment/Blaster.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Environment/Template Environment.fbx b/AVVR/Assets/VRTemplateAssets/Models/Environment/Template Environment.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..6cd2fc89777e6021808c0ad76740a96d4cbdfa9e
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Environment/Template Environment.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Environment/Torus Cut.fbx b/AVVR/Assets/VRTemplateAssets/Models/Environment/Torus Cut.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..0093ffd5efc95fb89b12a43d3293abc9948f0b27
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Environment/Torus Cut.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Environment/Totem1.fbx b/AVVR/Assets/VRTemplateAssets/Models/Environment/Totem1.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..a7813f36d50449194f59d71c66b5c7e3e402552a
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Environment/Totem1.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Environment/Totem2.fbx b/AVVR/Assets/VRTemplateAssets/Models/Environment/Totem2.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..c17d4e2bae170fc9f10ab37f0bad5e85af550fed
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Environment/Totem2.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Marks/Marks.fbx b/AVVR/Assets/VRTemplateAssets/Models/Marks/Marks.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..fa59b850ba755dc5d26ecc063de5c670981bfdfa
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Marks/Marks.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Poke/PokePointer.fbx b/AVVR/Assets/VRTemplateAssets/Models/Poke/PokePointer.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..116b9a00aa83779cb9da9be34626e843ff905206
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Poke/PokePointer.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Primitives/Cube.fbx b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Cube.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..579d0f45c790811799151e98e52041775f426522
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Cube.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Primitives/Cylinder.fbx b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Cylinder.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..7e122fec318a5f4521bdf10599c83d7e96361774
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Cylinder.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Primitives/Sphere.fbx b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Sphere.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..8fdc3c6dd98fa3d4eb8e474d9bae1a385a540d3a
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Sphere.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Primitives/Tapered Cylinder.fbx b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Tapered Cylinder.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..661ef8c6feaf42f821e3fdc1c168311d8265061b
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Tapered Cylinder.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/Primitives/Torus.fbx b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Torus.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..50a8de8bdb28ee300383337aee3a37b76bb2cc7a
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/Primitives/Torus.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Models/UI/Spatial Panel Manipulator Model.fbx b/AVVR/Assets/VRTemplateAssets/Models/UI/Spatial Panel Manipulator Model.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..74a180f630da9fd0ea5f6a91d193cd7c1c4916ef
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Models/UI/Spatial Panel Manipulator Model.fbx differ
diff --git a/AVVR/Assets/VRTemplateAssets/Prefabs/Setup/Complete XR Origin Set Up Variant.prefab b/AVVR/Assets/VRTemplateAssets/Prefabs/Setup/Complete XR Origin Set Up Variant.prefab
index c8c2dfbdd075ee0b156c64620fe99b89ab803af0..438101abffb165792d4b70d2e77b387a69b30a97 100644
--- a/AVVR/Assets/VRTemplateAssets/Prefabs/Setup/Complete XR Origin Set Up Variant.prefab
+++ b/AVVR/Assets/VRTemplateAssets/Prefabs/Setup/Complete XR Origin Set Up Variant.prefab
@@ -162,23 +162,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8697337692808881382, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8697337692808881382, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8697337692808881382, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 32.34
objectReference: {fileID: 0}
- target: {fileID: 8697337692808881382, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 8697337692808881382, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -23
objectReference: {fileID: 0}
- target: {fileID: 8697337692906415418, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_SizeDelta.x
@@ -198,43 +198,43 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8697337693122987695, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8697337693122987695, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8697337693122987695, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 34.8
objectReference: {fileID: 0}
- target: {fileID: 8697337693122987695, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 8697337693122987695, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -23
objectReference: {fileID: 0}
- target: {fileID: 8697337693683843182, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8697337693683843182, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8697337693683843182, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 61.4
objectReference: {fileID: 0}
- target: {fileID: 8697337693683843182, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 44.7
objectReference: {fileID: 0}
- target: {fileID: 8697337693683843182, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -23
objectReference: {fileID: 0}
- target: {fileID: 8697337694011681714, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_SizeDelta.x
@@ -246,23 +246,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8697337694165207079, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8697337694165207079, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8697337694165207079, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 35.73
objectReference: {fileID: 0}
- target: {fileID: 8697337694165207079, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 8697337694165207079, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -23
objectReference: {fileID: 0}
- target: {fileID: 8697337694509818875, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3}
propertyPath: m_SizeDelta.x
@@ -653,15 +653,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2690795497190510875, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2690795497190510875, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2690795497190510875, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 35.73
objectReference: {fileID: 0}
- target: {fileID: 2690795497190510875, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -669,7 +669,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2690795497190510875, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -23
objectReference: {fileID: 0}
- target: {fileID: 2690795497255421680, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_SizeDelta.x
@@ -681,15 +681,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2690795497469257964, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2690795497469257964, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2690795497469257964, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 61.4
objectReference: {fileID: 0}
- target: {fileID: 2690795497469257964, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -697,19 +697,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2690795497469257964, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -23
objectReference: {fileID: 0}
- target: {fileID: 2690795497611470181, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2690795497611470181, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2690795497611470181, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 39.07
objectReference: {fileID: 0}
- target: {fileID: 2690795497611470181, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -717,7 +717,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2690795497611470181, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -23
objectReference: {fileID: 0}
- target: {fileID: 2690795497682848633, guid: aa788f58037d03649911102b0771966e, type: 3}
propertyPath: m_SizeDelta.x
@@ -1102,12 +1102,12 @@ MonoBehaviour:
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
- quality: 3
- frameInfluence: 0.1
- jitterScale: 1
- mipBias: 0
- varianceClampScale: 0.9
- contrastAdaptiveSharpening: 0
+ m_Quality: 3
+ m_FrameInfluence: 0.1
+ m_JitterScale: 1
+ m_MipBias: 0
+ m_VarianceClampScale: 0.9
+ m_ContrastAdaptiveSharpening: 0
--- !u!4 &7277802327528778794 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1670256625, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
diff --git a/AVVR/Assets/VRTemplateAssets/Videos/onboarding_video_final.mp4 b/AVVR/Assets/VRTemplateAssets/Videos/onboarding_video_final.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..05198949f6d288c8165c9857e07c49ac5d999464
Binary files /dev/null and b/AVVR/Assets/VRTemplateAssets/Videos/onboarding_video_final.mp4 differ
diff --git a/AVVR/ProjectSettings/ProjectSettings.asset b/AVVR/ProjectSettings/ProjectSettings.asset
index a256b9a4dc0538f338925b1430571724a04e0a40..84dd7fa024380a0ef18f3786dc59657d4a129a67 100644
--- a/AVVR/ProjectSettings/ProjectSettings.asset
+++ b/AVVR/ProjectSettings/ProjectSettings.asset
@@ -136,9 +136,7 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.1
- preloadedAssets:
- - {fileID: -6517218471499782410, guid: 1a4c68ca72a83449f938d669337cb305, type: 2}
- - {fileID: -3160651408743164439, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2}
+ preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1