Implement spherical harmonics

Assets/Settings/Mobile_RPAsset.asset

@@ -12,8 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
   m_Name: Mobile_RPAsset
   m_EditorClassIdentifier: 
-  k_AssetVersion: 12
+  k_AssetVersion: 13
-  k_AssetPreviousVersion: 12
+  k_AssetPreviousVersion: 13
   m_RendererType: 1
   m_RendererData: {fileID: 0}
   m_RendererDataList:
@@ -53,6 +53,7 @@ MonoBehaviour:
   m_AdditionalLightsShadowResolutionTierHigh: 1024
   m_ReflectionProbeBlending: 1
   m_ReflectionProbeBoxProjection: 1
+  m_ReflectionProbeAtlas: 1
   m_ShadowDistance: 50
   m_ShadowCascadeCount: 1
   m_Cascade2Split: 0.25
@@ -78,11 +79,11 @@ MonoBehaviour:
   m_UseAdaptivePerformance: 1
   m_ColorGradingMode: 0
   m_ColorGradingLutSize: 32
+  m_AllowPostProcessAlphaOutput: 0
   m_UseFastSRGBLinearConversion: 1
   m_SupportDataDrivenLensFlare: 1
   m_SupportScreenSpaceLensFlare: 1
   m_GPUResidentDrawerMode: 0
-  m_UseLegacyLightmaps: 0
   m_SmallMeshScreenPercentage: 0
   m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
   m_ShadowType: 1
@@ -109,6 +110,7 @@ MonoBehaviour:
   m_PrefilterDebugKeywords: 1
   m_PrefilterWriteRenderingLayers: 1
   m_PrefilterHDROutput: 1
+  m_PrefilterAlphaOutput: 0
   m_PrefilterSSAODepthNormals: 1
   m_PrefilterSSAOSourceDepthLow: 1
   m_PrefilterSSAOSourceDepthMedium: 0
@@ -126,8 +128,14 @@ MonoBehaviour:
   m_PrefilterSoftShadowsQualityHigh: 1
   m_PrefilterSoftShadows: 0
   m_PrefilterScreenCoord: 1
+  m_PrefilterScreenSpaceIrradiance: 0
   m_PrefilterNativeRenderPass: 1
   m_PrefilterUseLegacyLightmaps: 0
+  m_PrefilterBicubicLightmapSampling: 0
+  m_PrefilterReflectionProbeRotation: 0
+  m_PrefilterReflectionProbeBlending: 0
+  m_PrefilterReflectionProbeBoxProjection: 0
+  m_PrefilterReflectionProbeAtlas: 0
   m_ShaderVariantLogLevel: 0
   m_ShadowCascades: 0
   m_Textures:

Assets/vfx-graph-gs/Scripts/SplatImporter.cs

@@ -3,27 +3,15 @@ using Unity.Mathematics;
 using UnityEngine;
 using UnityEngine.VFX;
 using UnityEngine.VFX.Utility;
-using UnityEditor;
 using UnityEditor.AssetImporters;
 using UnityEditor.Experimental;
-using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using UnityEditor.Rendering.LookDev;
 using System.Linq;
 using System.Collections.Generic;
-using Unity.VectorGraphics;
-using Unity.VisualScripting;
-using System.Collections;
 using Unity.Collections;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine.Playables;
-using Unity.Android.Gradle.Manifest;
-using UnityEngine.Timeline;
 using Unity.Jobs;
-using System.Xml.Schema;
-using Unity.Android.Gradle;
 
 namespace SplatVfx.Editor
 {
@@ -285,6 +273,10 @@ namespace SplatVfx.Editor
                     splatData.OpacityArray[totalElemsRead + i] = splatDataNative.opacity[i];
                     splatData.ScaleArray[totalElemsRead + i] = splatDataNative.scale[i];
                     splatData.RotationArray[totalElemsRead + i] = new quaternion(splatDataNative.rotation[i]);
+                    for (int j = 0; j < 45; j++)
+                    {
+                        splatData.SHArray[(totalElemsRead + i) * 45 + j] = splatDataNative.sh[i * 45 + j];
+                    }
                 }
 
                 totalElemsRead += numElemsRead;
@@ -336,7 +328,7 @@ namespace SplatVfx.Editor
 
                     for (int j = 0; j < 45; j++)
                     {
-                        splatDataNative.sh[elemIx + j] = chunkBytes[start + headerData.ElementByteOffsets[(int)DataEnum.f_rest_0 + j]];
+                        splatDataNative.sh[elemIx * 45 + j] = chunkBytes.ReinterpretLoad<float>(start + headerData.ElementByteOffsets[(int)DataEnum.f_rest_0 + j]);
                     }
 
                     float opacity = chunkBytes.ReinterpretLoad<float>(start + headerData.ElementByteOffsets[(int)DataEnum.opacity]);
@@ -363,128 +355,6 @@ namespace SplatVfx.Editor
             }
         }
 
-        SplatData ImportAsSplatData((string format, int num_element, List<(string, string)> properties) header_info, byte[] binaryData)
-        {
-            var splatData = ScriptableObject.CreateInstance<SplatData>();
-
-            var stream = new MemoryStream(binaryData);
-            var reader = new BinaryReader(stream);
-
-            splatData.PositionArray = new Vector3[header_info.num_element];
-            splatData.ScaleArray = new Vector3[header_info.num_element];
-            splatData.RotationArray = new Quaternion[header_info.num_element];
-            splatData.ColorArray = new Color[header_info.num_element];
-            splatData.OpacityArray = new float[header_info.num_element];
-            splatData.SHArray = new float[header_info.num_element * 45];
-
-            for (int i = 0; i < header_info.num_element; i++)
-            {
-                foreach ((string name, string dtype) property in header_info.properties)
-                {
-                    float val = reader.ReadSingle();
-
-                    switch (property.name)
-                    {
-                        case "x":
-                            splatData.PositionArray[i].x = val;
-
-                            break;
-
-                        case "y":
-                            splatData.PositionArray[i].y = val;
-
-                            break;
-
-                        case "z":
-                            splatData.PositionArray[i].z = val;
-
-                            break;
-
-                        case "opacity":
-                            splatData.OpacityArray[i] = 1 / (1 + math.exp(-val));
-
-                            break;
-
-                        default:
-                            if (property.name.StartsWith("f_dc"))
-                            {
-                                switch (property.name[5])
-                                {
-                                    case '0':
-                                        splatData.ColorArray[i].r = 0.5f + val * SH_C0;
-
-                                        break;
-
-                                    case '1':
-                                        splatData.ColorArray[i].g = 0.5f + val * SH_C0;
-
-                                        break;
-
-                                    case '2':
-                                        splatData.ColorArray[i].b = 0.5f + val * SH_C0;
-
-                                        break;
-                                }
-
-                            }
-                            else if (property.name.StartsWith("scale"))
-                            {
-                                switch (property.name[6])
-                                {
-                                    case '0':
-                                        splatData.ScaleArray[i].x = math.exp(val);
-
-                                        break;
-
-                                    case '1':
-                                        splatData.ScaleArray[i].y = math.exp(val);
-
-                                        break;
-
-                                    case '2':
-                                        splatData.ScaleArray[i].z = math.exp(val);
-
-                                        break;
-                                }
-
-                            }
-                            else if (property.name.StartsWith("rot"))
-                            {
-                                switch (property.name[4])
-                                {
-                                    case '0':
-                                        splatData.RotationArray[i].w = val;
-
-                                        break;
-
-                                    case '1':
-                                        splatData.RotationArray[i].x = val;
-
-                                        break;
-
-                                    case '2':
-                                        splatData.RotationArray[i].y = val;
-
-                                        break;
-
-                                    case '3':
-                                        splatData.RotationArray[i].z = val;
-
-                                        break;
-                                }
-
-                            }
-
-                            break;
-                    }
-                }
-            }
-
-            splatData.ReleaseGpuResources();
-
-            return splatData;
-        }
-
         // struct ReadData
         // {
         //     public float px, py, pz;

Assets/vfx-graph-gs/VFXGraphHLSL/CalculateSH.hlsl

@@ -1,5 +1,4 @@
-#define sh(i) (float3)SHBuffer.Load3(Index * 45 + (i - 1) * 15)
+float3 CalculateSHColor(uint Index, uint Degrees, float4x4 DirClr, StructuredBuffer<float> SHBuffer) {
-
 	const float SH_C0 = 0.28209479177387814f;
 	const float SH_C1 = 0.4886025119029199f;
 	const float SH_C2[] = {
@@ -19,39 +18,53 @@ const float SH_C3[] = {
 		-0.5900435899266435f
 	};
 
-// float3 CalculateSHColor(uint Index, uint Degrees, float3 Direction, StructuredBuffer<float3> SHBuffer) {
-float3 CalculateSHColor(uint Index, uint Degrees, float4x4 DirClr, ByteAddressBuffer SHBuffer) {
     float3 dir = DirClr[0].xyz;
     float3 result = DirClr[1].xyz;
 
+	float3 sh[16];
+
+	// for (int i = 1; i < 16; i++)
+	// {
+	// 	sh[i].x = SHBuffer[Index * 45 + (i - 1) * 3];
+	// 	sh[i].y = SHBuffer[Index * 45 + (i - 1) * 3 + 1];
+	// 	sh[i].z = SHBuffer[Index * 45 + (i - 1) * 3 + 2];
+	// }
+	for (int i = 1; i < 16; i++)
+	{
+		// Access R, G, B values from their separate blocks
+		sh[i].x = SHBuffer[Index * 45 + (i - 1)];           // R values (indices 0-44)
+		sh[i].y = SHBuffer[Index * 45 + 15 + (i - 1)];      // G values (indices 45-89)  
+		sh[i].z = SHBuffer[Index * 45 + 30 + (i - 1)];      // B values (indices 90-134)
+	}
+
     if (Degrees > 0)
 	{
 		float x = dir.x;
 		float y = dir.y;
 		float z = dir.z;
-		result = result - SH_C1 * y * sh(1) + SH_C1 * z * sh(2) - SH_C1 * x * sh(3);
+		result = result - SH_C1 * y * sh[1] + SH_C1 * z * sh[2] - SH_C1 * x * sh[3];
 
 		if (Degrees > 1)
 		{
 			float xx = x * x, yy = y * y, zz = z * z;
 			float xy = x * y, yz = y * z, xz = x * z;
 			result = result +
-				SH_C2[0] * xy * sh(4) +
+				SH_C2[0] * xy * sh[4] +
-				SH_C2[1] * yz * sh(5) +
+				SH_C2[1] * yz * sh[5] +
-				SH_C2[2] * (2.0f * zz - xx - yy) * sh(6) +
+				SH_C2[2] * (2.0f * zz - xx - yy) * sh[6] +
-				SH_C2[3] * xz * sh(7) +
+				SH_C2[3] * xz * sh[7] +
-				SH_C2[4] * (xx - yy) * sh(8);
+				SH_C2[4] * (xx - yy) * sh[8];
 
 			if (Degrees > 2)
 			{
 				result = result +
-					SH_C3[0] * y * (3.0f * xx - yy) * sh(9) +
+					SH_C3[0] * y * (3.0f * xx - yy) * sh[9] +
-					SH_C3[1] * xy * z * sh(10) +
+					SH_C3[1] * xy * z * sh[10] +
-					SH_C3[2] * y * (4.0f * zz - xx - yy) * sh(11) +
+					SH_C3[2] * y * (4.0f * zz - xx - yy) * sh[11] +
-					SH_C3[3] * z * (2.0f * zz - 3.0f * xx - 3.0f * yy) * sh(12) +
+					SH_C3[3] * z * (2.0f * zz - 3.0f * xx - 3.0f * yy) * sh[12] +
-					SH_C3[4] * x * (4.0f * zz - xx - yy) * sh(13) +
+					SH_C3[4] * x * (4.0f * zz - xx - yy) * sh[13] +
-					SH_C3[5] * z * (xx - yy) * sh(14) +
+					SH_C3[5] * z * (xx - yy) * sh[14] +
-					SH_C3[6] * x * (xx - 3.0f * yy) * sh(15);
+					SH_C3[6] * x * (xx - 3.0f * yy) * sh[15];
 			}
 		}
 	}

ProjectSettings/GraphicsSettings.asset

@@ -61,7 +61,7 @@ GraphicsSettings:
     UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2}
   m_ShaderBuildSettings:
     keywordDeclarationOverrides: []
-  m_LightsUseLinearIntensity: 1
+  m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 1
   m_LogWhenShaderIsCompiled: 0
   m_LightProbeOutsideHullStrategy: 0

ProjectSettings/PackageManagerSettings.asset

@@ -12,11 +12,13 @@ MonoBehaviour:
   m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EnablePreviewPackages: 0
+  m_EnablePreReleasePackages: 0
-  m_EnablePackageDependencies: 0
   m_AdvancedSettingsExpanded: 1
   m_ScopedRegistriesSettingsExpanded: 1
-  oneTimeWarningShown: 0
+  m_SeeAllPackageVersions: 0
+  m_DismissPreviewPackagesInUse: 0
+  oneTimeWarningShown: 1
+  oneTimePackageErrorsPopUpShown: 0
   m_Registries:
   - m_Id: main
     m_Name: 
@@ -24,20 +26,15 @@ MonoBehaviour:
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7
+    m_ConfigSource: 0
+    m_Compliance:
+      m_Status: 0
+      m_Violations: []
   m_UserSelectedRegistryName: 
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
-    m_ErrorMessage: 
-    m_Original:
-      m_Id: 
-      m_Name: 
-      m_Url: 
-      m_Scopes: []
-      m_IsDefault: 0
-      m_Capabilities: 0
     m_Modified: 0
-    m_Name: 
+    m_ErrorMessage: 
-    m_Url: 
+    m_UserModificationsInstanceId: -900
-    m_Scopes:
+    m_OriginalInstanceId: -902
-    - 
+  m_LoadAssets: 0
-    m_SelectedScopeIndex: 0

ProjectSettings/ProjectSettings.asset

@@ -47,7 +47,7 @@ PlayerSettings:
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
-  m_ActiveColorSpace: 1
+  m_ActiveColorSpace: 0
   unsupportedMSAAFallback: 0
   m_SpriteBatchMaxVertexCount: 65535
   m_SpriteBatchVertexThreshold: 300
@@ -535,6 +535,9 @@ PlayerSettings:
   - m_BuildTarget: AndroidPlayer
     m_APIs: 150000000b000000
     m_Automatic: 0
+  - m_BuildTarget: WebGLSupport
+    m_APIs: 1c0000000b000000
+    m_Automatic: 0
   m_BuildTargetVRSettings: []
   m_DefaultShaderChunkSizeInMB: 16
   m_DefaultShaderChunkCount: 0
@@ -560,6 +563,9 @@ PlayerSettings:
   - serializedVersion: 3
     m_BuildTarget: Android
     m_Formats: 03000000
+  - serializedVersion: 3
+    m_BuildTarget: WebGL
+    m_Formats: 05000000
   playModeTestRunnerEnabled: 0
   runPlayModeTestAsEditModeTest: 0
   actionOnDotNetUnhandledException: 1
@@ -808,7 +814,7 @@ PlayerSettings:
   webGLTemplate: APPLICATION:Default
   webGLAnalyzeBuildSize: 0
   webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 0
+  webGLCompressionFormat: 1
   webGLWasmArithmeticExceptions: 0
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
@@ -819,7 +825,7 @@ PlayerSettings:
   webGLMemoryLinearGrowthStep: 16
   webGLMemoryGeometricGrowthStep: 0.2
   webGLMemoryGeometricGrowthCap: 96
-  webGLPowerPreference: 2
+  webGLPowerPreference: 1
   webGLWebAssemblyTable: 0
   webGLWebAssemblyBigInt: 0
   webGLCloseOnQuit: 0

ProjectSettings/QualitySettings.asset

@@ -4,9 +4,9 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 1
+  m_CurrentQuality: 0
   m_QualitySettings:
-  - serializedVersion: 4
+  - serializedVersion: 5
     name: Mobile
     pixelLightCount: 2
     shadows: 2
@@ -34,6 +34,7 @@ QualitySettings:
     adaptiveVsyncExtraA: 0
     adaptiveVsyncExtraB: 0
     lodBias: 1
+    meshLodThreshold: 1
     maximumLODLevel: 0
     enableLODCrossFade: 1
     streamingMipmapsActive: 0
@@ -47,8 +48,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858,
+    customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858, type: 2}
-      type: 2}
     terrainQualityOverrides: 0
     terrainPixelError: 1
     terrainDetailDensityScale: 1
