rhombus frame

5 files changed, 253 insertions, 2 deletions

diff --git a/README.md b/README.md
index e2fc80d..0d2e020 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ stick, %wood_planks%, stick
 stick, stick, stick
 ```
 
-Quartered square frame (□ + ➕):
+Quartered square frame (▢ + ✛):
 
 ```
 "", stick, ""
@@ -31,10 +31,18 @@ stick, %wood_planks%, stick
 "", stick, ""
 ```
 
-Diagonally quartered frame (□ + ✕):
+Diagonally quartered frame (▢ + ✕):
 
 ```
 stick, "", stick
 "", %wood_planks%, ""
 stick, "", stick
+```
+
+Rhombus frame (▢ + ◇):
+
+```
+"", stick, stick
+"", %wood_planks%, ""
+stick, stick, ""
 ```
\ No newline at end of file
diff --git a/init.lua b/init.lua
index b98646c..408d066 100644
--- a/init.lua
+++ b/init.lua
@@ -50,6 +50,16 @@ local frametypes = {
 				{"default:stick", "", "default:stick"}
 			}
       },
+      {
+		name = "Rhombus window frame", 
+		node = "wfr", 
+		model = "si_frame_rhombus.obj",
+		howto = {
+				{"", "default:stick", "default:stick"},
+				{"", "%MATERIAL%", ""},
+				{"default:stick", "default:stick", ""}
+			}
+      },
 }
 
 
diff --git a/models/si_frame_rhombus.mtl b/models/si_frame_rhombus.mtl
new file mode 100644
index 0000000..b6cc004
--- /dev/null
+++ b/models/si_frame_rhombus.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_rhombus.obj b/models/si_frame_rhombus.obj
new file mode 100644
index 0000000..0d73d12
--- /dev/null
+++ b/models/si_frame_rhombus.obj
@@ -0,0 +1,209 @@
+# Blender v2.79 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib si_frame_rhombus.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.499925 -0.000000 1.044188
+v 0.000000 0.499924 1.044187
+v -0.499925 0.000000 0.955813
+v 0.000000 0.499925 0.955812
+v 0.000000 -0.499925 1.044188
+v 0.499925 -0.000000 1.044188
+v 0.000000 -0.499925 0.955813
+v 0.499925 0.000000 0.955813
+v 0.437487 0.000000 0.955813
+v 0.437487 -0.000000 1.044188
+v 0.000000 -0.437487 0.955813
+v 0.000000 -0.437487 1.044188
+v -0.437487 0.000000 0.955813
+v -0.437487 -0.000000 1.044188
+v 0.000000 0.437487 0.955813
+v 0.000000 0.437487 1.044187
+vt 0.000000 0.500000
+vt 1.000000 0.500000
+vt 1.000000 0.625000
+vt 0.000000 0.625000
+vt 0.000000 0.750000
+vt 1.000000 0.750000
+vt 1.000000 0.875000
+vt 0.000000 0.875000
+vt 0.000202 0.340026
+vt 1.000000 0.340023
+vt 0.937567 0.476005
+vt 0.062636 0.476007
+vt 0.000000 0.875000
+vt 1.000000 0.875000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.625000
+vt 1.000000 0.750000
+vt 0.000000 0.750000
+vt 1.000000 0.125000
+vt 1.000000 0.250000
+vt 0.000106 0.250000
+vt 0.000106 0.125000
+vt 0.000106 0.125000
+vt 0.000106 0.000000
+vt 1.000000 0.000000
+vt 1.000000 0.125000
+vt 0.000203 0.959907
+vt 0.062636 0.842891
+vt 0.937566 0.842891
+vt 1.000000 0.959908
+vt 1.000000 0.375000
+vt 1.000000 0.500000
+vt 0.000106 0.500000
+vt 0.000106 0.375000
+vt 1.000000 0.250000
+vt 1.000000 0.375000
+vt 0.000106 0.375000
+vt 0.000106 0.250000
+vt 0.000200 0.592975
+vt 1.000000 0.592974
+vt 0.937566 0.711848
+vt 0.062634 0.711847
+vt 0.000203 0.224026
+vt 0.062636 0.088271
+vt 0.937566 0.088271
+vt 1.000000 0.224026
+vt 0.000100 0.955327
+vt 0.062534 0.841409
+vt 0.937465 0.841411
+vt 0.999899 0.955328
+vt 1.000000 0.337965
+vt 0.937566 0.466926
+vt 0.062636 0.466924
+vt 0.000201 0.337963
+vt 0.000000 0.100287
+vt 0.999798 0.100284
+vt 0.937365 0.208529
+vt 0.062434 0.208530
+vt 1.000000 0.709825
+vt 0.000200 0.709824
+vt 0.062634 0.598158
+vt 0.937566 0.598160
+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
+vn -0.7071 0.7071 0.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
+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 17/1/1 18/2/1 20/3/1 19/4/1
+f 23/5/2 24/6/2 22/7/2 21/8/2
+f 17/9/3 21/10/3 28/11/3 30/12/3
+f 19/13/4 23/14/4 21/15/4 17/16/4
+f 24/17/5 20/3/5 18/18/5 22/19/5
+f 27/20/1 28/21/1 26/22/1 25/23/1
+f 30/24/2 29/25/2 31/26/2 32/27/2
+f 17/28/3 30/29/3 32/30/3 18/31/3
+f 29/32/5 30/33/5 28/34/5 27/35/5
+f 25/36/4 26/37/4 32/38/4 31/39/4
+f 19/40/6 20/41/6 31/42/6 29/43/6
+f 19/44/6 29/45/6 27/46/6 23/47/6
+f 23/48/6 27/49/6 25/50/6 24/51/6
+f 24/52/6 25/53/6 31/54/6 20/55/6
+f 21/56/3 22/57/3 26/58/3 28/59/3
+f 22/60/3 18/61/3 32/62/3 26/63/3
+usemtl None.001_maple_wood.png.002
+s 1
+f 1/64/7 2/65/7 3/66/7 4/67/7
+f 5/68/3 6/69/3 7/70/3 8/71/3
+f 9/72/8 10/73/8 6/74/8 5/75/8
+f 6/76/3 2/77/3 11/78/3 7/79/3
+f 4/80/9 9/81/9 5/82/9 1/83/9
+f 10/84/10 3/85/10 2/86/10 6/87/10
+f 12/88/7 8/89/7 7/90/7 13/91/7
+f 14/92/8 15/93/8 16/94/8 11/95/8
+f 1/96/3 14/97/3 11/98/3 2/99/3
+f 1/100/3 5/101/3 8/102/3 14/103/3
+f 15/104/10 14/105/10 8/106/10 12/107/10
+f 13/108/9 7/109/9 11/110/9 16/111/9
+f 9/112/6 12/113/6 13/114/6 10/115/6
+f 10/116/6 13/117/6 16/118/6 3/119/6
+f 4/120/6 3/121/6 16/122/6 15/123/6
+f 4/124/6 15/125/6 12/126/6 9/127/6
diff --git a/textures/wfr.png b/textures/wfr.png
new file mode 100644
index 0000000..b346eb1
--- /dev/null
+++ b/textures/wfr.png