diff options
| -rw-r--r-- | technic/machines/LV/cnc.lua | 4 | ||||
| -rw-r--r-- | technic/machines/LV/cnc_api.lua | 5 | ||||
| -rw-r--r-- | technic/models/technic_arch_216.obj | 61 | ||||
| -rw-r--r-- | technic/models/technic_one_curved_edge_lr.obj | 105 | ||||
| -rw-r--r-- | technic/models/technic_two_curved_edge_lr.obj | 239 |
5 files changed, 325 insertions, 89 deletions
diff --git a/technic/machines/LV/cnc.lua b/technic/machines/LV/cnc.lua index 50e54c4..634e03d 100644 --- a/technic/machines/LV/cnc.lua +++ b/technic/machines/LV/cnc.lua @@ -57,7 +57,8 @@ local onesize_products = { diagonal_truss_cross = 4, onecurvededge_lr = 1, d45_slope_216 = 1, - d45_beam_216 = 4 + d45_beam_216 = 4, + twocurvededge_lr = 1, } local twosize_products = { element_straight = 4, @@ -106,6 +107,7 @@ local cnc_formspec = "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,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[10,3.5;1,1;technic_cnc_onecurvededge_lr.png;onecurvededge_lr; ]".. diff --git a/technic/machines/LV/cnc_api.lua b/technic/machines/LV/cnc_api.lua index 5db9335..95e4806 100644 --- a/technic/machines/LV/cnc_api.lua +++ b/technic/machines/LV/cnc_api.lua @@ -192,6 +192,11 @@ technic.cnc.programs = { desc = S("One Curved Edge LR Block") }, + { suffix = "technic_cnc_twocurvededge_lr", + model = "technic_two_curved_edge_lr.obj", + desc = S("Two Curved Edges LR Block") + }, + -- slope diff --git a/technic/models/technic_arch_216.obj b/technic/models/technic_arch_216.obj index f2f3e5a..4c7fb4c 100644 --- a/technic/models/technic_arch_216.obj +++ b/technic/models/technic_arch_216.obj @@ -1,7 +1,7 @@ # Blender v2.79 (sub 0) OBJ File: '' # www.blender.org mtllib technic_arch_216.mtl -o Cylinder_Cylinder.007 +o Cylinder_Cylinder.009 v -0.500000 -0.499999 -0.500000 v -0.500000 -0.499999 0.500000 v -0.480785 -0.304909 0.500000 @@ -40,38 +40,38 @@ v 0.500000 0.375000 -0.500000 v 0.500000 0.375000 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 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 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 1.000000 0.000000 -vt 1.000000 0.080477 -vt 0.000000 0.080477 +vt 1.000000 0.125000 +vt 0.000000 0.125000 vt 0.000000 0.000000 -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.579247 -vt 0.000000 0.579247 -vt 1.000000 0.724101 -vt 0.000000 0.724101 -vt 1.000000 0.866173 -vt 0.000000 0.866173 +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 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 1.000000 @@ -136,7 +136,7 @@ vn 0.0000 -1.0000 -0.0000 vn 1.0000 0.0000 0.0000 vn 0.0000 0.0000 1.0000 vn -0.0000 0.0000 -1.0000 -usemtl None +usemtl None.008 s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 f 4/4/2 3/3/2 5/5/2 6/6/2 @@ -154,6 +154,7 @@ f 27/27/13 29/29/13 30/30/13 28/28/13 f 29/29/14 31/31/14 32/32/14 30/30/14 f 31/31/15 33/33/15 34/34/15 32/32/15 f 33/33/16 35/35/16 36/36/16 34/34/16 +usemtl None.008_NONE f 1/37/17 19/38/17 22/39/17 2/40/17 f 17/41/18 36/42/18 35/43/18 18/44/18 f 15/45/19 36/46/19 17/17/19 diff --git a/technic/models/technic_one_curved_edge_lr.obj b/technic/models/technic_one_curved_edge_lr.obj index 37c1baa..6e9dcb1 100644 --- a/technic/models/technic_one_curved_edge_lr.obj +++ b/technic/models/technic_one_curved_edge_lr.obj @@ -1,7 +1,7 @@ # Blender v2.79 (sub 0) OBJ File: '' # www.blender.org mtllib technic_one_curved_edge_lr.mtl -o Cylinder_Cylinder.007 +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 @@ -24,20 +24,20 @@ 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 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 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 1.000000 1.000000 @@ -66,61 +66,50 @@ 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.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.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.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.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.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 -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 +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 diff --git a/technic/models/technic_two_curved_edge_lr.obj b/technic/models/technic_two_curved_edge_lr.obj new file mode 100644 index 0000000..d350cd5 --- /dev/null +++ b/technic/models/technic_two_curved_edge_lr.obj @@ -0,0 +1,239 @@ +# Blender v2.79 (sub 0) OBJ File: '' +# www.blender.org +mtllib technic_two_curved_edge_lr.mtl +o Cylinder_Cylinder.000_Cylinder_Cylinder.004 +v -0.500000 -0.499999 -0.500000 +v -0.500000 -0.499999 0.500000 +v -0.480785 -0.304909 0.500000 +v -0.481147 -0.308587 -0.481147 +v 0.500000 -0.499999 -0.500000 +v -0.500000 -0.499999 -0.500000 +v 0.500000 -0.304909 -0.480785 +v -0.423879 -0.117316 -0.423879 +v 0.500000 -0.117316 -0.423879 +v -0.331469 0.055571 -0.331469 +v 0.500000 0.055571 -0.331469 +v -0.207106 0.207108 -0.207106 +v 0.500000 0.207108 -0.207106 +v -0.055569 0.331470 -0.055569 +v 0.500000 0.331470 -0.055569 +v 0.117318 0.423880 0.117318 +v 0.500000 0.423880 0.117318 +v 0.304911 0.480786 0.304911 +v 0.500000 0.480786 0.304911 +v 0.500000 0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.500000 +v 0.117318 0.423880 0.500000 +v 0.304911 0.480786 0.500000 +v -0.055569 0.331470 0.500000 +v -0.423879 -0.117316 0.500000 +v -0.331469 0.055571 0.500000 +v 0.500000 0.500000 0.500000 +v -0.207106 0.207108 0.500000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.125000 +vt 0.017052 0.125000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 0.982422 0.125000 +vt 0.000000 0.125000 +vt 0.949219 0.250000 +vt 0.000000 0.250000 +vt 0.904297 0.375000 +vt 0.000000 0.375000 +vt 0.843750 0.500000 +vt 0.000000 0.500000 +vt 0.744141 0.625000 +vt 0.000000 0.625000 +vt 0.626953 0.750000 +vt 0.000000 0.750000 +vt 0.425781 0.875000 +vt 0.000000 0.875000 +vt 0.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.595663 0.875000 +vt 0.384227 0.750000 +vt 1.000000 0.750000 +vt 1.000000 0.875000 +vt 0.249926 0.625000 +vt 1.000000 0.625000 +vt 0.089345 0.375000 +vt 0.045448 0.250000 +vt 1.000000 0.250000 +vt 1.000000 0.375000 +vt 1.000000 1.000000 +vt 0.157480 0.500000 +vt 1.000000 0.500000 +vt 0.980785 0.195091 +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 +vt 1.000000 0.000000 +vt 0.019215 0.195091 +vt 0.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 1.000000 1.000000 +vn -0.9935 0.1125 0.0161 +vn -0.9944 0.1034 -0.0211 +vn -0.9956 0.0932 -0.0117 +vn -0.9960 0.0888 0.0020 +vn -0.0154 0.1133 -0.9934 +vn 0.0212 0.1031 -0.9944 +vn 0.0090 0.0951 -0.9954 +vn -0.0236 0.0887 -0.9958 +vn -0.0097 0.3111 -0.9503 +vn 0.0043 0.2965 -0.9550 +vn 0.0110 0.2831 -0.9590 +vn -0.0240 0.2796 -0.9598 +vn -0.0093 0.4921 -0.8705 +vn 0.0084 0.4797 -0.8774 +vn 0.0111 0.4660 -0.8847 +vn -0.0236 0.4630 -0.8860 +vn -0.0093 0.6524 -0.7578 +vn 0.0092 0.6410 -0.7675 +vn 0.0109 0.6294 -0.7770 +vn -0.0235 0.6270 -0.7787 +vn -0.0093 0.7877 -0.6160 +vn 0.0098 0.7780 -0.6282 +vn 0.0108 0.7687 -0.6395 +vn -0.0236 0.7669 -0.6414 +vn -0.0093 0.8928 -0.4504 +vn 0.0102 0.8854 -0.4647 +vn 0.0106 0.8786 -0.4774 +vn -0.0235 0.8773 -0.4794 +vn -0.0093 0.9635 -0.2677 +vn 0.0104 0.9589 -0.2834 +vn 0.0085 0.9519 -0.3064 +vn -0.0236 0.9539 -0.2991 +vn -0.0093 0.9972 -0.0745 +vn 0.0173 0.9958 -0.0904 +vn -0.0133 0.9933 -0.1151 +vn -0.0154 -0.9998 0.0154 +vn -0.1286 -0.8678 -0.4801 +vn 0.3514 -0.8678 -0.3514 +vn 0.0054 -0.9998 0.0211 +vn -0.3073 0.9516 0.0063 +vn -0.2878 0.9576 0.0124 +vn -0.2731 0.9618 -0.0179 +vn -0.3074 0.9514 -0.0180 +vn -0.4824 0.8760 -0.0019 +vn -0.4690 0.8831 0.0124 +vn -0.4554 0.8901 -0.0179 +vn -0.4870 0.8732 -0.0179 +vn -0.8878 0.4602 0.0008 +vn -0.8802 0.4745 0.0122 +vn -0.8732 0.4870 -0.0179 +vn -0.8901 0.4554 -0.0179 +vn -0.1180 0.9930 -0.0083 +vn -0.0911 0.9957 0.0176 +vn -0.0801 0.9966 -0.0180 +vn -0.7809 0.6246 -0.0004 +vn -0.7709 0.6368 0.0123 +vn -0.7614 0.6480 -0.0179 +vn -0.7841 0.6204 -0.0179 +vn -0.9610 0.2767 0.0019 +vn -0.9567 0.2908 0.0088 +vn -0.9540 0.2998 -0.0052 +vn -0.9623 0.2714 -0.0183 +vn -0.6441 0.7649 -0.0013 +vn -0.6321 0.7748 0.0123 +vn -0.6204 0.7841 -0.0179 +vn -0.6480 0.7614 -0.0179 +vn 0.9997 -0.0245 0.0064 +vn 0.8678 0.0810 -0.4904 +vn 0.9998 0.0146 0.0161 +vn 0.9997 -0.0253 0.0015 +vn 0.8678 0.1751 -0.4651 +vn 0.9997 0.0039 0.0250 +vn 0.9997 -0.0251 -0.0035 +vn 0.8678 0.2624 -0.4220 +vn 0.9997 -0.0010 0.0253 +vn 0.9997 -0.0239 -0.0083 +vn 0.8678 0.3397 -0.3627 +vn 0.9997 -0.0059 0.0247 +vn 0.9997 -0.0219 -0.0128 +vn 0.8678 0.4040 -0.2895 +vn 0.9997 -0.0106 0.0230 +vn 0.9997 -0.0189 -0.0168 +vn 0.8678 0.4527 -0.2051 +vn 0.9997 -0.0149 0.0205 +vn 0.9997 -0.0153 -0.0202 +vn 0.8678 0.4840 -0.1129 +vn 0.9997 -0.0186 0.0172 +vn 0.9998 -0.0071 -0.0206 +vn 0.8678 0.4967 -0.0163 +vn 0.9997 -0.0216 0.0132 +vn -0.4967 0.0163 0.8678 +vn 0.0034 -0.0122 0.9999 +vn 0.3683 0.3338 0.8678 +vn 0.0108 -0.0229 0.9997 +vn 0.0125 0.0022 0.9999 +vn -0.4840 0.1129 0.8678 +vn 0.0062 -0.0246 0.9997 +vn 0.0238 0.0085 0.9997 +vn -0.4527 0.2051 0.8678 +vn 0.0012 -0.0253 0.9997 +vn 0.0251 0.0037 0.9997 +vn -0.4040 0.2895 0.8678 +vn -0.0037 -0.0251 0.9997 +vn 0.0253 -0.0012 0.9997 +vn -0.3397 0.3627 0.8678 +vn -0.0085 -0.0238 0.9997 +vn 0.0246 -0.0062 0.9997 +vn -0.2624 0.4220 0.8678 +vn -0.0131 -0.0218 0.9997 +vn 0.0229 -0.0108 0.9997 +vn -0.1751 0.4651 0.8678 +vn -0.0810 0.4904 0.8678 +vn -0.0051 -0.0212 0.9998 +vn 0.0204 -0.0151 0.9997 +usemtl None.009 +s 1 +f 1/1/1 2/2/2 3/3/3 4/4/4 +f 5/5/5 6/6/6 4/7/7 7/8/8 +f 7/8/9 4/7/10 8/9/11 9/10/12 +f 9/10/13 8/9/14 10/11/15 11/12/16 +f 11/12/17 10/11/18 12/13/19 13/14/20 +f 13/14/21 12/13/22 14/15/23 15/16/24 +f 15/16/25 14/15/26 16/17/27 17/18/28 +f 17/18/29 16/17/30 18/19/31 19/20/32 +f 19/20/33 18/19/34 20/21/35 +f 5/22/36 21/23/37 22/24/38 6/25/39 +f 18/26/40 16/27/41 23/28/42 24/29/43 +f 16/27/44 14/30/45 25/31/46 23/28/47 +f 10/32/48 8/33/49 26/34/50 27/35/51 +f 28/36/52 18/26/53 24/29/54 +f 12/37/55 10/32/56 27/35/57 29/38/58 +f 8/33/59 4/4/60 3/3/61 26/34/62 +f 14/30/63 12/37/64 29/38/65 25/31/66 +usemtl None.009_NONE +f 7/39/67 21/23/68 5/40/69 +f 9/41/70 21/23/71 7/39/72 +f 11/42/73 21/23/74 9/41/75 +f 13/43/76 21/23/77 11/42/78 +f 15/44/79 21/23/80 13/43/81 +f 17/45/82 21/23/83 15/44/84 +f 19/46/85 21/23/86 17/45/87 +f 20/21/88 21/23/89 19/46/90 +f 21/47/91 3/48/92 22/49/93 +f 26/50/94 3/48/95 21/47/96 +f 27/51/97 26/50/98 21/47/99 +f 29/52/100 27/51/101 21/47/102 +f 25/53/103 29/52/104 21/47/105 +f 23/54/106 25/53/107 21/47/108 +f 24/55/109 23/54/110 21/47/111 +f 21/47/112 20/56/113 24/55/114 |