@@ -60,7 +60,7 @@ QualitySettings:
     terrainMaxTrees: 50
     excludedTargetPlatforms:
     - Standalone
-  - serializedVersion: 4
+  - serializedVersion: 5
     name: PC
     pixelLightCount: 2
     shadows: 2
@@ -88,6 +88,7 @@ QualitySettings:
     adaptiveVsyncExtraA: 0
     adaptiveVsyncExtraB: 0
     lodBias: 2
+    meshLodThreshold: 1
     maximumLODLevel: 0
     enableLODCrossFade: 1
     streamingMipmapsActive: 0
@@ -101,8 +102,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd,
+    customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2}
-      type: 2}
     terrainQualityOverrides: 0
     terrainPixelError: 1
     terrainDetailDensityScale: 1
@@ -122,6 +122,7 @@ QualitySettings:
     GameCoreXboxOne: 1
     Lumin: 0
     Nintendo Switch: 1
+    Nintendo Switch 2: 1
     PS4: 1
     PS5: 1
     Server: 0

ProjectSettings/SceneTemplateSettings.json

@@ -0,0 +1,121 @@
+{
+    "templatePinStates": [],
+    "dependencyTypeInfos": [
+        {
+            "userAdded": false,
+            "type": "UnityEngine.AnimationClip",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.Animations.AnimatorController",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.AnimatorOverrideController",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.Audio.AudioMixerController",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.ComputeShader",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Cubemap",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.GameObject",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.LightingDataAsset",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.LightingSettings",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Material",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.MonoScript",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.PhysicsMaterial",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.PhysicsMaterial2D",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.VolumeProfile",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.SceneAsset",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Shader",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.ShaderVariantCollection",
+            "defaultInstantiationMode": 1
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Texture",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Texture2D",
+            "defaultInstantiationMode": 0
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Timeline.TimelineAsset",
+            "defaultInstantiationMode": 0
+        }
+    ],
+    "defaultDependencyTypeInfo": {
+        "userAdded": false,
+        "type": "<default_scene_template_dependencies>",
+        "defaultInstantiationMode": 1
+    },
+    "newSceneOverride": 0
+}

