fog fix

5 年前 · f915007a
--- a/Assets/Animation/Cinematic.playable
+++ b/Assets/Animation/Cinematic.playable
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: c8d9d5ef0e7e17d4b991d92f67b6c16a
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 673022a8704d00948a6811a6fb50e08f
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: f1bb14aea4679fe4abc52848cb497d37
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: fc0584eda494f3047bed094921ea0810
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: db37bb3c92f82da40897ac72f0800f71
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 35e7853723bf81246bbc82771a648dc5
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 0377767c30d4f2c4a9ea0b05bc0c24a3
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: d95364d5e9c54b34ab9e8b4ee05a3d5b
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: f37a78650a0296948b0ef2a58645e9f1
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 084ef1bb1368f41429eb717976b7f1d6
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: e8622d05f4fee434db270b19d561318b
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 50d49ee0df669bf4a829b0f816e93ce1
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 9713c5e24bde9e24b9583d171efddc88
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 6d41c7525e3d84a4ab151368ea96b9f9
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 4011df92b4427874085fde4c962a56ea
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: f3f983da80361cb419c7b839d0b8fd3e
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: a4bd126ead05e5f4c997681c4b307ad3
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: ab8179a7882ed634b9840adef599a800
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
+--- !u!114 &3922828486750681056
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+  m_Name: Signal Emitter
+  m_EditorClassIdentifier: 
+  m_Time: 59.03333333333333
+  m_Retroactive: 0
+  m_EmitOnce: 0
+  m_Asset: {fileID: 11400000, guid: e47d7a3303764d94e9bf428801439ceb, type: 2}
 --- !u!114 &3930398738357248292
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: bc3292f3311e9804785a11a65463fdee
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 58391590978d32443a9900711543e1f3
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: d9d633b7e7054fd49ba0a0724aab6e79
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: dfa93128104dca34fbff23bf04f3e1dd
    defaultValue: {fileID: 0}
  m_Children: []
  m_Clips: []
  m_Markers:
-    m_Objects: []
+    m_Objects:
+    - {fileID: 3922828486750681056}
 --- !u!114 &6742355744459709594
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: aad6bc87ceae4114c8b1fc1198b5c217
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: 088e3452b622937408fc3ff8394f4f2d
    defaultValue: {fileID: 0}
  m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
  m_Name: CinemachineShot
  m_EditorClassIdentifier: 
+  DisplayName: 
  VirtualCamera:
    exposedName: a52d0cc18182eb34f9638056ef236a0a
    defaultValue: {fileID: 0}
--- a/Assets/ClusterDisplay/Scripts/ExitApp.cs
+++ b/Assets/ClusterDisplay/Scripts/ExitApp.cs
-using System.Collections;
-using System.Collections.Generic;
+using Unity.ClusterRendering;
 using UnityEngine;

 public class ExitApp : MonoBehaviour
-        if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.Q))
+        if (ClusterSynch.Active)
+        {
+            if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.Q))
+                ClusterSynch.Instance.ShutdownAllClusterNodes();
+        }
+        else
-#if UNITY_EDITOR    
-            UnityEditor.EditorApplication.ExitPlaymode();
-#else    
-            Application.Quit();
-#endif
+            if (ClusterSynch.Terminated)
+                Application.Quit(0);
        }
    }
 }
--- a/Assets/ClusterDisplay/Scripts/ResetVolumetricsOnCut.cs
+++ b/Assets/ClusterDisplay/Scripts/ResetVolumetricsOnCut.cs
            hdCam.Reset();
            hdCam.volumetricHistoryIsValid = false;
            hdCam.colorPyramidHistoryIsValid = false;
+#if UNITY_EDITOR
+            Debug.Log("ResetVolumetricsOnCut.CutHandler");
+#endif
        }
    }
 }
--- a/Assets/Resources/VirtualCameraManager.prefab
+++ b/Assets/Resources/VirtualCameraManager.prefab
  - component: {fileID: 3027554877427853618}
  - component: {fileID: 3027554877427853615}
  - component: {fileID: 4863388624406166532}
+  - component: {fileID: -4684115642597914423}
  m_Layer: 0
  m_Name: VirtualCameraManager
  m_TagString: MainCamera
      data1: 0
      data2: 0
  defaultFrameSettings: 0
+--- !u!114 &-4684115642597914423
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027554877427853619}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2ef4e595ebdfdbc409b50a52171f91f7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/Scenes/Demo/Demo.unity
+++ b/Assets/Scenes/Demo/Demo.unity
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &25927726
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  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: e398ceca33588144fbf8c04886332a8b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_GridSize: {x: 2, y: 2}
-  m_OverscanInPixels: 0
 --- !u!43 &43038843
 Mesh:
  m_ObjectHideFlags: 0
  - component: {fileID: 103036058}
  - component: {fileID: 103036057}
  - component: {fileID: 103036059}
+  - component: {fileID: 103036060}
+  - component: {fileID: 103036061}
  m_Layer: 0
  m_Name: Cinematic
  m_TagString: Untagged
  m_Script: {fileID: 11500000, guid: 7d9e9da1bf679f9439ad498bfc7933c7, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &103036060
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 103036056}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7bdbb8afafc8f7349a0b4e429eb99774, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Start: 56
+  m_Duration: 8
+--- !u!114 &103036061
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 103036056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Events:
+    m_Signals:
+    - {fileID: 11400000, guid: e47d7a3303764d94e9bf428801439ceb, type: 2}
+    m_Events:
+    - m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 2097608712}
+          m_MethodName: ExecuteNoArgs
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
 --- !u!43 &112509079
 Mesh:
  m_ObjectHideFlags: 0
  m_Script: {fileID: 11500000, guid: f262ab233d06b6e47ba3517050e5d678, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_Settings: {fileID: 25927726}
+  m_Settings:
+    m_GridSize: {x: 2, y: 2}
+    m_OverscanInPixels: 0
  m_Debug: 0
 --- !u!4 &832040624
 Transform:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2097608711}
+  - component: {fileID: 2097608712}
  m_Layer: 0
  m_Name: Cameras
  m_TagString: Untagged
  m_Father: {fileID: 235032663}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2097608712
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2097608710}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19451ac600084e54e8373d902dfd3668, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: ResetVolumetricsAction
 --- !u!1 &2121036480
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/ClusterDisplay/ResetVolumetricsSignal.signal
+++ b/Assets/ClusterDisplay/ResetVolumetricsSignal.signal
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
+  m_Name: ResetVolumetricsSignal
+  m_EditorClassIdentifier: 
--- a/Assets/ClusterDisplay/ResetVolumetricsSignal.signal.meta
+++ b/Assets/ClusterDisplay/ResetVolumetricsSignal.signal.meta
+fileFormatVersion: 2
+guid: e47d7a3303764d94e9bf428801439ceb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: