Add baked lightmaps and cubemap

2020-12-01 01:53:43 +02:00
parent dd0a163c1e
commit 2b9669daac
223 changed files with 2616 additions and 1405 deletions
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/L_controller_DIF.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/L_controller_DIF.mat
@@ -51,16 +51,29 @@ Material:
    - _QueueOffset: 0
    - _ReceiveShadows: 1
    - _Shininess: 0
-    - _Smoothness: 0.5
-    - _SmoothnessSource: 0
+    - _Smoothness: 0
+    - _SmoothnessSource: 1
    - _SpecSource: 0
-    - _SpecularHighlights: 1
+    - _SpecularHighlights: 0
    - _SrcBlend: 1
    - _Surface: 0
    - _ZWrite: 1
    m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
  m_BuildTextureStacks: []
+--- !u!114 &155159946685813924
+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: 2
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/L_controller_MAT.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/L_controller_MAT.mat
@@ -9,8 +9,8 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: L_controller_MAT
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 5
+  m_ShaderKeywords: _EMISSION _ENVIRONMENTREFLECTIONS_OFF
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: 2000
@@ -72,7 +72,7 @@ Material:
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
-    - _EnvironmentReflections: 1
+    - _EnvironmentReflections: 0
    - _GlossMapScale: 0
    - _Glossiness: 0.49
    - _GlossyReflections: 0
@@ -96,3 +96,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &8234068557095131420
+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: 2
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/L_controller_gloss_MAT.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/L_controller_gloss_MAT.mat
@@ -9,8 +9,8 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: L_controller_gloss_MAT
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 5
+  m_ShaderKeywords: _EMISSION _ENVIRONMENTREFLECTIONS_OFF
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: 2000
@@ -72,7 +72,7 @@ Material:
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
-    - _EnvironmentReflections: 1
+    - _EnvironmentReflections: 0
    - _GlossMapScale: 0
    - _Glossiness: 0.9
    - _GlossyReflections: 0
@@ -96,3 +96,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &3844392337500225883
+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: 2
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/R_controller_DIF.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/R_controller_DIF.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1416916661988286223
+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: 2
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -52,10 +65,10 @@ Material:
    - _QueueOffset: 0
    - _ReceiveShadows: 1
    - _Shininess: 0
-    - _Smoothness: 0.5
+    - _Smoothness: 0
    - _SmoothnessSource: 1
    - _SpecSource: 0
-    - _SpecularHighlights: 1
+    - _SpecularHighlights: 0
    - _SrcBlend: 5
    - _Surface: 1
    - _ZWrite: 0
@@ -63,5 +76,5 @@ Material:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
  m_BuildTextureStacks: []
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/R_controller_MAT.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/R_controller_MAT.mat
@@ -9,7 +9,7 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: R_controller_MAT
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP
+  m_ShaderKeywords: _EMISSION _ENVIRONMENTREFLECTIONS_OFF
  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@@ -72,7 +72,7 @@ Material:
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
-    - _EnvironmentReflections: 1
+    - _EnvironmentReflections: 0
    - _GlossMapScale: 0
    - _Glossiness: 0.5
    - _GlossyReflections: 0
@@ -96,3 +96,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &9168858792621623454
+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: 2
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/R_controller_gloss_MAT.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/R_controller_gloss_MAT.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8487123319415983119
+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: 2
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -9,8 +22,8 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: R_controller_gloss_MAT
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 5
+  m_ShaderKeywords: _EMISSION _ENVIRONMENTREFLECTIONS_OFF
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: 2000
@@ -72,7 +85,7 @@ Material:
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
-    - _EnvironmentReflections: 1
+    - _EnvironmentReflections: 0
    - _GlossMapScale: 0
    - _Glossiness: 0.9
    - _GlossyReflections: 0
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/lambert1.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/lambert1.mat
@@ -96,3 +96,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &7728087402266486488
+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: 2
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/touchController_basecolor.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials/touchController_basecolor.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1771105738549478936
+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: 2
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
--- a/Assets/Oculus/SampleFramework/Core/TouchControllers/Models/touch_controller_MAT.mat
+++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Models/touch_controller_MAT.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2799780845466063260
+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: 2
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -9,7 +22,7 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: touch_controller_MAT
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _OCCLUSIONMAP
+  m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _OCCLUSIONMAP
  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0