use mesh node for desk

homedecor/models/homedecor_desk.obj

@@ -0,0 +1,285 @@
+# Blender v2.73 (sub 0) OBJ File: 'desk.blend'
+# www.blender.org
+o drawers_Cube.003
+v -0.312500 0.000000 -0.437500
+v -0.312500 0.000000 -0.500000
+v 0.437500 0.000000 -0.500000
+v 0.437500 0.000000 -0.437500
+v -0.312500 0.375000 -0.437500
+v -0.312500 0.375000 -0.500000
+v 0.437500 0.375000 -0.500000
+v 0.437500 0.375000 -0.437500
+v -0.312500 -0.437500 -0.437500
+v -0.312500 -0.437500 -0.500000
+v 0.437500 -0.437500 -0.500000
+v 0.437500 -0.437500 -0.437500
+v -0.312500 -0.062500 -0.437500
+v -0.312500 -0.062500 -0.500000
+v 0.437500 -0.062500 -0.500000
+v 0.437500 -0.062500 -0.437500
+vt 0.875000 0.875000
+vt 0.812500 0.875000
+vt 0.812500 0.500000
+vt 0.875000 0.500000
+vt 0.062500 0.875000
+vt 0.062500 0.500000
+vt 0.000000 0.875000
+vt 0.000000 0.500000
+vt 0.062500 0.937500
+vt 0.062500 1.000000
+vt 0.812500 1.000000
+vt 0.812500 0.937500
+vt 0.875000 0.437500
+vt 0.812500 0.437500
+vt 0.812500 0.062500
+vt 0.875000 0.062500
+vt 0.062500 0.437500
+vt 0.062500 0.062500
+vt 0.000000 0.437500
+vt 0.000000 0.062500
+vt 0.062500 0.000000
+vt 0.812500 0.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+g drawers_Cube.003_drawers
+s off
+f 5/1/1 6/2/1 2/3/1 1/4/1
+f 6/2/2 7/5/2 3/6/2 2/3/2
+f 7/5/3 8/7/3 4/8/3 3/6/3
+f 1/9/4 2/10/4 3/11/4 4/12/4
+f 8/2/5 7/12/5 6/9/5 5/5/5
+f 13/13/1 14/14/1 10/15/1 9/16/1
+f 14/14/2 15/17/2 11/18/2 10/15/2
+f 15/17/3 16/19/3 12/20/3 11/18/3
+f 9/21/4 10/18/4 11/15/4 12/22/4
+f 16/14/5 15/3/5 14/6/5 13/17/5
+o rails-metal_Cube.002
+v -0.500000 0.437500 0.000000
+v -0.500000 0.437500 -0.437500
+v -0.531250 0.437500 -0.437500
+v -0.531250 0.437500 0.000000
+v -0.500000 0.312500 0.000000
+v -0.500000 0.312500 -0.437500
+v -0.531250 0.312500 -0.437500
+v -0.531250 0.312500 0.000000
+v -1.406250 0.312500 0.000000
+v -1.406250 0.312500 -0.437500
+v -1.375000 0.312500 -0.437500
+v -1.375000 0.312500 0.000000
+v -1.406250 0.437500 0.000000
+v -1.406250 0.437500 -0.437500
+v -1.375000 0.437500 -0.437500
+v -1.375000 0.437500 0.000000
+vt 0.750000 0.937500
+vt 0.750000 0.875000
+vt 1.000000 0.875000
+vt 1.000000 0.937500
+vt 0.750000 0.750000
+vt 0.000000 0.750000
+vt 0.000000 0.562500
+vt 0.750000 0.562500
+vt 0.750000 0.312500
+vt 0.000000 0.312500
+vt 0.000000 0.125000
+vt 0.750000 0.125000
+vt 0.750000 0.625000
+vt 1.000000 0.562500
+vt 1.000000 0.625000
+vt 0.000000 0.000000
+vt 0.750000 0.000000
+vt 0.750000 0.062500
+vt 0.000000 0.062500
+vt 0.750000 0.500000
+vt 1.000000 0.500000
+vt 0.750000 1.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 0.000000
+g rails-metal_Cube.002_metal
+s off
+f 32/23/6 29/24/6 25/25/6 28/26/6
+f 31/27/7 32/28/7 28/29/7 27/30/7
+f 29/31/8 30/32/8 26/33/8 25/34/8
+f 30/35/9 31/30/9 27/36/9 26/37/9
+f 24/38/10 23/39/10 22/40/10 21/41/10
+f 19/30/9 18/42/9 22/43/9 23/36/9
+f 20/30/8 19/29/8 23/32/8 24/31/8
+f 18/44/7 17/45/7 21/28/7 22/27/7
+f 17/44/6 20/23/6 24/26/6 21/46/6
+f 25/34/10 26/33/10 27/41/10 28/40/10
+o main-parts-wood_Cube.001
+v -0.375000 -0.500000 0.500000
+v -0.375000 -0.500000 -0.437500
+v 0.500000 -0.500000 -0.437500
+v 0.500000 -0.500000 0.500000
+v -0.375000 0.437500 0.500000
+v -0.375000 0.437500 -0.437500
+v 0.500000 0.437500 -0.437500
+v 0.500000 0.437500 0.500000
+v -0.312500 0.000000 -0.437500
+v -0.500000 0.437500 0.500000
+v -0.500000 0.437500 -0.437500
+v 0.437500 0.000000 -0.437500
+v -0.312500 0.375000 -0.437500
+v -0.500000 0.500000 0.500000
+v -0.500000 0.500000 -0.437500
+v 0.437500 0.375000 -0.437500
+v -0.312500 -0.437500 -0.437500
+v -0.500000 -0.375000 0.500000
+v -0.500000 0.250000 0.500000
+v 0.437500 -0.437500 -0.437500
+v -0.312500 -0.062500 -0.437500
+v -0.500000 -0.375000 0.437500
+v -0.500000 0.250000 0.437500
+v 0.437500 -0.062500 -0.437500
+v -1.500000 0.437500 0.500000
+v -1.500000 0.437500 -0.437500
+v -1.500000 0.500000 0.500000
+v -1.500000 0.500000 -0.437500
+v 0.500000 0.500000 -0.437500
+v 0.500000 0.500000 0.500000
+v -1.500000 -0.500000 0.500000
+v -1.500000 -0.500000 -0.437500
+v -1.437500 -0.500000 -0.437500
+v -1.437500 -0.500000 0.500000
+v -1.437500 0.437500 -0.437500
+v -1.437500 0.437500 0.500000
+v -1.437500 -0.375000 0.500000
+v -1.437500 -0.375000 0.437500
+v -0.375000 -0.375000 0.437500
+v -0.375000 -0.375000 0.500000
+v -1.437500 0.250000 0.500000
+v -1.437500 0.250000 0.437500
+v -0.375000 0.250000 0.437500
+v -0.375000 0.250000 0.500000
+v -1.375000 0.328125 -0.062500
+v -1.375000 0.328125 -0.375000
+v -0.531250 0.328125 -0.375000
+v -0.531250 0.328125 -0.062500
+v -1.375000 0.359375 -0.062500
+v -1.375000 0.359375 -0.375000
+v -0.531250 0.359375 -0.375000
+v -0.531250 0.359375 -0.062500
+v -0.375000 0.000000 -0.437500
+v -0.375000 0.375000 -0.437500
+v -0.375000 -0.437500 -0.437500
+v -0.375000 -0.062500 -0.437500
+v 0.500000 0.000000 -0.437500
+v 0.500000 0.375000 -0.437500
+v 0.500000 -0.437500 -0.437500
+v 0.500000 -0.062500 -0.437500
+vt 1.000000 1.000000
+vt 0.062500 1.000000
+vt 0.062500 0.062500
+vt 1.000000 0.062500
+vt 1.000000 0.937500
+vt 0.062500 0.937500
+vt 0.062500 0.000000
+vt 1.000000 0.000000
+vt 0.125000 0.937500
+vt 0.125000 0.000000
+vt 0.125000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.000000 0.937500
+vt 0.937500 0.750000
+vt 0.000000 0.750000
+vt 0.000000 0.125000
+vt 0.937500 0.125000
+vt 0.125000 0.750000
+vt 0.125000 0.125000
+vt 0.937500 1.000000
+vt 0.937500 0.937500
+vt 0.937500 0.000000
+vt 1.000000 0.750000
+vt 0.875000 0.750000
+vt 0.875000 0.125000
+vt 1.000000 0.125000
+vt 0.062500 0.750000
+vt 0.062500 0.125000
+vt 0.875000 0.859375
+vt 0.031250 0.859375
+vt 0.031250 0.828125
+vt 0.875000 0.828125
+vt 0.968750 0.859375
+vt 0.125000 0.859375
+vt 0.125000 0.828125
+vt 0.968750 0.828125
+vt 0.000000 0.984375
+vt 0.000000 0.773396
+vt 0.569642 0.773396
+vt 0.569642 0.984375
+vt 0.569642 0.523397
+vt 0.569642 0.734375
+vt 0.000000 0.734375
+vt 0.000000 0.523397
+vt 0.000000 0.062500
+vt 0.875000 0.000000
+vt 0.875000 0.062500
+vt 0.000000 0.437500
+vt 0.875000 0.437500
+vt 0.875000 0.500000
+vt 0.000000 0.500000
+vt 0.062500 0.875000
+vt 0.000000 0.875000
+vt 0.062500 0.500000
+vt 0.062500 0.437500
+vt 0.812500 0.437500
+vt 0.812500 0.062500
+vt 0.875000 0.875000
+vt 0.812500 0.875000
+vt 0.812500 0.500000
+vt 0.875000 0.937500
+vn -1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+g main-parts-wood_Cube.001_wood
+s off
+f 37/47/11 38/48/11 34/49/11 33/50/11
+f 39/51/12 40/52/12 36/53/12 35/54/12
+f 40/51/13 37/55/13 33/56/13 36/54/13
+f 33/57/14 34/56/14 35/54/14 36/47/14
+f 62/54/15 61/47/15 47/58/15 46/59/15
+f 60/47/16 47/58/16 43/60/16 58/51/16
+f 62/47/13 46/58/13 42/60/13 40/51/13
+f 57/58/14 58/59/14 43/54/14 42/47/14
+f 74/61/16 55/62/16 54/63/16 70/64/16
+f 76/65/13 51/62/13 50/63/13 72/66/13
+f 59/67/11 60/58/11 58/60/11 57/68/11
+f 69/48/14 70/52/14 54/51/14 50/47/14
+f 76/55/15 75/57/15 55/58/15 51/60/15
+f 46/54/15 47/47/15 60/58/15 59/59/15
+f 67/68/12 68/60/12 66/59/12 65/69/12
+f 63/58/14 64/59/14 65/53/14 66/48/14
+f 55/70/16 75/71/16 71/72/16 54/73/16
+f 51/70/13 73/74/13 69/75/13 50/73/13
+f 50/58/14 54/60/14 71/55/14 72/57/14
+f 51/51/15 55/47/15 74/48/15 73/52/15
+f 82/76/16 83/77/16 79/78/16 78/79/16
+f 84/80/13 81/81/13 77/82/13 80/83/13
+f 77/84/14 78/85/14 79/86/14 80/87/14
+f 84/88/15 83/89/15 82/90/15 81/91/15
+f 91/92/16 35/59/16 34/93/16 87/94/16
+f 92/95/16 88/96/16 85/97/16 89/98/16
+f 48/99/16 90/100/16 89/98/16 44/101/16
+f 56/102/16 92/95/16 91/92/16 52/49/16
+f 88/96/16 53/103/16 49/104/16 87/94/16
+f 86/105/16 45/106/16 41/107/16 85/97/16
+f 47/47/16 61/58/16 39/60/16 43/51/16
+f 61/47/12 62/48/12 40/52/12 39/51/12
+f 46/47/13 59/58/13 57/60/13 42/51/13
+f 42/58/14 43/59/14 39/54/14 40/47/14
+f 57/68/11 58/60/11 64/59/11 63/69/11
+f 58/51/16 67/68/16 65/69/16 64/54/16
+f 68/52/13 57/60/13 63/59/13 66/53/13
+f 90/100/16 86/105/16 38/108/16 39/60/16

