Skip to content

Commit f69944f

Browse files
paulrus123paulrus123
committed
Oculus Scenes bug fixes
1 parent 71930fa commit f69944f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2499
-414
lines changed

‎UnityProject/Assets/Images/raycaster_img.png.meta‎

Lines changed: 29 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityProject/Assets/Materials/EmissiveMat.mat‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: EmissiveMat
11+
m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
13+
m_LightmapFlags: 0
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: 3000
17+
stringTagMap:
18+
RenderType: Transparent
19+
disabledShaderPasses:
20+
- ALWAYS
21+
m_SavedProperties:
22+
serializedVersion: 3
23+
m_TexEnvs:
24+
- _BumpMap:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _DetailAlbedoMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _DetailMask:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _DetailNormalMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _EmissionMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _MainTex:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _MetallicGlossMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _OcclusionMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _ParallaxMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
m_Floats:
61+
- _BlendOp: 0
62+
- _BumpScale: 1
63+
- _CameraFadingEnabled: 0
64+
- _CameraFarFadeDistance: 2
65+
- _CameraNearFadeDistance: 1
66+
- _Cull: 2
67+
- _Cutoff: 0.5
68+
- _DetailNormalMapScale: 1
69+
- _DistortionBlend: 0.5
70+
- _DistortionEnabled: 0
71+
- _DistortionStrength: 1
72+
- _DistortionStrengthScaled: 0
73+
- _DstBlend: 10
74+
- _EmissionEnabled: 1
75+
- _FlipbookMode: 0
76+
- _GlossMapScale: 1
77+
- _Glossiness: 0.59
78+
- _GlossyReflections: 0
79+
- _LightingEnabled: 1
80+
- _Metallic: 0
81+
- _Mode: 3
82+
- _OcclusionStrength: 1
83+
- _Parallax: 0.02
84+
- _SmoothnessTextureChannel: 0
85+
- _SoftParticlesEnabled: 0
86+
- _SoftParticlesFarFadeDistance: 1
87+
- _SoftParticlesNearFadeDistance: 0
88+
- _SpecularHighlights: 0
89+
- _SrcBlend: 1
90+
- _UVSec: 0
91+
- _ZWrite: 0
92+
m_Colors:
93+
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
94+
- _Color: {r: 0, g: 1, b: 0.20736837, a: 1}
95+
- _EmissionColor: {r: 0, g: 0.9716981, b: 0.05849968, a: 1}
96+
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

‎UnityProject/Assets/Materials/EmissiveMat.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityProject/Assets/Materials/UI_Text_Mat.mat‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: UI_Text_Mat
11+
m_Shader: {fileID: 10101, guid: 0000000000000000e000000000000000, type: 0}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Floats:
59+
- _BumpScale: 1
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 0
63+
- _FadeEnd: 0.5
64+
- _FadeStart: 0.5
65+
- _GlossMapScale: 1
66+
- _Glossiness: 0.5
67+
- _GlossyReflections: 1
68+
- _Intensity: 0.5
69+
- _Metallic: 0
70+
- _Mode: 0
71+
- _OcclusionStrength: 1
72+
- _Parallax: 0.02
73+
- _SmoothnessTextureChannel: 0
74+
- _SpecularHighlights: 1
75+
- _SrcBlend: 1
76+
- _Thickness: 0.5
77+
- _UVSec: 0
78+
- _ZWrite: 1
79+
m_Colors:
80+
- _Color: {r: 1, g: 1, b: 1, a: 1}
81+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
82+
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

‎UnityProject/Assets/Materials/UI_Text_Mat.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityProject/Assets/Materials/crosshairMat.mat‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: crosshairMat
11-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_Shader: {fileID: 4800000, guid: 322c8bbfbbd774b33a90cac7d144bfe7, type: 3}
1212
m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 3000
17-
stringTagMap:
18-
RenderType: Transparent
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
1918
disabledShaderPasses: []
2019
m_SavedProperties:
2120
serializedVersion: 3
@@ -36,12 +35,16 @@ Material:
3635
m_Texture: {fileID: 0}
3736
m_Scale: {x: 1, y: 1}
3837
m_Offset: {x: 0, y: 0}
38+
- _DetailTex:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
3942
- _EmissionMap:
4043
m_Texture: {fileID: 0}
4144
m_Scale: {x: 1, y: 1}
4245
m_Offset: {x: 0, y: 0}
4346
- _MainTex:
44-
m_Texture: {fileID: 2800000, guid: 210c1550425ed90419d73be09bde0486, type: 3}
47+
m_Texture: {fileID: 0}
4548
m_Scale: {x: 1, y: 1}
4649
m_Offset: {x: 0, y: 0}
4750
- _MetallicGlossMap:
@@ -103,12 +106,15 @@ Material:
103106
- _StencilOp: 0
104107
- _StencilReadMask: 255
105108
- _StencilWriteMask: 255
109+
- _Strength: 0.2
106110
- _UVSec: 0
107111
- _UseUIAlphaClip: 0
108112
- _ZWrite: 0
109113
m_Colors:
110114
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
111-
- _Color: {r: 0, g: 0.68318796, b: 1, a: 0.7490196}
115+
- _Color: {r: 0, g: 0.68318796, b: 1, a: 0.7058824}
116+
- _Color1: {r: 0, g: 0, b: 0, a: 1}
117+
- _Color2: {r: 1, g: 1, b: 1, a: 1}
112118
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
113119
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
114120
- _HighlightColor: {r: 0.63, g: 0.52, b: 0.38, a: 0.66}

‎UnityProject/Assets/Materials/description_mat.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@ Material:
9292
- _ZWrite: 0
9393
m_Colors:
9494
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
95-
- _Color: {r: 0.9716981, g: 0.371262, b: 0.371262, a: 0.05882353}
95+
- _Color: {r: 1024, g: 963.7647, b: 963.7647, a: 0}
9696
- _EmissionColor: {r: 0.00390625, g: 0.0013939951, b: 0, a: 1}
9797
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

‎UnityProject/Assets/Materials/floor_mat.mat‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: floor_mat
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
12+
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: -1
17-
stringTagMap: {}
16+
m_CustomRenderQueue: 3000
17+
stringTagMap:
18+
RenderType: Transparent
1819
disabledShaderPasses: []
1920
m_SavedProperties:
2021
serializedVersion: 3
@@ -59,19 +60,19 @@ Material:
5960
- _BumpScale: 1
6061
- _Cutoff: 0.5
6162
- _DetailNormalMapScale: 1
62-
- _DstBlend: 0
63+
- _DstBlend: 10
6364
- _GlossMapScale: 1
6465
- _Glossiness: 0.5
6566
- _GlossyReflections: 1
6667
- _Metallic: 0.2
67-
- _Mode: 0
68+
- _Mode: 3
6869
- _OcclusionStrength: 1
6970
- _Parallax: 0.02
7071
- _SmoothnessTextureChannel: 0
7172
- _SpecularHighlights: 1
7273
- _SrcBlend: 1
7374
- _UVSec: 0
74-
- _ZWrite: 1
75+
- _ZWrite: 0
7576
m_Colors:
76-
- _Color: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1}
77+
- _Color: {r: 0.30980393, g: 0.30980393, b: 0.30980393, a: 0.19607843}
7778
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

‎UnityProject/Assets/Models.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnityProject/Assets/UI elements/helmet.fbx renamed to UnityProject/Assets/Models/helmet.fbx

File renamed without changes.

0 commit comments

Comments
 (0)