add uv scroll, aniso16, and finish tubes

1 files changed, 38 insertions, 8 deletions

diff --git a/vertex.cginc b/vertex.cginc
index fd08bbb..2f5b5f5 100644
--- a/vertex.cginc
+++ b/vertex.cginc
@@ -4,17 +4,47 @@
 #include "custom31.hlsl"
 
 void deform(inout float3 objPos) {
-#if defined(_CUSTOM31_TUBES)
-  float t = _Custom31_Tubes_t;
-  objPos = plane_to_tube(objPos, t);
-#endif  // _CUSTOM31_TUBES
+#if defined(_CUSTOM31_XZ_TUBE)
+  {
+    float t = _Custom31_XZ_Tube_t;
+    objPos = plane_to_tube(objPos.xyz, t);
+  }
+#endif  // _CUSTOM31_XZ_TUBE
+#if defined(_CUSTOM31_YZ_TUBE)
+  {
+    float t = _Custom31_YZ_Tube_t;
+    objPos = plane_to_tube(objPos.yxz, t);
+    objPos = objPos.yxz;
+  }
+#endif  // _CUSTOM31_YZ_TUBE
+#if defined(_CUSTOM31_XY_TUBE)
+  {
+    float t = _Custom31_XY_Tube_t;
+    objPos = plane_to_tube(objPos.xzy, t);
+    objPos = objPos.xzy;
+  }
+#endif  // _CUSTOM31_XY_TUBE
 }
 
 void deform_normal(float3 objPos, inout float3 objNorm, inout float3 objTan) {
-#if defined(_CUSTOM31_TUBES)
-  float t = _Custom31_Tubes_t;
-  plane_to_tube_normal(objPos, objNorm, objTan, t);
-#endif  // _CUSTOM31_TUBES
+#if defined(_CUSTOM31_XZ_TUBE)
+  {
+    float t = _Custom31_XZ_Tube_t;
+    plane_to_tube_normal(objPos, objNorm, objTan, t);
+  }
+#endif  // _CUSTOM31_XZ_TUBE
+#if defined(_CUSTOM31_YZ_TUBE)
+  {
+    float t = _Custom31_YZ_Tube_t;
+    plane_to_tube_normal(objPos.yxz, objNorm.yxz, objTan.yxz, t);
+  }
+#endif  // _CUSTOM31_YZ_TUBE
+#if defined(_CUSTOM31_XY_TUBE)
+  {
+    float t = _Custom31_XY_Tube_t;
+    plane_to_tube_normal(objPos.xzy, objNorm.xzy, objTan.xzy, t);
+  }
+#endif  // _CUSTOM31_XY_TUBE
 }
 
 void propagateObjPos(inout v2f i) {