3 new shapes, proper support

6 files changed, 126 insertions, 121 deletions

diff --git a/technic/machines/LV/cnc.lua b/technic/machines/LV/cnc.lua
index 634e03d..280c869 100644
--- a/technic/machines/LV/cnc.lua
+++ b/technic/machines/LV/cnc.lua
@@ -102,14 +102,15 @@ local cnc_formspec =
 	"image_button[4,2.5;1,1;technic_cnc_opposedcurvededge.png;opposedcurvededge; ]"..
 	"image_button[5,2.5;1,1;technic_cnc_block_fluted.png;block_fluted; ]"..
 	"image_button[6,2.5;1,1;technic_cnc_cylinder_fluted.png;cylinder_fluted; ]"..
-	"image_button[7,2.5;1,1;technic_cnc_arch216.png;arch216; ]"..
-	"image_button[8,2.5;1,1;technic_cnc_arch216_flange.png;arch216_flange; ]"..
-	"image_button[9,2.5;1,1;technic_cnc_diagonal_truss.png;diagonal_truss; ]"..
-	"image_button[10,2.5;1,1;technic_cnc_diagonal_truss_cross.png;diagonal_truss_cross; ]"..
+	"image_button[7,2.5;1,1;technic_cnc_diagonal_truss.png;diagonal_truss; ]"..
+	"image_button[8,2.5;1,1;technic_cnc_diagonal_truss_cross.png;diagonal_truss_cross; ]"..
+	"image_button[9,2.5;1,1;technic_cnc_arch216.png;arch216; ]"..
+	"image_button[10,2.5;1,1;technic_cnc_arch216_flange.png;arch216_flange; ]"..
 	
-	"image_button[7,3.5;1,1;technic_cnc_twocurvededge_lr.png;twocurvededge_lr; ]"..
-	"image_button[8,3.5;1,1;technic_cnc_45_beam_216.png;d45_beam_216; ]"..
-	"image_button[9,3.5;1,1;technic_cnc_45_slope_216.png;d45_slope_216; ]"..
+	
+-- 	"image_button[7,3.5;1,1;technic_cnc_45_beam_216.png;d45_beam_216; ]"..
+	"image_button[8,3.5;1,1;technic_cnc_45_slope_216.png;d45_slope_216; ]"..
+	"image_button[9,3.5;1,1;technic_cnc_twocurvededge_lr.png;twocurvededge_lr; ]"..
 	"image_button[10,3.5;1,1;technic_cnc_onecurvededge_lr.png;onecurvededge_lr; ]"..
 
 	"label[0,3.5;"..S("Slim Elements half / normal height:").."]"..
diff --git a/technic/machines/LV/cnc_api.lua b/technic/machines/LV/cnc_api.lua
index 95e4806..a838251 100644
--- a/technic/machines/LV/cnc_api.lua
+++ b/technic/machines/LV/cnc_api.lua
@@ -197,20 +197,6 @@ technic.cnc.programs = {
 		desc  = S("Two Curved Edges LR Block")
 	},
 	
-	-- slope
-
-
-	{ suffix  = "technic_cnc_d45_slope_216",
-		model = "technic_45_slope_216.obj",
-		desc  = S("2/16 45° Slope")
-	},
-	
-	
-	{ suffix  = "technic_cnc_d45_beam_216",
-		model = "technic_45_beam_216.obj",
-		desc  = S("2/16 45° Beam")
-	},
-	
 	-- 4/16 Diagonal truss
 	
 	{ suffix  = "technic_cnc_diagonal_truss",
@@ -281,6 +267,29 @@ technic.cnc.programs = {
 		}
 	},
 	
