Begin overhauling marble

3 files changed, 6 insertions, 15 deletions

diff --git a/3ner.shader b/3ner.shader
index f5a9221..93e8d07 100755
--- a/3ner.shader
+++ b/3ner.shader
@@ -985,9 +985,8 @@ Shader "yum_food/3ner"
         //ifex _Marble_Enabled==0
         [HideInInspector] m_start_Marble("Marble", Float) = 0
           [ThryToggle(_MARBLE)] _Marble_Enabled("Enable", Float) = 0
-          [Gradient] _Marble_U_Ramp("U Ramp", 2D) = "white" {}
-          [Gradient] _Marble_V_Ramp("V Ramp", 2D) = "white" {}
-          [Gradient] _Marble_W_Ramp("W Ramp", 2D) = "white" {}
+          _Marble_Noise("Noise", 3D) = "gray" {}
+          //[Gradient] _Marble_U_Ramp("U Ramp", 2D) = "white" {}
           _Marble_Scale("Scale", Vector) = (1, 1, 1, 0)
           _Marble_Strength("Strength", Float) = 1
           _Marble_Octaves("Octaves", Range(1, 10)) = 3
diff --git a/globals.cginc b/globals.cginc
index c1eda2e..d926588 100755
--- a/globals.cginc
+++ b/globals.cginc
@@ -84,9 +84,8 @@ float _Bent_Normals_Strength;
 #endif  // _BENT_NORMALS
 
 #if defined(_MARBLE)
-texture2D _Marble_U_Ramp;
-texture2D _Marble_V_Ramp;
-texture2D _Marble_W_Ramp;
+texture3D _Marble_Noise;
+//texture2D _Marble_U_Ramp;
 float3 _Marble_Scale;
 float _Marble_Octaves;
 float _Marble_Strength;
diff --git a/pbr.cginc b/pbr.cginc
index be1be5a..f172a98 100755
--- a/pbr.cginc
+++ b/pbr.cginc
@@ -125,15 +125,8 @@ void propagateSmoothness(inout Pbr pbr) {
 void apply_marble(float3 world_pos, inout float3 albedo) {
 #if defined(_MARBLE)
   float3 uvw = world_pos * _Marble_Scale;
-  float noise_r = sin_noise_3d_fbm(uvw + _Time[0],     _Marble_Octaves, 2.0f, _Marble_Strength);
-  float noise_g = sin_noise_3d_fbm(uvw+3.1 + _Time[0], _Marble_Octaves, 2.0f, _Marble_Strength);
-  float noise_b = sin_noise_3d_fbm(uvw+3.7 + _Time[0], _Marble_Octaves, 2.0f, _Marble_Strength);
-
-  float3 r = _Marble_U_Ramp.Sample(linear_repeat_s, float2(noise_r, 0));
-  float3 g = _Marble_V_Ramp.Sample(linear_repeat_s, float2(noise_g, 0));
-  float3 b = _Marble_W_Ramp.Sample(linear_repeat_s, float2(noise_b, 0));
-
-  albedo = r + g + b;
+  float3 noise = _Marble_Noise.Sample(aniso4_trilinear_repeat_s, uvw).rgb;
+  albedo = noise.x;
 #endif
 }