Merge pull request #47 from OSVR/updatedLightmaps

Updated lightmaps
OSVR · Nov 21, 2016 · 7d6e6a9 · 7d6e6a9
2 parents beb47d3 + 9a19767
commit 7d6e6a9
Show file tree

Hide file tree

Showing 112 changed files with 249 additions and 108 deletions.
diff --git a/Assets/Plugins/OSVR.ClientKit.dll.mdb.meta → Assets/Editor.meta b/Assets/Plugins/OSVR.ClientKit.dll.mdb.meta → Assets/Editor.meta
diff --git a/Assets/Palace of Orinthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian.unity b/Assets/Palace of Orinthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian.unity
@@ -189,9 +189,9 @@ LightmapSettings:
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
     m_DirectLightInLightProbes: 0
-    m_FinalGather: 0
+    m_FinalGather: 1
     m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 1024
+    m_FinalGatherRayCount: 512
     m_ReflectionCompression: 2
   m_LightingDataAsset: {fileID: 112000001, guid: 640e6c652b14e6249b9b06ea63ee175a,
     type: 2}
@@ -223,6 +223,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 554412790}
+  - {fileID: 6063849}
   m_Father: {fileID: 0}
   m_RootOrder: 2
 --- !u!196 &715
@@ -242,6 +243,69 @@ NavMeshSettings:
     cellSize: 0.14999999
     manualCellSize: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &6063848
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 6063849}
+  - 108: {fileID: 6063850}
+  m_Layer: 0
+  m_Name: Point light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 0
+--- !u!4 &6063849
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 6063848}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 13, z: -17.4}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 283}
+  m_RootOrder: 1
+--- !u!108 &6063850
+Light:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 6063848}
+  m_Enabled: 1
+  serializedVersion: 7
+  m_Type: 2
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 30
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 2
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
 --- !u!1001 &31005307
 Prefab:
   m_ObjectHideFlags: 0
@@ -3546,7 +3610,7 @@ Light:
   m_SpotAngle: 30
   m_CookieSize: 10
   m_Shadows:
-    m_Type: 2
+    m_Type: 0
     m_Resolution: -1
     m_CustomResolution: -1
     m_Strength: 1

diff --git a/...f Orinthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/LightingData.asset b/...f Orinthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/LightingData.asset
diff --git a/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/LightingData.asset.meta b/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/LightingData.asset.meta
diff --git a/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-0_comp_dir.exr b/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-0_comp_dir.exr
diff --git a/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-0_comp_dir.exr.meta b/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-0_comp_dir.exr.meta
diff --git a/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-0_comp_light.exr b/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-0_comp_light.exr
diff --git a/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-0_comp_light.exr.meta b/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-0_comp_light.exr.meta
diff --git a/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-1_comp_dir.exr b/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-1_comp_dir.exr
diff --git a/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-1_comp_dir.exr.meta b/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-1_comp_dir.exr.meta
diff --git a/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-1_comp_light.exr b/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-1_comp_light.exr
diff --git a/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-1_comp_light.exr.meta b/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-1_comp_light.exr.meta
diff --git a/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-2_comp_dir.exr b/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-2_comp_dir.exr
diff --git a/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-2_comp_dir.exr.meta b/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-2_comp_dir.exr.meta
diff --git a/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-2_comp_light.exr b/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-2_comp_light.exr
diff --git a/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-2_comp_light.exr.meta b/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-2_comp_light.exr.meta
diff --git a/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-3_comp_dir.exr b/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-3_comp_dir.exr
diff --git a/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-3_comp_dir.exr.meta b/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-3_comp_dir.exr.meta
diff --git a/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-3_comp_light.exr b/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-3_comp_light.exr
diff --git a/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-3_comp_light.exr.meta b/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-3_comp_light.exr.meta
diff --git a/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-4_comp_dir.exr b/...nthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-4_comp_dir.exr
diff --git a/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-4_comp_dir.exr.meta b/...ian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-4_comp_dir.exr.meta
diff --git a/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-4_comp_light.exr b/...halian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-4_comp_light.exr
diff --git a/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-4_comp_light.exr.meta b/...n/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/Lightmap-4_comp_light.exr.meta
diff --git a/...rinthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/ReflectionProbe-0.exr b/...rinthalian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/ReflectionProbe-0.exr
diff --git a/...alian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/ReflectionProbe-0.exr.meta b/...alian/[Scenes]/Palace of Orinthalian/The Palace of Orinthalian/ReflectionProbe-0.exr.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libcrystax.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libcrystax.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libgnustl_shared.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libgnustl_shared.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libjsoncpp.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libjsoncpp.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrClient.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrClient.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrClientKit.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrClientKit.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrCommon.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrCommon.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrConnection.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrConnection.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrUtil.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrUtil.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libusb1.0.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libusb1.0.so.meta
diff --git a/Assets/Plugins/OSVR.ClientKit.dll.mdb b/Assets/Plugins/OSVR.ClientKit.dll.mdb
diff --git a/Assets/Plugins/OSVR.ClientKit.dll.meta b/Assets/Plugins/OSVR.ClientKit.dll.meta
diff --git a/Assets/Plugins/OSVR.ClientKit.pdb.meta b/Assets/Plugins/OSVR.ClientKit.pdb.meta
diff --git a/Assets/Plugins/x86/BINARY_README.html.meta b/Assets/Plugins/x86/BINARY_README.html.meta
diff --git a/Assets/Plugins/x86/CONTRIBUTING.html.meta b/Assets/Plugins/x86/CONTRIBUTING.html.meta
diff --git a/Assets/Plugins/x86/LICENSE.meta b/Assets/Plugins/x86/LICENSE.meta
diff --git a/Assets/Plugins/x86/NEWS.html.meta b/Assets/Plugins/x86/NEWS.html.meta
diff --git a/Assets/Plugins/x86/NOTICE.meta b/Assets/Plugins/x86/NOTICE.meta
diff --git a/Assets/Plugins/x86/README.html.meta b/Assets/Plugins/x86/README.html.meta
diff --git a/Assets/Plugins/x86/SDL2.dll.meta b/Assets/Plugins/x86/SDL2.dll.meta
diff --git a/Assets/Plugins/x86/add_sdk_to_registry.cmd.meta b/Assets/Plugins/x86/add_sdk_to_registry.cmd.meta
diff --git a/Assets/Plugins/x86/add_sdk_to_registry.ps1.meta b/Assets/Plugins/x86/add_sdk_to_registry.ps1.meta
diff --git a/Assets/Plugins/x86/d3dcompiler_47.dll.meta b/Assets/Plugins/x86/d3dcompiler_47.dll.meta
diff --git a/Assets/Plugins/x86/glew32.dll.meta b/Assets/Plugins/x86/glew32.dll.meta
diff --git a/Assets/Plugins/x86/msvcp120.dll.meta b/Assets/Plugins/x86/msvcp120.dll.meta
diff --git a/Assets/Plugins/x86/msvcr120.dll.meta b/Assets/Plugins/x86/msvcr120.dll.meta