GI

2 years ago · 2a4307a99c
10 changed files with 1179 additions and 346 deletions
--- a/Assets/Act-3.meta
+++ b/Assets/Act-3.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cc0aeb0a15f97f64ead96f3ff040c631
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Act-3.unity
+++ b/Assets/Act-3.unity
--- a/Assets/Act-3/LightingData.asset
+++ b/Assets/Act-3/LightingData.asset
--- a/Assets/Act-3/LightingData.asset.meta
+++ b/Assets/Act-3/LightingData.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 16ed61f6b9b231649a6df15ed07e17fa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 112000000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Settings/Act-3.asset
+++ b/Assets/Settings/Act-3.asset
@ -21,10 +21,10 @@ MonoBehaviour:
    m_Value: 21.6
  intensity:
    m_OverrideState: 1
-    m_Value: 0.511
+    m_Value: 0.461
  scatter:
    m_OverrideState: 1
-    m_Value: 0.7
+    m_Value: 0.592
  tint:
    m_OverrideState: 1
    m_Value: {r: 1, g: 1, b: 1, a: 1}
@ -153,6 +153,8 @@ MonoBehaviour:
  - {fileID: -7674961417376271214}
  - {fileID: 9064381807159038841}
  - {fileID: 691390004891524011}
+  - {fileID: 8798172015287646681}
+  - {fileID: 4655394269607463956}
 --- !u!114 &691390004891524011
 MonoBehaviour:
  m_ObjectHideFlags: 3
@ -469,6 +471,130 @@ MonoBehaviour:
  fogType:
    m_OverrideState: 1
    m_Value: 0
+--- !u!114 &4655394269607463956
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: f034cba68ab55e046ae1445a42f18c0e, type: 3}
+  m_Name: IndirectLightingController
+  m_EditorClassIdentifier: 
+  active: 1
+  indirectDiffuseLightingMultiplier:
+    m_OverrideState: 1
+    m_Value: 1
+  indirectDiffuseLightingLayers:
+    m_OverrideState: 1
+    m_Value: 255
+  reflectionLightingMultiplier:
+    m_OverrideState: 1
+    m_Value: 0
+  reflectionLightingLayers:
+    m_OverrideState: 1
+    m_Value: 255
+  reflectionProbeIntensityMultiplier:
+    m_OverrideState: 1
+    m_Value: 1
+--- !u!114 &8798172015287646681
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: 42ef2681fa3dc8c4fa031f044e68c63f, type: 3}
+  m_Name: GlobalIllumination
+  m_EditorClassIdentifier: 
+  active: 1
+  quality:
+    m_OverrideState: 1
+    m_Value: 3
+  enable:
+    m_OverrideState: 1
+    m_Value: 1
+  tracing:
+    m_OverrideState: 1
+    m_Value: 1
+  rayMiss:
+    m_OverrideState: 0
+    m_Value: 3
+  depthBufferThickness:
+    m_OverrideState: 1
+    m_Value: 0.334
+  fullResolutionSS:
+    m_OverrideState: 1
+    m_Value: 1
+  m_MaxRaySteps:
+    m_OverrideState: 1
+    m_Value: 128
+  m_DenoiseSS:
+    m_OverrideState: 1
+    m_Value: 1
+  m_HalfResolutionDenoiserSS:
+    m_OverrideState: 1
+    m_Value: 1
+  m_DenoiserRadiusSS:
+    m_OverrideState: 1
+    m_Value: 1
+  m_SecondDenoiserPassSS:
+    m_OverrideState: 1
+    m_Value: 1
+  lastBounceFallbackHierarchy:
+    m_OverrideState: 0
+    m_Value: 3
+  ambientProbeDimmer:
+    m_OverrideState: 0
+    m_Value: 0
+  layerMask:
+    m_OverrideState: 1
+    m_Value:
+      serializedVersion: 2
+      m_Bits: 4294967295
+  textureLodBias:
+    m_OverrideState: 1
+    m_Value: 7
+  m_RayLength:
+    m_OverrideState: 1
+    m_Value: 50
+  m_ClampValue:
+    m_OverrideState: 1
+    m_Value: 1
+  mode:
+    m_OverrideState: 1
+    m_Value: 2
+  m_FullResolution:
+    m_OverrideState: 1
+    m_Value: 0
+  sampleCount:
+    m_OverrideState: 1
+    m_Value: 2
+  bounceCount:
+    m_OverrideState: 1
+    m_Value: 1
+  m_Denoise:
+    m_OverrideState: 1
+    m_Value: 1
+  m_HalfResolutionDenoiser:
+    m_OverrideState: 1
+    m_Value: 0
+  m_DenoiserRadius:
+    m_OverrideState: 1
+    m_Value: 0.6
+  m_SecondDenoiserPass:
+    m_OverrideState: 1
+    m_Value: 1
+  m_MaxMixedRaySteps:
+    m_OverrideState: 1
+    m_Value: 48
+  receiverMotionRejection:
+    m_OverrideState: 0
+    m_Value: 1
 --- !u!114 &9064381807159038841
 MonoBehaviour:
  m_ObjectHideFlags: 3
--- a/Assets/Settings/HDRPDefaultResources/HDRenderPipelineAsset.asset
+++ b/Assets/Settings/HDRPDefaultResources/HDRenderPipelineAsset.asset
@ -17,7 +17,7 @@ MonoBehaviour:
    supportSSR: 0
    supportSSRTransparent: 0
    supportSSAO: 1
-    supportSSGI: 0
+    supportSSGI: 1
    supportSubsurfaceScattering: 1
    sssSampleBudget:
      m_Values: 140000002800000050000000
--- a/Assets/VFX/A3_Avatar.vfx
+++ b/Assets/VFX/A3_Avatar.vfx
@ -43208,7 +43208,7 @@ MonoBehaviour:
      m_Type:
        m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
          PublicKeyToken=b77a5c561934e089
-      m_SerializableObject: 0
+      m_SerializableObject: 1
    m_Space: 2147483647
  m_Property:
    name: smoothness
--- a/Assets/VFX/PointCloud.vfx
+++ b/Assets/VFX/PointCloud.vfx
@ -200,10 +200,10 @@ MonoBehaviour:
    collapsed: 0
  uiBounds:
    serializedVersion: 2
-    x: -1923
+    x: -1924
    y: -201
-    width: 3342
-    height: 5462
+    width: 3343
+    height: 5463
 --- !u!114 &114350483966674976
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -12173,7 +12173,7 @@ MonoBehaviour:
      m_Type:
        m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
          PublicKeyToken=b77a5c561934e089
-      m_SerializableObject: 0
+      m_SerializableObject: 0.349
    m_Space: 2147483647
  m_Property:
    name: smoothness
@ -12207,7 +12207,7 @@ MonoBehaviour:
      m_Type:
        m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
          PublicKeyToken=b77a5c561934e089
-      m_SerializableObject: 0
+      m_SerializableObject: 0.141
    m_Space: 2147483647
  m_Property:
    name: metallic
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -5,6 +5,7 @@
    "com.unity.recorder": "4.0.1",
    "com.unity.render-pipelines.high-definition": "14.0.8",
    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.7.6",
    "com.unity.ugui": "1.0.0",
    "com.unity.visualscripting": "1.8.0",
    "jp.keijiro.klak.ndi": "2.1.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -191,8 +191,8 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.timeline": {
-      "version": "1.7.5",
-      "depth": 1,
+      "version": "1.7.6",
+      "depth": 0,
      "source": "registry",
      "dependencies": {
        "com.unity.modules.director": "1.0.0",