homedecor/tables.lua

@@ -192,57 +192,25 @@ homedecor.register("utility_table_legs", {
 	},
 })
 
+local desk_cbox = {
+	type = "fixed",
+	fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 0.5 }
+}
+
 homedecor.register("desk", {
 	description = "Desk",
+	mesh = "homedecor_desk.obj",
 	tiles = {
-		"forniture_wood.png",
+		"homedecor_desk_drawers.png",
-		"forniture_wood.png",
+		"forniture_black_metal.png",
-		"forniture_wood.png",
+		"forniture_wood.png"
-		"forniture_wood.png",
-		"forniture_wood.png",
-		"homedecor_desk_front_l.png"
 	},
 	inventory_image = "homedecor_desk_inv.png",
-	node_box = {
+	selection_box = desk_cbox,
-		type = "fixed",
+	collision_box = desk_cbox,
-		fixed = {
-			{-0.5, -0.5, -0.4375, 0.375, 0.5, 0.5},
-			{-0.5, 0.4375, -0.4375, 0.5, 0.5, 0.5},
-			{-0.4375, -0.4375, -0.5, 0.3125, -0.0625, -0.4375},
-			{-0.4375, 0, -0.5, 0.3125, 0.375, 0.5},
-			{0.3125, -0.375, 0.4375, 0.5, 0.25, 0.5},
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 0.5 }
-	},
 	groups = { snappy = 3 },
-	expand = {
+	expand = { right="air" },
-		right="homedecor:desk_r"
-	},
 })
 
-homedecor.register("desk_r", {
+minetest.register_alias("homedecor:desk_r", "air")
-	tiles = {
-		"forniture_wood.png",
-		"forniture_wood.png",
-		"forniture_wood.png",
-		"forniture_wood.png",
-		"homedecor_desk_back_r.png",
-		"homedecor_desk_front_r.png"
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, 0.4375, -0.4375, 0.5, 0.5, 0.5},
-			{0.375, -0.5, -0.4375, 0.5, 0.5, 0.5},
-			{-0.5, 0.3125, -0.4375, 0.5, 0.375, 0.5},
-			{-0.5, 0.3125, -0.4375, -0.4375, 0.5, 0.5},
-			{-0.5, -0.375, 0.4375, 0.4375, 0.25, 0.5},
-		}
-	},
-	selection_box = homedecor.nodebox.null,
-	groups = { snappy = 3, not_in_creative_inventory=1 }
-})