From a75c55cfc3ebe665e28c22f3d579c35660f7244f Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 26 Apr 2015 22:07:22 -0400 Subject: [PATCH] join desk model's objects into one --- homedecor/models/homedecor_desk.obj | 202 +++++++++++----------------- homedecor/tables.lua | 2 +- 2 files changed, 82 insertions(+), 122 deletions(-) diff --git a/homedecor/models/homedecor_desk.obj b/homedecor/models/homedecor_desk.obj index 8a0c77e0..19d74e04 100644 --- a/homedecor/models/homedecor_desk.obj +++ b/homedecor/models/homedecor_desk.obj @@ -1,6 +1,6 @@ # Blender v2.73 (sub 0) OBJ File: 'desk.blend' # www.blender.org -o drawers_Cube.003 +o main-parts-wood_Cube.001 v -0.312500 0.000000 -0.437500 v -0.312500 0.000000 -0.500000 v 0.437500 0.000000 -0.500000 @@ -17,46 +17,6 @@ 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 @@ -73,48 +33,6 @@ 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 @@ -237,6 +155,26 @@ vt 0.875000 0.875000 vt 0.812500 0.875000 vt 0.812500 0.500000 vt 0.875000 0.937500 +vt 0.812500 1.000000 +vt 0.812500 0.937500 +vt 0.812500 0.000000 +vt 0.750000 0.937500 +vt 0.750000 0.875000 +vt 1.000000 0.875000 +vt 0.750000 0.750000 +vt 0.000000 0.562500 +vt 0.750000 0.562500 +vt 0.750000 0.312500 +vt 0.000000 0.312500 +vt 0.750000 0.125000 +vt 0.750000 0.625000 +vt 1.000000 0.562500 +vt 1.000000 0.625000 +vt 0.750000 0.000000 +vt 0.750000 0.062500 +vt 0.750000 0.500000 +vt 1.000000 0.500000 +vt 0.750000 1.000000 vn -1.000000 0.000000 0.000000 vn 1.000000 0.000000 0.000000 vn 0.000000 0.000000 1.000000 @@ -245,41 +183,63 @@ 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 +f 37/1/1 38/2/1 34/3/1 33/4/1 +f 39/5/2 40/6/2 36/7/2 35/8/2 +f 40/5/3 37/9/3 33/10/3 36/8/3 +f 33/11/4 34/10/4 35/8/4 36/1/4 +f 62/8/5 61/1/5 47/12/5 46/13/5 +f 60/1/6 47/12/6 43/14/6 58/5/6 +f 62/1/3 46/12/3 42/14/3 40/5/3 +f 57/12/4 58/13/4 43/8/4 42/1/4 +f 74/15/6 55/16/6 54/17/6 70/18/6 +f 76/19/3 51/16/3 50/17/3 72/20/3 +f 59/21/1 60/12/1 58/14/1 57/22/1 +f 69/2/4 70/6/4 54/5/4 50/1/4 +f 76/9/5 75/11/5 55/12/5 51/14/5 +f 46/8/5 47/1/5 60/12/5 59/13/5 +f 67/22/2 68/14/2 66/13/2 65/23/2 +f 63/12/4 64/13/4 65/7/4 66/2/4 +f 55/24/6 75/25/6 71/26/6 54/27/6 +f 51/24/3 73/28/3 69/29/3 50/27/3 +f 50/12/4 54/14/4 71/9/4 72/11/4 +f 51/5/5 55/1/5 74/2/5 73/6/5 +f 82/30/6 83/31/6 79/32/6 78/33/6 +f 84/34/3 81/35/3 77/36/3 80/37/3 +f 77/38/4 78/39/4 79/40/4 80/41/4 +f 84/42/5 83/43/5 82/44/5 81/45/5 +f 91/46/6 35/13/6 34/47/6 87/48/6 +f 92/49/6 88/50/6 85/51/6 89/52/6 +f 48/53/6 90/54/6 89/52/6 44/55/6 +f 56/56/6 92/49/6 91/46/6 52/3/6 +f 88/50/6 53/57/6 49/58/6 87/48/6 +f 86/59/6 45/60/6 41/61/6 85/51/6 +f 47/1/6 61/12/6 39/14/6 43/5/6 +f 61/1/2 62/2/2 40/6/2 39/5/2 +f 46/1/3 59/12/3 57/14/3 42/5/3 +f 42/12/4 43/13/4 39/8/4 40/1/4 +f 57/22/1 58/14/1 64/13/1 63/23/1 +f 58/5/6 67/22/6 65/23/6 64/8/6 +f 68/6/3 57/14/3 63/13/3 66/7/3 +f 90/54/6 86/59/6 38/62/6 39/14/6 +g main-parts-wood_Cube.001_drawers +f 5/59/1 6/60/1 2/61/1 1/51/1 +f 6/60/6 7/53/6 3/55/6 2/61/6 +f 7/53/2 8/54/2 4/52/2 3/55/2 +f 1/6/4 2/2/4 3/63/4 4/64/4 +f 8/60/5 7/64/5 6/6/5 5/53/5 +f 13/50/1 14/57/1 10/58/1 9/48/1 +f 14/57/6 15/56/6 11/3/6 10/58/6 +f 15/56/2 16/49/2 12/46/2 11/3/2 +f 9/7/4 10/3/4 11/58/4 12/65/4 +f 16/57/5 15/61/5 14/55/5 13/56/5 +g main-parts-wood_Cube.001_metal +f 32/66/3 29/67/3 25/68/3 28/5/3 +f 31/69/2 32/16/2 28/70/2 27/71/2 +f 29/72/1 30/73/1 26/17/1 25/74/1 +f 30/75/6 31/71/6 27/76/6 26/77/6 +f 24/13/4 23/78/4 22/79/4 21/46/4 +f 19/71/6 18/80/6 22/81/6 23/76/6 +f 20/71/1 19/70/1 23/73/1 24/72/1 +f 18/82/2 17/12/2 21/16/2 22/69/2 +f 17/82/3 20/66/3 24/5/3 21/1/3 +f 25/74/4 26/17/4 27/46/4 28/79/4 diff --git a/homedecor/tables.lua b/homedecor/tables.lua index 863fcc74..ca0986b1 100644 --- a/homedecor/tables.lua +++ b/homedecor/tables.lua @@ -201,9 +201,9 @@ homedecor.register("desk", { description = "Desk", mesh = "homedecor_desk.obj", tiles = { + "forniture_wood.png", "homedecor_desk_drawers.png", "forniture_black_metal.png", - "forniture_wood.png" }, inventory_image = "homedecor_desk_inv.png", selection_box = desk_cbox,