+	-- 2/16 slope panel
+
+
+	{ suffix  = "technic_cnc_d45_slope_216",
+		model = "technic_45_slope_216.obj",
+		desc  = S("2/16 45° Slope"),
+		cbox  = {
+			type = "fixed",
+			fixed = {
+				{0.25, -0.5, -0.5, 0.5, -0.25, 0.5},
+				{0, -0.25, -0.5, 0.25, 0, 0.5},
+				{-0.25, 0, -0.5, 0, 0.25, 0.5},
+				{-0.5, 0.25, -0.5, -0.25, 0.5, 0.5},
+			}
+		}
+	},
+	
+	
+-- 	{ suffix  = "technic_cnc_d45_beam_216",
+-- 		model = "technic_45_beam_216.obj",
+-- 		desc  = S("2/16 45° Beam")
+-- 	},
+	
 	-- 2/16 Arch
 	
 	{ suffix  = "technic_cnc_arch216",
diff --git a/technic/models/technic_one_curved_edge_lr.obj b/technic/models/technic_one_curved_edge_lr.obj
index 6e9dcb1..cbbf69e 100644
--- a/technic/models/technic_one_curved_edge_lr.obj
+++ b/technic/models/technic_one_curved_edge_lr.obj
@@ -1,115 +1,110 @@
 # Blender v2.79 (sub 0) OBJ File: ''
 # www.blender.org
 mtllib technic_one_curved_edge_lr.mtl
-o Cylinder_Cylinder.008
-v -0.500000 -0.499999 -0.500000
-v -0.500000 -0.499999 0.500000
-v -0.480785 -0.304909 0.500000
-v -0.480785 -0.304909 -0.500000
-v -0.423879 -0.117316 0.500000
-v -0.423879 -0.117316 -0.500000
-v -0.331469 0.055571 0.500000
-v -0.331469 0.055571 -0.500000
-v -0.207106 0.207108 0.500000
-v -0.207106 0.207108 -0.500000
-v -0.055569 0.331470 0.500000
-v -0.055569 0.331470 -0.500000
-v 0.117318 0.423880 0.500000
-v 0.117318 0.423880 -0.500000
-v 0.304911 0.480786 0.500000
-v 0.304911 0.480786 -0.500000
+o Cylinder
 v 0.500000 0.500000 0.500000
 v 0.500000 0.500000 -0.500000
-v 0.500000 -0.500000 0.500000
+v 0.304910 0.480785 0.500000
+v 0.304910 0.480785 -0.500000
+v 0.117317 0.423880 0.500000
+v 0.117317 0.423880 -0.500000
+v -0.055570 0.331470 0.500000
+v -0.055570 0.331470 -0.500000
+v -0.207107 0.207107 0.500000
+v -0.207107 0.207107 -0.500000
+v -0.331470 0.055570 0.500000
+v -0.331470 0.055570 -0.500000
+v -0.423879 -0.117317 0.500000
+v -0.423880 -0.117317 -0.500000
+v -0.480785 -0.304910 0.500000
+v -0.480785 -0.304910 -0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 -0.500000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.125000
-vt 0.000000 0.125000
-vt 1.000000 0.250000
-vt 0.000000 0.250000
-vt 1.000000 0.375000
-vt 0.000000 0.375000
-vt 1.000000 0.500000
-vt 0.000000 0.500000
-vt 1.000000 0.625000
-vt 0.000000 0.625000
-vt 1.000000 0.750000
-vt 0.000000 0.750000
-vt 1.000000 0.875000
-vt 0.000000 0.875000
+v 0.500000 -0.500000 0.500000
+v 0.695091 -1.480785 0.500000
+v 0.695091 -1.480785 -0.500000
+v 0.882684 -1.209689 0.500000
+v 0.882684 -1.209689 -0.500000
 vt 1.000000 1.000000
 vt 0.000000 1.000000
+vt 0.000000 0.875000
+vt 1.000000 0.875000
+vt 0.000000 0.750000
+vt 1.000000 0.750000
+vt 0.000000 0.625000
+vt 1.000000 0.625000
+vt 0.000000 0.500000
+vt 1.000000 0.500000
+vt 0.000000 0.375000
+vt 1.000000 0.375000
+vt 0.000000 0.250000
+vt 1.000000 0.250000
+vt 0.000000 0.125000
+vt 1.000000 0.125000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 0.382684 0.923880
+vt 0.000000 0.000000
+vt 0.555570 0.831470
+vt 0.707107 0.707107
+vt 0.831470 0.555570
+vt 0.923879 0.382683
+vt 0.980785 0.195090
+vt 1.000000 0.000000
 vt 1.000000 1.000000
 vt 0.000000 1.000000
-vt 0.000000 -0.000000
-vt 1.000000 -0.000000
+vt 0.000000 0.000000
 vt 1.000000 1.000000
 vt 0.000000 1.000000
-vt 0.019215 0.195091
-vt 0.000000 0.000001
 vt 1.000000 0.000000
-vt 0.076121 0.382684
-vt 0.168531 0.555571
-vt 0.292894 0.707108
-vt 0.444431 0.831470
-vt 0.617318 0.923880
-vt 0.804911 0.980786
-vt 0.980785 0.195091
 vt 0.000000 0.000000
-vt 1.000000 0.000001
-vt 0.923879 0.382684
-vt 0.831469 0.555571
-vt 0.707106 0.707108
-vt 0.555569 0.831470
-vt 0.382682 0.923880
-vt 0.195089 0.980786
-vn -0.5943 -0.5387 -0.5972
-vn -0.5943 -0.5387 0.5972
-vn -0.6918 0.1377 0.7088
-vn -0.6918 0.1376 -0.7088
-vn -0.6517 0.2700 0.7088
-vn -0.6517 0.2699 -0.7088
-vn -0.5865 0.3919 0.7088
-vn -0.5865 0.3919 -0.7088
-vn -0.4988 0.4988 0.7088
-vn -0.4988 0.4988 -0.7088
-vn -0.3919 0.5865 0.7088
-vn -0.3919 0.5865 -0.7088
-vn -0.2699 0.6517 0.7088
-vn -0.2700 0.6517 -0.7088
-vn -0.1376 0.6918 0.7088
-vn -0.1376 0.6918 -0.7088
-vn 0.5387 0.5943 0.5972
-vn 0.5387 0.5943 -0.5972
-vn 0.1230 -0.1231 0.9847
-vn 0.1231 -0.1230 -0.9847
+vt 1.000000 0.000000
+vt 0.019215 0.195090
+vt 0.076120 0.382683
+vt 0.168530 0.555570
+vt 0.292893 0.707107
+vt 0.444430 0.831470
+vt 0.617316 0.923880
+vt 0.804910 0.980785
+vt 0.195090 0.980785
+vn -0.0980 0.9952 0.0000
+vn -0.2903 0.9569 0.0000
+vn -0.4714 0.8819 0.0000
+vn -0.6344 0.7730 0.0000
+vn -0.7730 0.6344 0.0000
+vn -0.8819 0.4714 0.0000
+vn -0.9569 0.2903 0.0000
+vn -0.9952 0.0980 0.0000
+vn 0.0000 0.0000 -1.0000
+vn -0.0000 -1.0000 0.0000
+vn 1.0000 0.0000 -0.0000
+vn 0.0000 -0.0000 1.0000
 usemtl None
-s 1
-f 1/1/1 2/2/2 3/3/3 4/4/4
-f 4/4/4 3/3/3 5/5/5 6/6/6
-f 6/6/6 5/5/5 7/7/7 8/8/8
-f 8/8/8 7/7/7 9/9/9 10/10/10
-f 10/10/10 9/9/9 11/11/11 12/12/12
-f 12/12/12 11/11/11 13/13/13 14/14/14
-f 14/14/14 13/13/13 15/15/15 16/16/16
-f 16/16/16 15/15/15 17/17/17 18/18/18
-usemtl (null)
-f 18/19/18 17/20/17 19/21/19 20/22/20
-f 1/23/1 20/24/20 19/21/19 2/2/2
-f 3/25/3 2/26/2 19/27/19
-f 5/28/5 3/25/3 19/27/19
-f 7/29/7 5/28/5 19/27/19
-f 9/30/9 7/29/7 19/27/19
-f 11/31/11 9/30/9 19/27/19
-f 13/32/13 11/31/11 19/27/19
-f 15/33/15 13/32/13 19/27/19
-f 17/17/17 15/33/15 19/27/19
-f 4/34/4 20/35/20 1/36/1
-f 6/37/6 20/35/20 4/34/4
-f 8/38/8 20/35/20 6/37/6
-f 10/39/10 20/35/20 8/38/8
-f 12/40/12 20/35/20 10/39/10
-f 14/41/14 20/35/20 12/40/12
-f 16/42/16 20/35/20 14/41/14
-f 18/18/18 20/35/20 16/42/16
+s off
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/4/2 4/3/2 6/5/2 5/6/2
+f 5/6/3 6/5/3 8/7/3 7/8/3
+f 7/8/4 8/7/4 10/9/4 9/10/4
+f 9/10/5 10/9/5 12/11/5 11/12/5
+f 11/12/6 12/11/6 14/13/6 13/14/6
+f 13/14/7 14/13/7 16/15/7 15/16/7
+f 15/16/8 16/15/8 18/17/8 17/18/8
+f 6/19/9 19/20/9 8/21/9
+f 8/21/9 19/20/9 10/22/9
+f 10/22/9 19/20/9 12/23/9
+f 12/23/9 19/20/9 14/24/9
+f 14/24/9 19/20/9 16/25/9
+f 16/25/9 19/20/9 18/26/9
+f 18/27/10 19/28/10 20/29/10 17/18/10
+f 2/30/11 1/31/11 20/29/11 19/32/11
+f 17/33/12 20/34/12 15/35/12
+f 15/35/12 20/34/12 13/36/12
+f 13/36/12 20/34/12 11/37/12
+f 11/37/12 20/34/12 9/38/12
+f 9/38/12 20/34/12 7/39/12
+f 7/39/12 20/34/12 5/40/12
+f 5/40/12 20/34/12 3/41/12
+f 3/41/12 20/34/12 1/1/12
+f 2/2/9 19/20/9 4/42/9
+f 4/42/9 19/20/9 6/19/9
diff --git a/technic/textures/technic_cnc_45_slope_216.png b/technic/textures/technic_cnc_45_slope_216.png
new file mode 100644
index 0000000..423578a
--- /dev/null
+++ b/technic/textures/technic_cnc_45_slope_216.png
diff --git a/technic/textures/technic_cnc_onecurvededge_lr.png b/technic/textures/technic_cnc_onecurvededge_lr.png
new file mode 100644
index 0000000..e461822
--- /dev/null
+++ b/technic/textures/technic_cnc_onecurvededge_lr.png
diff --git a/technic/textures/technic_cnc_twocurvededge_lr.png b/technic/textures/technic_cnc_twocurvededge_lr.png
new file mode 100644
index 0000000..6352cb4
--- /dev/null
+++ b/technic/textures/technic_cnc_twocurvededge_lr.png