From 930527bfaa621c6e8280b86609f77e3102a4d950 Mon Sep 17 00:00:00 2001 From: LMW Date: Wed, 11 Oct 2023 12:31:10 +0800 Subject: [PATCH 1/4] Add radians and degrees math operations --- addons/material_maker/nodes/math.mmg | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/material_maker/nodes/math.mmg b/addons/material_maker/nodes/math.mmg index 2550080d..4e6a7976 100644 --- a/addons/material_maker/nodes/math.mmg +++ b/addons/material_maker/nodes/math.mmg @@ -192,7 +192,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))" + }, ] }, { From d99c3dfc3a77d1e1535e00d6e42d2384aca08564 Mon Sep 17 00:00:00 2001 From: LMW Date: Sat, 14 Oct 2023 12:16:05 +0800 Subject: [PATCH 2/4] vec3 math hyperbolic sine, cosine and tangent --- addons/material_maker/nodes/math_v3.mmg | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/material_maker/nodes/math_v3.mmg b/addons/material_maker/nodes/math_v3.mmg index e775fdeb..207fd620 100644 --- a/addons/material_maker/nodes/math_v3.mmg +++ b/addons/material_maker/nodes/math_v3.mmg @@ -171,7 +171,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))" + }, ] }, { From b8ed5658c1e6f231cb1f1efdc9d1bdd6a1061ad6 Mon Sep 17 00:00:00 2001 From: LMW Date: Thu, 19 Oct 2023 13:16:21 +0800 Subject: [PATCH 3/4] Add arbitrary base log for math/vec3 math nodes --- addons/material_maker/nodes/math.mmg | 4 ++++ addons/material_maker/nodes/math_v3.mmg | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/addons/material_maker/nodes/math.mmg b/addons/material_maker/nodes/math.mmg index 2550080d..93d11675 100644 --- 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))" diff --git a/addons/material_maker/nodes/math_v3.mmg b/addons/material_maker/nodes/math_v3.mmg index e775fdeb..e6cf98e5 100644 --- 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))" From 512d63a5db634545ef8b1fe0ff0eaa81a6370814 Mon Sep 17 00:00:00 2001 From: LMW Date: Sat, 23 Mar 2024 14:44:46 +0800 Subject: [PATCH 4/4] fix missing dollar sign in vec3 math dot --- addons/material_maker/nodes/math_v3.mmg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/material_maker/nodes/math_v3.mmg b/addons/material_maker/nodes/math_v3.mmg index fb839343..f2541669 100644 --- a/addons/material_maker/nodes/math_v3.mmg +++ b/addons/material_maker/nodes/math_v3.mmg @@ -154,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)",