Merge pull request #669 from williamchange/math-additions

Vec3/Math additions
RodZill4 · Apr 30, 2024 · 0aa8acd · 0aa8acd
2 parents 3436500 + 512d63a
commit 0aa8acd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/addons/material_maker/nodes/math.mmg b/addons/material_maker/nodes/math.mmg
@@ -81,6 +81,10 @@
 						"name": "log(A)",
 						"value": "log($in1($uv))"
 					},
+					{
+						"name": "log(A, B)",
+						"value": "log($in1($uv))/log($in2($uv))"
+					},
 					{
 						"name": "log2(A)",
 						"value": "log2($in1($uv))"
@@ -192,7 +196,15 @@
 					{
 						"name": "snap(A, B)",
 						"value": "floor($in1($uv)/$in2($uv))*$in2($uv)"
-					}
+					},
+					{
+						"name": "radians(A)",
+						"value": "radians($in1($uv))"
+					},
+					{
+						"name": "degrees(A)",
+						"value": "degrees($in1($uv))"
+					},
 				]
 			},
 			{

diff --git a/addons/material_maker/nodes/math_v3.mmg b/addons/material_maker/nodes/math_v3.mmg
@@ -80,6 +80,10 @@
 						"name": "log(A)",
 						"value": "log($in1($uv))"
 					},
+					{
+						"name": "log(A, B)",
+						"value": "log($in1($uv))/log($in2($uv))"
+					},
 					{
 						"name": "log2(A)",
 						"value": "log2($in1($uv))"
@@ -150,7 +154,7 @@
 					},
 					{
 						"name": "dot(A, B)",
-						"value": "vec3(dot($in1(uv),$in2($uv)))"
+						"value": "vec3(dot($in1($uv),$in2($uv)))"
 					},
 					{
 						"name": "cross(A, B)",
@@ -171,7 +175,19 @@
 					{
 						"name": "snap(A, B)",
 						"value": "floor($in1($uv)/$in2($uv))*$in2($uv)"
-					}
+					},
+					{
+						"name": "sinh(A)",
+						"value": "sinh($in1($uv))"
+					},
+					{
+						"name": "cosh(A)",
+						"value": "cosh($in1($uv))"
+					},
+					{
+						"name": "tanh(A)",
+						"value": "tanh($in1($uv))"
+					},
 				]
 			},
 			{