From 52d73a0abdd37bb0737b4e2c4f678685379d524a Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Mon, 11 Oct 2021 16:41:39 +0200
Subject: [PATCH] Comments from sdf3d_cone.mmg.

---
 .../addons/mat_maker_gd/nodes/common/sdf3d.gd | 39 ++++++++++
 .../nodes/material_maker_nodes/sdf3d_cone.mmg | 71 -------------------
 2 files changed, 39 insertions(+), 71 deletions(-)
 delete mode 100644 game/addons/mat_maker_gd/nodes/material_maker_nodes/sdf3d_cone.mmg

diff --git a/game/addons/mat_maker_gd/nodes/common/sdf3d.gd b/game/addons/mat_maker_gd/nodes/common/sdf3d.gd
index aaaed090..aa795d3e 100644
--- a/game/addons/mat_maker_gd/nodes/common/sdf3d.gd
+++ b/game/addons/mat_maker_gd/nodes/common/sdf3d.gd
@@ -50,6 +50,26 @@ const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd")
 #radius, float, min: 0, max: 1, default:0.2, step:0.01
 #profile, curve, default: (ls, rs, x, z) 0, 0, 0, 1,  0, 0, 1, 1
 
+#----------------------
+#sdf3d_cone.mmg
+
+#Outputs:
+
+#+X: $axis = length($uv.yz),-$uv.x
+#-X: $axis = length($uv.yz),$uv.x
+#+Y: $axis = length($uv.xz),$uv.y
+#-Y: $axis = length($uv.xz),-$uv.y
+#+Z: $axis = length($uv.xy),-$uv.z
+#-Z: $axis = length($uv.xy),$uv.z
+
+#Output (sdf3d)
+#dot(vec2(cos($a*0.01745329251),sin($a*0.01745329251)),vec2($axis))
+
+#Inputs:
+#axis, enum, default:5, values: +X, -X, +Y, -Y, +Z, -Z
+#angle, float, min: 0, max: 90, default:30, step:1
+
+
 static func raymarch(uv : Vector2) -> Color:
 	var d : Vector2 = sdf3d_raymarch(uv);
 	
@@ -130,31 +150,50 @@ static func sdf3d_capsule_z(p : Vector3, r : float, l : float) -> Vector2:
 
 var p_o118934_a = 30.000000000;
 
+#+X: $axis = length($uv.yz),-$uv.x
+#dot(vec2(cos($a*0.01745329251),sin($a*0.01745329251)),vec2($axis))
+
 static func sdf3d_cone_px(p : Vector3, a : float) -> Vector2:
 	var  f : float = Vector2(cos(a*0.01745329251),sin(a*0.01745329251)).dot(Vector2(Vector2(p.y, p.z).length(), - (p).x));
 
 	return Vector2(f, 0.0);
 
+#-X: $axis = length($uv.yz),$uv.x
+#dot(vec2(cos($a*0.01745329251),sin($a*0.01745329251)),vec2($axis))
+
 static func sdf3d_cone_nx(p : Vector3, a : float) -> Vector2:
 	var  f : float = Vector2(cos(a*0.01745329251),sin(a*0.01745329251)).dot(Vector2(Vector2(p.y, p.z).length(),(p).x));
 
 	return Vector2(f, 0.0);
 
+#+Y: $axis = length($uv.xz),$uv.y
+#dot(vec2(cos($a*0.01745329251),sin($a*0.01745329251)),vec2($axis))
+
 static func sdf3d_cone_py(p : Vector3, a : float) -> Vector2:
 	var  f : float = Vector2(cos(a*0.01745329251),sin(a*0.01745329251)).dot(Vector2(Vector2(p.x, p.z).length(),(p).y));
 
 	return Vector2(f, 0.0);
 
+#-Y: $axis = length($uv.xz),-$uv.y
+#dot(vec2(cos($a*0.01745329251),sin($a*0.01745329251)),vec2($axis))
+
 static func sdf3d_cone_ny(p : Vector3, a : float) -> Vector2:
 	var  f : float = Vector2(cos(a*0.01745329251),sin(a*0.01745329251)).dot(Vector2(Vector2(p.x, p.z).length(),-(p).y));
 
 	return Vector2(f, 0.0);
 
+#+Z: $axis = length($uv.xy),-$uv.z
+#dot(vec2(cos($a*0.01745329251),sin($a*0.01745329251)),vec2($axis))
+
 static func sdf3d_cone_pz(p : Vector3, a : float) -> Vector2:
 	var  f : float = Vector2(cos(a*0.01745329251),sin(a*0.01745329251)).dot(Vector2(Vector2(p.x, p.y).length(),-(p).z));
 
 	return Vector2(f, 0.0);
 
+
+#-Z: $axis = length($uv.xy),$uv.z
+#dot(vec2(cos($a*0.01745329251),sin($a*0.01745329251)),vec2($axis))
+
 static func sdf3d_cone_nz(p : Vector3, a : float) -> Vector2:
 	var f : float = Vector2(cos(a*0.01745329251),sin(a*0.01745329251)).dot(Vector2(Vector2(p.x, p.y).length(),(p).z));
 
diff --git a/game/addons/mat_maker_gd/nodes/material_maker_nodes/sdf3d_cone.mmg b/game/addons/mat_maker_gd/nodes/material_maker_nodes/sdf3d_cone.mmg
deleted file mode 100644
index b52f73b5..00000000
--- a/game/addons/mat_maker_gd/nodes/material_maker_nodes/sdf3d_cone.mmg
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-	"name": "sdf3d_cone",
-	"node_position": {
-		"x": 0,
-		"y": 0
-	},
-	"parameters": {
-		"a": 30,
-		"axis": 2
-	},
-	"shader_model": {
-		"code": "",
-		"global": "",
-		"inputs": [
-
-		],
-		"instance": "",
-		"name": "Cone",
-		"outputs": [
-			{
-				"sdf3d": "dot(vec2(cos($a*0.01745329251),sin($a*0.01745329251)),vec2($axis))",
-				"type": "sdf3d"
-			}
-		],
-		"parameters": [
-			{
-				"default": 5,
-				"label": "Axis",
-				"name": "axis",
-				"type": "enum",
-				"values": [
-					{
-						"name": "+X",
-						"value": "length($uv.yz),-$uv.x"
-					},
-					{
-						"name": "-X",
-						"value": "length($uv.yz),$uv.x"
-					},
-					{
-						"name": "+Y",
-						"value": "length($uv.xz),$uv.y"
-					},
-					{
-						"name": "-Y",
-						"value": "length($uv.xz),-$uv.y"
-					},
-					{
-						"name": "+Z",
-						"value": "length($uv.xy),-$uv.z"
-					},
-					{
-						"name": "-Z",
-						"value": "length($uv.xy),$uv.z"
-					}
-				]
-			},
-			{
-				"control": "None",
-				"default": 30,
-				"label": "Angle",
-				"max": 90,
-				"min": 0,
-				"name": "a",
-				"step": 1,
-				"type": "float"
-			}
-		]
-	},
-	"type": "shader"
-}
\ No newline at end of file