SEGAy/WACVR
1
0
Fork 0
mirror of synced 2024-11-24 14:50:10 +01:00
Code Releases Activity

change screen cap code back and switch light bake to CPU

Browse Source
This commit is contained in:
xpeng 2022-06-08 03:17:14 +02:00
parent 8b1c0ce92b
commit ccae556f92
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Default Lighting.lighting
View File

@ -8,7 +8,7 @@ LightingSettings:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Default Lighting m_Name: Default Lighting
serializedVersion: 4 serializedVersion: 4
m_GIWorkflowMode: 0 m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1 m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0 m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 1 m_RealtimeEnvironmentLighting: 1
@ -16,7 +16,7 @@ LightingSettings:
m_AlbedoBoost: 1 m_AlbedoBoost: 1
m_IndirectOutputScale: 1 m_IndirectOutputScale: 1
m_UsingShadowmask: 1 m_UsingShadowmask: 1
m_BakeBackend: 2 m_BakeBackend: 1
m_LightmapMaxSize: 1024 m_LightmapMaxSize: 1024
m_BakeResolution: 40 m_BakeResolution: 40
m_Padding: 2 m_Padding: 2

6
Assets/Scenes/WACVR.unity
View File

@ -2132,18 +2132,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6c150c011a6544b4b8054bba7ee5e5ca, type: 3} m_Script: {fileID: 11500000, guid: 6c150c011a6544b4b8054bba7ee5e5ca, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
searchTiming_: 0 searchTiming_: 1
type_: 0 type_: 0
altTabWindow_: 1 altTabWindow_: 1
createChildWindows_: 0 createChildWindows_: 0
childWindowPrefab: {fileID: 0} childWindowPrefab: {fileID: 0}
childWindowZDistance: 0.02 childWindowZDistance: 0.02
partialWindowTitle_: 'Mercury ' partialWindowTitle_: Mercury
desktopIndex_: 0 desktopIndex_: 0
captureMode: 1 captureMode: 1
capturePriority: 0 capturePriority: 0
captureRequestTiming: 0 captureRequestTiming: 0
captureFrameRate: 120 captureFrameRate: 60
drawCursor: 0 drawCursor: 0
updateTitle: 0 updateTitle: 0
searchAnotherWindowWhenInvalid: 0 searchAnotherWindowWhenInvalid: 0

BIN
Assets/Scenes/WACVR/LightingData.asset
View File

Binary file not shown.

BIN
Assets/Scenes/WACVR/Lightmap-0_comp_dir.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 244 KiB

BIN
Assets/Scenes/WACVR/Lightmap-0_comp_light.exr
View File

Binary file not shown.

1
Assets/uWindowCapture/Runtime/UwcManager.cs
View File

@ -174,7 +174,6 @@ public class UwcManager : MonoBehaviour
{ {
Lib.Update(Time.deltaTime); Lib.Update(Time.deltaTime);
UpdateWindowInfo(); UpdateWindowInfo();
if (!UwcWindowTexture.isWindowCaptured)
UpdateMessages(); UpdateMessages();
UpdateWindowTitles(); UpdateWindowTitles();
} }

4
Assets/uWindowCapture/Runtime/UwcWindowTexture.cs
View File

@ -196,7 +196,6 @@ public class UwcWindowTexture : MonoBehaviour
return window != null && window.isValid; return window != null && window.isValid;
} }
} }
static public bool isWindowCaptured = false;
Material material_; Material material_;
Renderer renderer_; Renderer renderer_;
@ -225,8 +224,7 @@ public class UwcWindowTexture : MonoBehaviour
{ {
UpdateSearchTiming(); UpdateSearchTiming();
UpdateTargetWindow(); UpdateTargetWindow();
if (!isWindowCaptured)
isWindowCaptured = window != null && window.isValid;
if (!isValid) { if (!isValid) {
material_.mainTexture = null; material_.mainTexture = null;
return; return;