ProjectSettings/VFXManager.asset

@@ -3,12 +3,12 @@
 --- !u!937362698 &1
 VFXManager:
   m_ObjectHideFlags: 0
-  m_IndirectShader: {fileID: 0}
+  m_IndirectShader: {fileID: 7200000, guid: 84a17cfa13e40ae4082ef42714f0a81c, type: 3}
-  m_CopyBufferShader: {fileID: 0}
+  m_CopyBufferShader: {fileID: 7200000, guid: 23c51f21a3503f6428b527b01f8a2f4e, type: 3}
-  m_PrefixSumShader: {fileID: 0}
+  m_PrefixSumShader: {fileID: 7200000, guid: 783e0fdc1a277f54bb851fd2ceab1e7f, type: 3}
-  m_SortShader: {fileID: 0}
+  m_SortShader: {fileID: 7200000, guid: ea257ca3cfb12a642a5025e612af6b2a, type: 3}
-  m_StripUpdateShader: {fileID: 0}
+  m_StripUpdateShader: {fileID: 7200000, guid: 8fa6c4009fe2a4d4486c62736fc30ad8, type: 3}
-  m_EmptyShader: {fileID: 0}
+  m_EmptyShader: {fileID: 4800000, guid: 33a2079f6a2db4c4eb2e44b33f4ddf6b, type: 3}
   m_RenderPipeSettingsPath: 
   m_FixedTimeStep: 0.016666668
   m_MaxDeltaTime: 0.05
@@ -16,5 +16,5 @@ VFXManager:
   m_MaxCapacity: 100000000
   m_CompiledVersion: 7
   m_RuntimeVersion: 39
-  m_RuntimeResources: {fileID: 0}
+  m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2}
   m_BatchEmptyLifetime: 300