diff options
| author | yum <yum.food.vr@gmail.com> | 2025-07-28 00:51:48 -0700 |
|---|---|---|
| committer | yum <yum.food.vr@gmail.com> | 2025-07-28 00:51:48 -0700 |
| commit | 795cb4c8b5e45c7f772b9efb01799c0a722e984d (patch) | |
| tree | f2dad4eec2e16be261488106ed69de7df17cadca | |
| parent | a3dea99049319d85f7baa62c2710e2ff6b46e0b1 (diff) | |
Update assets
| -rw-r--r-- | CRT Mats/fft_256x256_r16_3_bitrev.mat | 3 | ||||
| -rw-r--r-- | CRT Mats/ifft_256x256_r16_3_bitrev.mat | 3 | ||||
| -rw-r--r-- | CRT Mats/passthrough.mat | 3 | ||||
| -rw-r--r-- | CRTs/fft_stage0.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/fft_stage1.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/fft_stage2.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/fft_stage3.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/fft_stage3_bitrev.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/ifft_stage0.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/ifft_stage1.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/ifft_stage2.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/ifft_stage3.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/ifft_stage3_bitrev.renderTexture | 4 | ||||
| -rw-r--r-- | CRTs/passthrough.renderTexture | 4 | ||||
| -rw-r--r-- | OPEN ME.unity | 2 | ||||
| -rw-r--r-- | Scripts/LinearPipeline.cs | 52 |
16 files changed, 32 insertions, 75 deletions
diff --git a/CRT Mats/fft_256x256_r16_3_bitrev.mat b/CRT Mats/fft_256x256_r16_3_bitrev.mat index c35b76c..dc4ffa7 100644 --- a/CRT Mats/fft_256x256_r16_3_bitrev.mat +++ b/CRT Mats/fft_256x256_r16_3_bitrev.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: - _BITREVERSAL_ON + - _PASSTHROUGH_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -79,7 +80,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _PassThrough: 0 - - _Passthrough: 0 + - _Passthrough: 1 - _Radix: 16 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/CRT Mats/ifft_256x256_r16_3_bitrev.mat b/CRT Mats/ifft_256x256_r16_3_bitrev.mat index 7d53909..aef3c40 100644 --- a/CRT Mats/ifft_256x256_r16_3_bitrev.mat +++ b/CRT Mats/ifft_256x256_r16_3_bitrev.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: - _BITREVERSAL_ON + - _PASSTHROUGH_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -79,7 +80,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _PassThrough: 0 - - _Passthrough: 0 + - _Passthrough: 1 - _Radix: 16 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/CRT Mats/passthrough.mat b/CRT Mats/passthrough.mat index d67e84a..3e5cde0 100644 --- a/CRT Mats/passthrough.mat +++ b/CRT Mats/passthrough.mat @@ -13,7 +13,6 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - - _LDS_ON - _LUMINANCE_ON - _PASSTHROUGH_ON m_LightmapFlags: 4 @@ -73,7 +72,7 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _Inverse: 0 - - _LDS: 1 + - _LDS: 0 - _Luminance: 1 - _Metallic: 0 - _Mode: 0 diff --git a/CRTs/fft_stage0.renderTexture b/CRTs/fft_stage0.renderTexture index 6098dd1..89fe39d 100644 --- a/CRTs/fft_stage0.renderTexture +++ b/CRTs/fft_stage0.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/fft_stage1.renderTexture b/CRTs/fft_stage1.renderTexture index b07f5b3..a40849b 100644 --- a/CRTs/fft_stage1.renderTexture +++ b/CRTs/fft_stage1.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/fft_stage2.renderTexture b/CRTs/fft_stage2.renderTexture index 4c0e1d6..8de343a 100644 --- a/CRTs/fft_stage2.renderTexture +++ b/CRTs/fft_stage2.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/fft_stage3.renderTexture b/CRTs/fft_stage3.renderTexture index 8edda3f..5ee6710 100644 --- a/CRTs/fft_stage3.renderTexture +++ b/CRTs/fft_stage3.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/fft_stage3_bitrev.renderTexture b/CRTs/fft_stage3_bitrev.renderTexture index 076dafd..f1739e7 100644 --- a/CRTs/fft_stage3_bitrev.renderTexture +++ b/CRTs/fft_stage3_bitrev.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/ifft_stage0.renderTexture b/CRTs/ifft_stage0.renderTexture index 9f75e0e..0700016 100644 --- a/CRTs/ifft_stage0.renderTexture +++ b/CRTs/ifft_stage0.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/ifft_stage1.renderTexture b/CRTs/ifft_stage1.renderTexture index 0ab753d..e0229f5 100644 --- a/CRTs/ifft_stage1.renderTexture +++ b/CRTs/ifft_stage1.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/ifft_stage2.renderTexture b/CRTs/ifft_stage2.renderTexture index 8e0a1fb..660c439 100644 --- a/CRTs/ifft_stage2.renderTexture +++ b/CRTs/ifft_stage2.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/ifft_stage3.renderTexture b/CRTs/ifft_stage3.renderTexture index c2db3c2..390c193 100644 --- a/CRTs/ifft_stage3.renderTexture +++ b/CRTs/ifft_stage3.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/ifft_stage3_bitrev.renderTexture b/CRTs/ifft_stage3_bitrev.renderTexture index 4a6f00e..2e49798 100644 --- a/CRTs/ifft_stage3_bitrev.renderTexture +++ b/CRTs/ifft_stage3_bitrev.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/CRTs/passthrough.renderTexture b/CRTs/passthrough.renderTexture index e5cba65..cc6ae20 100644 --- a/CRTs/passthrough.renderTexture +++ b/CRTs/passthrough.renderTexture @@ -18,8 +18,8 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 + m_DepthStencilFormat: 0 + m_ColorFormat: 52 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/OPEN ME.unity b/OPEN ME.unity index b35d24c..b5c41e4 100644 --- a/OPEN ME.unity +++ b/OPEN ME.unity @@ -1517,7 +1517,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1188641757} - sourceInput: {fileID: 2800000, guid: d0dba03849af9df4fae990e250f66246, type: 3} + sourceInput: {fileID: 2800000, guid: 63a789815b682614db57cb0280d1013b, type: 3} effectMaterials: - {fileID: 2100000, guid: caffb11975a532c48928f00ce876fda6, type: 2} - {fileID: 2100000, guid: 26596d311a37a3c45a64cee1c5576bd6, type: 2} diff --git a/Scripts/LinearPipeline.cs b/Scripts/LinearPipeline.cs index 33b1fef..ae1c65d 100644 --- a/Scripts/LinearPipeline.cs +++ b/Scripts/LinearPipeline.cs @@ -42,8 +42,6 @@ public class LinearPipeline : UdonSharpBehaviour void Start() { - _ConfigurePipeline(); - if (runOnStart) { _RunPipeline(); @@ -59,48 +57,6 @@ public class LinearPipeline : UdonSharpBehaviour } /// <summary> - /// Configure materials for the pipeline. - /// </summary> - void _ConfigurePipeline() - { - if (effectMaterials == null || effectMaterials.Length == 0) - { - Debug.LogError("[LinearUdonPipeline] No Effect Materials have been assigned!", this); - return; - } - - if (pipelineOutputs == null || pipelineOutputs.Length == 0) - { - Debug.LogError("[LinearUdonPipeline] No Pipeline Outputs have been assigned!", this); - return; - } - - if (effectMaterials.Length != pipelineOutputs.Length) - { - Debug.LogError("[LinearUdonPipeline] The number of materials does not match the number of output textures!", this); - return; - } - - // Configure materials - set _MainTex to appropriate source - for (int i = 0; i < effectMaterials.Length; i++) - { - if (effectMaterials[i] != null) - { - if (i == 0) - { - // First material uses the source input - effectMaterials[i].SetTexture("_MainTex", sourceInput); - } - else - { - // Subsequent materials use the previous output as input - effectMaterials[i].SetTexture("_MainTex", pipelineOutputs[i - 1]); - } - } - } - } - - /// <summary> /// This public method can be called by other Udon scripts or UI events to run the pipeline. /// </summary> public void _RunPipeline() @@ -108,25 +64,25 @@ public class LinearPipeline : UdonSharpBehaviour // --- Pre-flight Checks --- if (sourceInput == null) { - Debug.LogError("[LinearUdonPipeline] Source Input is not assigned!", this); + Debug.LogError("[LinearPipeline] Source Input is not assigned!", this); return; } if (effectMaterials == null || effectMaterials.Length == 0) { - Debug.LogError("[LinearUdonPipeline] No Effect Materials have been assigned!", this); + Debug.LogError("[LinearPipeline] No Effect Materials have been assigned!", this); return; } if (pipelineOutputs == null || pipelineOutputs.Length == 0) { - Debug.LogError("[LinearUdonPipeline] No Pipeline Outputs have been assigned!", this); + Debug.LogError("[LinearPipeline] No Pipeline Outputs have been assigned!", this); return; } if (effectMaterials.Length != pipelineOutputs.Length) { - Debug.LogError("[LinearUdonPipeline] The number of materials does not match the number of output textures!", this); + Debug.LogError("[LinearPipeline] The number of materials does not match the number of output textures!", this); return; } |
