Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 0dc231c

Browse files
authored
Merge pull request #317 from caseyyee/lighting
Uses baked lighting for better performance, bumps prefab and build.
2 parents 36f0183 + 4139708 commit 0dc231c

File tree

12 files changed

+151
-2010
lines changed

12 files changed

+151
-2010
lines changed

Assets/Materials/Red.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ Material:
7272
- _UVSec: 0
7373
- _ZWrite: 1
7474
m_Colors:
75-
- _Color: {r: 1, g: 0.31034485, b: 0, a: 1}
75+
- _Color: {r: 1, g: 0.334, b: 0, a: 1}
7676
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/WebVR/Prefabs/WebVRCameraSet.prefab

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,7 +1467,6 @@ Animator:
14671467
m_WarningMessage:
14681468
m_HasTransformHierarchy: 1
14691469
m_AllowConstantClipSamplingOptimization: 1
1470-
m_KeepAnimatorControllerStateOnDisable: 0
14711470
--- !u!95 &95292425453911886
14721471
Animator:
14731472
serializedVersion: 3
@@ -1485,7 +1484,6 @@ Animator:
14851484
m_WarningMessage:
14861485
m_HasTransformHierarchy: 1
14871486
m_AllowConstantClipSamplingOptimization: 1
1488-
m_KeepAnimatorControllerStateOnDisable: 0
14891487
--- !u!114 &114038308936181916
14901488
MonoBehaviour:
14911489
m_ObjectHideFlags: 1
@@ -1500,6 +1498,8 @@ MonoBehaviour:
15001498
toggleVRKeyName: v
15011499
vrState: 1
15021500
dontDestroyOnLoad: 0
1501+
DefaultHeight: 1.2
1502+
TrackingSpace: 1
15031503
--- !u!114 &114104781069495054
15041504
MonoBehaviour:
15051505
m_ObjectHideFlags: 1
@@ -1559,7 +1559,6 @@ MonoBehaviour:
15591559
m_Script: {fileID: 11500000, guid: 2330d5cea21bb564e97ad081f15487d9, type: 3}
15601560
m_Name:
15611561
m_EditorClassIdentifier:
1562-
DefaultHeight: 1.2
15631562
--- !u!114 &114372649503696970
15641563
MonoBehaviour:
15651564
m_ObjectHideFlags: 1
@@ -1673,7 +1672,6 @@ SkinnedMeshRenderer:
16731672
m_MotionVectors: 1
16741673
m_LightProbeUsage: 1
16751674
m_ReflectionProbeUsage: 1
1676-
m_RenderingLayerMask: 4294967295
16771675
m_Materials:
16781676
- {fileID: 2100000, guid: c99aacc3accab4fdaadab5e3ea13b9c7, type: 3}
16791677
m_StaticBatchInfo:
@@ -1736,7 +1734,6 @@ SkinnedMeshRenderer:
17361734
m_MotionVectors: 1
17371735
m_LightProbeUsage: 1
17381736
m_ReflectionProbeUsage: 1
1739-
m_RenderingLayerMask: 4294967295
17401737
m_Materials:
17411738
- {fileID: 2100000, guid: 013217fcf4bba4f3380d9159876fa8ea, type: 3}
17421739
m_StaticBatchInfo:

0 commit comments

Comments
 (0)