better rhombus frame

3 files changed, 297 insertions, 1 deletions

diff --git a/init.lua b/init.lua
index 408d066..ff61110 100644
--- a/init.lua
+++ b/init.lua
@@ -53,7 +53,7 @@ local frametypes = {
       {
 		name = "Rhombus window frame", 
 		node = "wfr", 
-		model = "si_frame_rhombus.obj",
+		model = "si_frame_rhombus2.obj",
 		howto = {
 				{"", "default:stick", "default:stick"},
 				{"", "%MATERIAL%", ""},
diff --git a/models/si_frame_rhombus2.mtl b/models/si_frame_rhombus2.mtl
new file mode 100644
index 0000000..b6cc004
--- /dev/null
+++ b/models/si_frame_rhombus2.mtl
@@ -0,0 +1,24 @@
+# Blender MTL File: 'None'
+# Material Count: 2
+
+newmtl None.001
+Ns 0.000000
+Ka 0.000000 0.000000 0.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.800000 0.800000 0.800000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd /home/smacker/Github/maple/textures/maple_wood.png
+
+newmtl None.001_maple_wood.png.002
+Ns 0.000000
+Ka 0.000000 0.000000 0.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.800000 0.800000 0.800000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd /home/smacker/Github/maple/textures/maple_wood.png
diff --git a/models/si_frame_rhombus2.obj b/models/si_frame_rhombus2.obj
new file mode 100644
index 0000000..6babea2
--- /dev/null
+++ b/models/si_frame_rhombus2.obj
@@ -0,0 +1,272 @@
+# Blender v2.79 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib si_frame_rhombus2.mtl
+o Cube_Cube.000
+v -0.500000 -0.500000 1.125000
+v -0.500000 0.500000 1.125000
+v -0.500000 0.500000 0.875000
+v -0.500000 -0.500000 0.875000
+v 0.500000 -0.500000 1.125000
+v 0.500000 0.500000 1.125000
+v 0.437500 0.437500 1.125000
+v 0.437500 -0.437500 1.125000
+v 0.500000 -0.500000 0.875000
+v 0.500000 0.500000 0.875000
+v -0.437500 0.437500 1.125000
+v 0.437500 -0.437500 0.875000
+v 0.437500 0.437500 0.875000
+v -0.437500 -0.437500 1.125000
+v -0.437500 -0.437500 0.875000
+v -0.437500 0.437500 0.875000
+v 0.437487 0.000000 0.953519
+v 0.437487 -0.000000 1.046481
+v 0.000000 -0.437487 0.953519
+v 0.000000 -0.437487 1.046481
+v -0.437487 0.000000 0.953519
+v -0.437487 -0.000000 1.046481
+v 0.000000 0.437487 0.953519
+v 0.000000 0.437487 1.046481
+v 0.437500 -0.088375 1.046481
+v 0.437500 0.088375 1.046481
+v 0.437500 -0.000000 1.046481
+v 0.437500 -0.073521 1.046481
+v 0.437500 -0.088375 0.953519
+v 0.437500 0.088375 0.953519
+v 0.437500 0.000000 0.953519
+v -0.437500 -0.088375 1.046481
+v -0.437500 0.088375 1.046481
+v -0.437500 -0.000000 1.046481
+v -0.437500 -0.088375 0.953519
+v -0.437500 0.088375 0.953519
+v -0.437500 0.000000 0.953519
+v -0.088375 -0.437500 1.046481
+v 0.088375 -0.437500 1.046481
+v 0.000000 -0.437500 1.046481
+v -0.088375 -0.437500 0.953519
+v 0.088375 -0.437500 0.953519
+v 0.000000 -0.437500 0.953519
+v -0.088375 0.437500 1.046481
+v 0.088375 0.437500 1.046481
+v 0.000000 0.437500 1.046481
+v -0.088375 0.437500 0.953519
+v 0.000000 0.437500 0.953519
+v 0.088375 0.437500 0.953519
+vt 0.000000 1.000000
+vt 0.000000 0.875000
+vt 1.000000 0.875000
+vt 1.000000 1.000000
+vt 0.000000 0.750000
+vt 0.000000 0.625000
+vt 1.000000 0.625000
+vt 1.000000 0.750000
+vt 1.000000 0.500000
+vt 1.000000 0.625000
+vt 0.000000 0.625000
+vt 0.000000 0.500000
+vt 1.000000 0.750000
+vt 0.000000 0.875000
+vt 0.000000 0.750000
+vt -0.000000 0.375000
+vt -0.000000 0.250000
+vt 0.996448 0.250000
+vt 0.996448 0.375000
+vt 0.102057 0.957582
+vt 0.000055 0.839198
+vt 0.001808 0.837099
+vt 0.998246 0.837018
+vt 1.000000 0.839115
+vt 0.898073 0.957579
+vt 0.000000 0.480895
+vt 0.101000 0.347219
+vt 0.899000 0.347219
+vt 1.000000 0.480895
+vt 0.999985 0.480915
+vt 0.000015 0.480915
+vt 0.101442 0.727534
+vt 0.000000 0.587600
+vt 0.001743 0.585119
+vt 0.992717 0.585023
+vt 0.994462 0.587502
+vt 0.893093 0.727531
+vt 0.894539 0.081521
+vt 0.996153 0.222839
+vt 0.994407 0.225344
+vt 0.001748 0.225440
+vt 0.000000 0.222936
+vt 0.101541 0.081523
+vt 1.000000 0.827634
+vt 0.899313 0.967432
+vt 0.103787 0.967432
+vt 0.003100 0.827634
+vt 0.003115 0.827613
+vt 0.999985 0.827613
+vt 0.998371 0.222484
+vt 0.897002 0.075641
+vt 0.105349 0.075639
+vt 0.003906 0.222383
+vt 0.005649 0.224985
+vt 0.996627 0.225084
+vt 0.897606 0.081455
+vt 0.998450 0.227341
+vt 0.998435 0.227362
+vt 0.000015 0.227362
+vt 0.000000 0.227341
+vt 0.100844 0.081455
+vt 0.996448 0.125000
+vt 0.996448 0.250000
+vt 0.000000 0.250000
+vt -0.000000 0.125000
+vt 0.996448 0.375000
+vt 0.996448 0.500000
+vt 0.000000 0.500000
+vt -0.000000 0.375000
+vt 0.000000 0.125000
+vt -0.000000 0.000000
+vt 0.996448 0.000000
+vt 0.996448 0.125000
+vt 0.998450 0.587222
+vt 0.897606 0.716431
+vt 0.100844 0.716431
+vt 0.083894 0.694713
+vt 0.000000 0.587222
+vt 0.000015 0.587203
+vt 0.998435 0.587203
+vt 0.000000 0.514541
+vt 0.999163 0.514541
+vt 0.999163 0.745055
+vt 0.000000 0.745055
+vt 0.997859 0.928100
+vt -0.002141 0.928100
+vt 0.060359 0.865600
+vt 0.935359 0.865600
+vt 0.000000 0.506774
+vt 0.996063 0.506774
+vt 0.996063 0.267734
+vt 0.000000 0.267734
+vt 0.998450 0.781791
+vt -0.001550 0.781791
+vt 0.060950 0.719291
+vt 0.935950 0.719291
+vt 0.994448 1.000000
+vt -0.001432 1.000000
+vt -0.001432 0.751132
+vt 0.994448 0.751132
+vt 1.000000 0.256963
+vt 0.002317 0.256963
+vt 0.002317 0.001207
+vt 1.000000 0.001207
+vt 0.000000 0.000000
+vt 0.000000 0.235714
+vt 0.996094 0.235714
+vt 0.996094 0.000000
+vt 0.000000 0.483879
+vt 0.000000 0.240861
+vt 0.996094 0.240860
+vt 0.996094 0.483879
+vt 0.006792 0.855241
+vt 0.069292 0.792741
+vt 0.944292 0.792741
+vt 1.006792 0.855241
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.062500 0.937500
+vt 0.937500 0.937500
+vt 0.000000 1.000000
+vt -0.000000 0.750000
+vt 0.999340 0.750000
+vt 0.999341 1.000000
+vt 0.995538 0.743923
+vt 0.995538 0.489166
+vt 0.000000 0.489166
+vt 0.000000 0.743923
+vt -0.000591 0.855241
+vt 0.061909 0.792741
+vt 0.936909 0.792741
+vt 0.999409 0.855241
+vt 0.000000 1.000000
+vt 0.062500 0.937500
+vt 0.937500 0.937500
+vt 1.000000 1.000000
+vt 0.999040 0.926550
+vt -0.000959 0.926550
+vt 0.061541 0.864050
+vt 0.936540 0.864050
+vt 0.004651 0.784892
+vt 0.067150 0.722392
+vt 0.942150 0.722391
+vt 1.004650 0.784891
+vt 0.397441 0.074032
+vt 0.498047 0.074032
+vt 0.598653 0.074032
+vt 0.598653 0.161682
+vt 0.498047 0.161682
+vt 0.414351 0.161682
+vt 0.397441 0.161682
+vt 0.397441 0.407553
+vt 0.498047 0.407553
+vt 0.598653 0.407553
+vt 0.598653 0.317186
+vt 0.498047 0.317187
+vt 0.397441 0.317187
+vt 0.398737 0.921481
+vt 0.499670 0.921481
+vt 0.600604 0.921481
+vt 0.600604 0.828519
+vt 0.499670 0.828519
+vt 0.398736 0.828519
+vt 0.598319 0.663910
+vt 0.497769 0.663910
+vt 0.397219 0.663910
+vt 0.397219 0.569179
+vt 0.497769 0.569179
+vt 0.598319 0.569179
+vn -0.7071 0.7071 0.0000
+vn 0.7071 -0.7071 -0.0000
+vn 0.7071 0.7071 0.0000
+vn -0.7071 -0.7071 -0.0000
+vn -0.0000 0.0000 -1.0000
+vn -0.0000 0.0000 1.0000
+vn -1.0000 0.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+usemtl None.001
+s off
+f 19/1/1 20/2/1 18/3/1 17/4/1
+f 22/5/2 21/6/2 23/7/2 24/8/2
+f 21/9/3 22/10/3 20/11/3 19/12/3
+f 17/13/4 18/3/4 24/14/4 23/15/4
+f 32/16/4 35/17/4 41/18/4 38/19/4
+f 30/20/5 31/21/5 17/22/5 23/23/5 48/24/5 49/25/5
+f 27/26/6 26/27/6 45/28/6 46/29/6 24/30/6 18/31/6
+f 42/32/5 43/33/5 19/34/5 17/35/5 31/36/5 29/37/5
+f 35/38/5 37/39/5 21/40/5 19/41/5 43/42/5 41/43/5
+f 34/44/6 32/45/6 38/46/6 40/47/6 20/48/6 22/49/6
+f 37/50/5 36/51/5 47/52/5 48/53/5 23/54/5 21/55/5
+f 33/56/6 34/57/6 22/58/6 24/59/6 46/60/6 44/61/6
+f 39/62/2 42/63/2 29/64/2 25/65/2
+f 26/66/3 30/67/3 49/68/3 45/69/3
+f 36/70/1 33/71/1 44/72/1 47/73/1
+f 40/74/6 39/75/6 25/76/6 28/77/6 27/78/6 18/79/6 20/80/6
+usemtl None.001_maple_wood.png.002
+s 1
+f 1/81/7 2/82/7 3/83/7 4/84/7
+f 5/85/6 6/86/6 7/87/6 8/88/6
+f 9/89/8 10/90/8 6/91/8 5/92/8
+f 6/93/6 2/94/6 11/95/6 7/96/6
+f 4/97/9 9/98/9 5/99/9 1/100/9
+f 10/101/10 3/102/10 2/103/10 6/104/10
+f 12/105/7 8/106/7 7/107/7 13/108/7
+f 14/109/8 15/110/8 16/111/8 11/112/8
+f 1/113/6 14/114/6 11/115/6 2/116/6
+f 1/117/6 5/118/6 8/119/6 14/120/6
+f 15/121/10 14/122/10 8/123/10 12/124/10
+f 13/125/9 7/126/9 11/127/9 16/128/9
+f 9/129/5 12/130/5 13/131/5 10/132/5
+f 10/133/5 13/134/5 16/135/5 3/136/5
+f 4/137/5 3/138/5 16/139/5 15/140/5
+f 4/141/5 15/142/5 12/143/5 9/144/5
+f 29/145/8 31/146/8 30/147/8 26/148/8 27/149/8 28/150/8 25/151/8
+f 32/152/7 34/153/7 33/154/7 36/155/7 37/156/7 35/157/7
+f 41/158/9 43/159/9 42/160/9 39/161/9 40/162/9 38/163/9
+f 49/164/10 48/165/10 47/166/10 44/167/10 46/168/10 45/169/10