summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--technic/machines/LV/cnc.lua7
-rw-r--r--technic/machines/LV/cnc_api.lua21
-rw-r--r--technic/machines/LV/cnc_nodes.lua6
-rw-r--r--technic/models/technic_45_beam_216.obj48
-rw-r--r--technic/models/technic_45_slope_216.obj50
-rw-r--r--technic/models/technic_one_curved_edge_lr.obj126
6 files changed, 258 insertions, 0 deletions
diff --git a/technic/machines/LV/cnc.lua b/technic/machines/LV/cnc.lua
index e5e2e3f..50e54c4 100644
--- a/technic/machines/LV/cnc.lua
+++ b/technic/machines/LV/cnc.lua
@@ -55,6 +55,9 @@ local onesize_products = {
beam216_cross_column = 1,
diagonal_truss = 6,
diagonal_truss_cross = 4,
+ onecurvededge_lr = 1,
+ d45_slope_216 = 1,
+ d45_beam_216 = 4
}
local twosize_products = {
element_straight = 4,
@@ -102,6 +105,10 @@ local cnc_formspec =
"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[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[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 6fdd35b..5db9335 100644
--- a/technic/machines/LV/cnc_api.lua
+++ b/technic/machines/LV/cnc_api.lua
@@ -185,6 +185,27 @@ technic.cnc.programs = {
desc = S("Opposed Curved Edges Block")
},
+ -- large radius
+
+ { suffix = "technic_cnc_onecurvededge_lr",
+ model = "technic_one_curved_edge_lr.obj",
+ desc = S("One Curved Edge 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",
diff --git a/technic/machines/LV/cnc_nodes.lua b/technic/machines/LV/cnc_nodes.lua
index 0f40ad5..2667383 100644
--- a/technic/machines/LV/cnc_nodes.lua
+++ b/technic/machines/LV/cnc_nodes.lua
@@ -9,6 +9,12 @@ technic.cnc.register_all("default:dirt",
{snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
{"default_grass.png", "default_dirt.png", "default_grass.png"},
S("Dirt"))
+
+technic.cnc.register_all("default:glass",
+ {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
+ {"default_glass.png"},
+ S("Glass"))
+
-- WOOD
-------
technic.cnc.register_all("default:wood",
diff --git a/technic/models/technic_45_beam_216.obj b/technic/models/technic_45_beam_216.obj
new file mode 100644
index 0000000..49abfd4
--- /dev/null
+++ b/technic/models/technic_45_beam_216.obj
@@ -0,0 +1,48 @@
+# Blender v2.79 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib technic_45_beam_216.mtl
+o Cube_Cube.001
+v -0.147218 -0.852772 -0.375000
+v -0.500772 -0.499218 -0.375000
+v -0.147218 -0.852772 -0.500000
+v -0.500772 -0.499218 -0.500000
+v 0.852772 0.147218 -0.375000
+v 0.499218 0.500772 -0.375000
+v 0.852772 0.147218 -0.500000
+v 0.499218 0.500772 -0.500000
+vt 0.124975 0.500357
+vt 0.124975 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.500358
+vt 0.999800 0.502743
+vt 0.999800 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.502744
+vt -0.000000 0.500357
+vt 0.124975 1.000000
+vt 0.124975 0.500357
+vt 1.000000 0.500357
+vt 1.000000 1.000000
+vt 0.000200 1.000000
+vt 0.000200 0.500357
+vt 0.000200 0.875025
+vt 1.000000 0.875025
+vt 1.000000 1.000000
+vt 0.000200 1.000000
+vt 0.999800 1.000000
+vt 0.000000 0.875025
+vt 0.999800 0.875025
+vn -0.7071 -0.7071 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.7071 0.7071 0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.7071 -0.7071 0.0000
+vn -0.7071 0.7071 0.0000
+usemtl None
+s off
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/5/2 4/6/2 8/7/2 7/8/2
+f 7/9/3 8/7/3 6/10/3 5/11/3
+f 5/12/4 6/13/4 2/14/4 1/15/4
+f 3/16/5 7/17/5 5/18/5 1/19/5
+f 8/20/6 4/3/6 2/21/6 6/22/6
diff --git a/technic/models/technic_45_slope_216.obj b/technic/models/technic_45_slope_216.obj
new file mode 100644
index 0000000..39f1eb3
--- /dev/null
+++ b/technic/models/technic_45_slope_216.obj
@@ -0,0 +1,50 @@
+# Blender v2.79 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib technic_45_slope_216.mtl
+o Cube_Cube.001
+v -0.413801 -0.588389 0.500000
+v -0.502189 -0.500001 0.500000
+v -0.413801 -0.588389 -0.500000
+v -0.502189 -0.500001 -0.500000
+v 0.586189 0.411601 0.500000
+v 0.497801 0.499989 0.500000
+v 0.586189 0.411601 -0.500000
+v 0.497801 0.499989 -0.500000
+vt 0.999800 0.875025
+vt 0.999800 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.875025
+vt 1.000000 0.875025
+vt 1.000000 1.000000
+vt 0.000200 1.000000
+vt 0.000200 0.875025
+vt 0.999800 0.875025
+vt 0.999800 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.875025
+vt 1.000000 0.875025
+vt 1.000000 1.000000
+vt 0.000200 1.000000
+vt 0.000200 0.875025
+vt 0.999900 0.000100
+vt 0.999900 0.999900
+vt 0.000100 0.999900
+vt 0.000100 0.000100
+vt 0.000100 0.999900
+vt 0.000100 0.000100
+vt 0.999900 0.000100
+vt 0.999900 0.999900
+vn -0.7071 -0.7071 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.7071 0.7071 0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.7071 -0.7071 0.0000
+vn -0.7071 0.7071 0.0000
+usemtl None
+s off
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/5/2 4/6/2 8/7/2 7/8/2
+f 7/9/3 8/10/3 6/11/3 5/12/3
+f 5/13/4 6/14/4 2/15/4 1/16/4
+f 3/17/5 7/18/5 5/19/5 1/20/5
+f 8/21/6 4/22/6 2/23/6 6/24/6
diff --git a/technic/models/technic_one_curved_edge_lr.obj b/technic/models/technic_one_curved_edge_lr.obj
new file mode 100644
index 0000000..37c1baa
--- /dev/null
+++ b/technic/models/technic_one_curved_edge_lr.obj
@@ -0,0 +1,126 @@
+# Blender v2.79 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib technic_one_curved_edge_lr.mtl
+o Cylinder_Cylinder.007
+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
+v 0.500000 0.500000 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.080477
+vt 0.000000 0.080477
+vt 1.000000 0.182905
+vt 0.000000 0.182905
+vt 1.000000 0.303347
+vt 0.000000 0.303347
+vt 1.000000 0.437175
+vt 0.000000 0.437175
+vt 1.000000 0.579246
+vt 0.000000 0.579247
+vt 1.000000 0.724101
+vt 0.000000 0.724101
+vt 1.000000 0.866172
+vt 0.000000 0.866173
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 -0.000000
+vt 1.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.1376 0.7088
+vn -0.6918 0.1376 -0.7088
+vn -0.6918 0.1377 -0.7088
+vn -0.6918 0.1377 0.7088
+vn -0.6517 0.2699 0.7088
+vn -0.6517 0.2699 -0.7088
+vn -0.6517 0.2700 -0.7088
+vn -0.6517 0.2700 0.7088
+vn -0.5865 0.3919 0.7088
+vn -0.5865 0.3919 -0.7088
+vn -0.4988 0.4987 0.7088
+vn -0.4988 0.4987 -0.7088
+vn -0.4987 0.4988 -0.7088
+vn -0.4987 0.4988 0.7088
+vn -0.3919 0.5865 0.7088
+vn -0.3919 0.5865 -0.7088
+vn -0.2700 0.6517 0.7088
+vn -0.2700 0.6517 -0.7088
+vn -0.2699 0.6517 -0.7088
+vn -0.2699 0.6517 0.7088
+vn -0.1377 0.6918 0.7088
+vn -0.1377 0.6918 -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
+vn -0.4988 0.4988 0.7088
+vn -0.4988 0.4988 -0.7088
+usemtl None
+s 1
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 4/4/5 3/3/6 5/5/7 6/6/8
+f 6/6/9 5/5/10 7/7/11 8/8/12
+f 8/8/12 7/7/11 9/9/13 10/10/14
+f 10/10/15 9/9/16 11/11/17 12/12/18
+f 12/12/18 11/11/17 13/13/19 14/14/20
+f 14/14/21 13/13/22 15/15/23 16/16/24
+f 16/16/25 15/15/26 17/17/27 18/18/28
+f 18/19/28 17/20/27 19/21/29 20/22/30
+f 1/23/1 20/24/30 19/21/29 2/2/2
+f 3/25/6 2/26/2 19/27/29
+f 5/28/10 3/25/6 19/27/29
+f 7/29/11 5/28/10 19/27/29
+f 9/30/31 7/29/11 19/27/29
+f 11/31/17 9/30/31 19/27/29
+f 13/32/22 11/31/17 19/27/29
+f 15/33/26 13/32/22 19/27/29
+f 17/17/27 15/33/26 19/27/29
+f 4/34/4 20/35/30 1/36/1
+f 6/37/8 20/35/30 4/34/4
+f 8/38/12 20/35/30 6/37/8
+f 10/39/32 20/35/30 8/38/12
+f 12/40/18 20/35/30 10/39/32
+f 14/41/20 20/35/30 12/40/18
+f 16/42/25 20/35/30 14/41/20
+f 18/18/28 20/35/30 16/42/25