summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x3ner.shader1
-rwxr-xr-xglobals.cginc1
-rwxr-xr-xpbr.cginc2
3 files changed, 1 insertions, 3 deletions
diff --git a/3ner.shader b/3ner.shader
index 30a2c40..af0d6bf 100755
--- a/3ner.shader
+++ b/3ner.shader
@@ -985,7 +985,6 @@ Shader "yum_food/3ner"
//ifex _Marble_Enabled==0
[HideInInspector] m_start_Marble("Marble", Float) = 0
[ThryToggle(_MARBLE)] _Marble_Enabled("Enable", Float) = 0
- _Marble_Noise("Noise", 3D) = "gray" {}
_Marble_Scale("Scale", Vector) = (1, 1, 1, 0)
_Marble_Strength("Strength", Float) = 1
[IntRange] _Marble_Octaves("Octaves", Range(1, 10)) = 3
diff --git a/globals.cginc b/globals.cginc
index f96a23d..ded2048 100755
--- a/globals.cginc
+++ b/globals.cginc
@@ -84,7 +84,6 @@ float _Bent_Normals_Strength;
#endif // _BENT_NORMALS
#if defined(_MARBLE)
-texture3D _Marble_Noise;
texture2D _Marble_Post_Ramp;
float3 _Marble_Scale;
float _Marble_Octaves;
diff --git a/pbr.cginc b/pbr.cginc
index 33264ce..3e8d672 100755
--- a/pbr.cginc
+++ b/pbr.cginc
@@ -133,7 +133,7 @@ void apply_marble(float3 world_pos, inout float3 albedo) {
uvw += offset;
- float3 noise = domain_warp_3d_tex(_Marble_Noise, uvw, _Marble_Strength,
+ float3 noise = domain_warp_procedural(uvw, _Marble_Strength,
_Marble_Octaves, _Marble_Lacunarity, _Marble_Gain);
noise = _Marble_Post_Ramp.Sample(linear_clamp_s, float2(noise.x, 0));