From 09b09550bc8dbf098c1a1c5201069331022cdbb2 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 17 May 2015 17:17:19 -0400 Subject: [PATCH] better model for steel bottle, revised its texture, renamed related models and textures to better-conform to naming conventions --- homedecor_3d_extras/init.lua | 14 +- ...dvesselbottle.obj => 3dvessels_bottle.obj} | 0 .../models/3dvessels_bottle_steel.obj | 180 ++++++++++++++++++ ...{3dvesseldrink.obj => 3dvessels_drink.obj} | 0 ...{3dvesselshelf.obj => 3dvessels_shelf.obj} | 0 ...lf_glass.png => 3dvessels_shelf_glass.png} | Bin .../textures/bottle_metal_bright.png | Bin 186 -> 200 bytes 7 files changed, 187 insertions(+), 7 deletions(-) rename homedecor_3d_extras/models/{3dvesselbottle.obj => 3dvessels_bottle.obj} (100%) create mode 100644 homedecor_3d_extras/models/3dvessels_bottle_steel.obj rename homedecor_3d_extras/models/{3dvesseldrink.obj => 3dvessels_drink.obj} (100%) rename homedecor_3d_extras/models/{3dvesselshelf.obj => 3dvessels_shelf.obj} (100%) rename homedecor_3d_extras/textures/{3dvesselshelf_glass.png => 3dvessels_shelf_glass.png} (100%) diff --git a/homedecor_3d_extras/init.lua b/homedecor_3d_extras/init.lua index eb1c994..0b18d92 100644 --- a/homedecor_3d_extras/init.lua +++ b/homedecor_3d_extras/init.lua @@ -17,11 +17,11 @@ if minetest.get_modpath("vessels") minetest.override_item("vessels:shelf", { drawtype = "mesh", - mesh = "3dvesselshelf.obj", + mesh = "3dvessels_shelf.obj", tiles = { "default_wood.png", "default_wood.png^3dbookshelf_inside_back.png", - "3dvesselshelf_glass.png", + "3dvessels_shelf_glass.png", }, paramtype = "light", paramtype2 = "facedir", @@ -35,8 +35,8 @@ if minetest.get_modpath("vessels") minetest.override_item("vessels:glass_bottle", { drawtype = "mesh", - mesh = "3dvesselbottle.obj", - tiles = {"3dvesselshelf_glass.png"}, + mesh = "3dvessels_bottle.obj", + tiles = {"3dvessels_shelf_glass.png"}, inventory_image = "3dvessels_glass_bottle_inv.png", wield_image = "3dvessels_glass_bottle_inv.png", use_texture_alpha = true, @@ -45,7 +45,7 @@ if minetest.get_modpath("vessels") minetest.override_item("vessels:steel_bottle", { drawtype = "mesh", - mesh = "3dvesselbottle.obj", + mesh = "3dvessels_bottle_steel.obj", tiles = {"bottle_metal_bright.png"}, inventory_image = "3dvessels_steel_bottle_inv.png", wield_image = "3dvessels_steel_bottle_inv.png", @@ -54,8 +54,8 @@ if minetest.get_modpath("vessels") minetest.override_item("vessels:drinking_glass", { drawtype = "mesh", - mesh = "3dvesseldrink.obj", - tiles = {"3dvesselshelf_glass.png"}, + mesh = "3dvessels_drink.obj", + tiles = {"3dvessels_shelf_glass.png"}, inventory_image = "3dvessels_drinking_glass_inv.png", wield_image = "3dvessels_drinking_glass_inv.png", use_texture_alpha = true, diff --git a/homedecor_3d_extras/models/3dvesselbottle.obj b/homedecor_3d_extras/models/3dvessels_bottle.obj similarity index 100% rename from homedecor_3d_extras/models/3dvesselbottle.obj rename to homedecor_3d_extras/models/3dvessels_bottle.obj diff --git a/homedecor_3d_extras/models/3dvessels_bottle_steel.obj b/homedecor_3d_extras/models/3dvessels_bottle_steel.obj new file mode 100644 index 0000000..a82ec17 --- /dev/null +++ b/homedecor_3d_extras/models/3dvessels_bottle_steel.obj @@ -0,0 +1,180 @@ +# Blender v2.73 (sub 0) OBJ File: '' +# www.blender.org +o glass_bottle +v 0.018918 -0.139846 0.044919 +v -0.018336 -0.139846 0.044919 +v -0.044678 -0.139846 0.018577 +v -0.044678 -0.139846 -0.018677 +v -0.018334 -0.139846 -0.045021 +v 0.018918 -0.139846 -0.045021 +v 0.045262 -0.139846 -0.018677 +v 0.045262 -0.139846 0.018577 +v 0.125195 -0.294604 -0.051788 +v 0.045233 -0.191432 -0.018665 +v 0.045233 -0.191432 0.018565 +v 0.125195 -0.294604 0.051685 +v 0.018906 -0.191432 0.044889 +v 0.052029 -0.294604 0.124852 +v 0.052029 -0.294604 -0.124954 +v 0.018906 -0.191432 -0.044992 +v -0.051445 -0.294604 -0.124954 +v -0.018321 -0.191432 -0.044992 +v -0.124611 -0.294604 -0.051788 +v -0.044648 -0.191432 -0.018665 +v -0.124611 -0.294604 0.051685 +v -0.044648 -0.191432 0.018565 +v -0.051445 -0.294604 0.124852 +v -0.018324 -0.191432 0.044889 +v 0.052035 -0.464327 0.124870 +v -0.051453 -0.464327 0.124870 +v -0.124629 -0.464327 0.051694 +v -0.124629 -0.464327 -0.051794 +v -0.051451 -0.464327 -0.124972 +v 0.052035 -0.464327 -0.124972 +v 0.125213 -0.464327 -0.051794 +v 0.125213 -0.464327 0.051694 +v 0.105041 -0.499996 -0.043439 +v 0.105041 -0.499996 0.043337 +v 0.043680 -0.499996 0.104698 +v 0.043680 -0.499996 -0.104800 +v -0.043096 -0.499996 -0.104800 +v -0.104457 -0.499996 -0.043439 +v -0.104457 -0.499996 0.043337 +v -0.043096 -0.499996 0.104698 +vt 0.750000 0.562500 +vt 0.750000 0.687500 +vt 0.625000 0.687500 +vt 0.625000 0.562500 +vt 0.500000 0.375000 +vt 0.500000 0.562500 +vt 0.375000 0.562500 +vt 0.375000 0.375000 +vt 0.250000 0.562500 +vt 0.250000 0.375000 +vt 0.625000 0.375000 +vt 0.750000 0.375000 +vt 0.875000 0.375000 +vt 0.875000 0.562500 +vt 1.000000 0.375000 +vt 1.000000 0.562500 +vt 0.125000 0.375000 +vt 0.125000 0.562500 +vt 0.000000 0.562500 +vt 0.000000 0.375000 +vt 0.250000 0.687500 +vt 0.375000 0.687500 +vt 1.000000 0.687500 +vt 0.875000 0.687500 +vt 0.500000 0.687500 +vt 0.125000 0.687500 +vt 0.000000 0.687500 +vt 0.875000 0.125000 +vt 1.000000 0.125000 +vt 0.625000 0.125000 +vt 0.750000 0.125000 +vt 0.375000 0.125000 +vt 0.500000 0.125000 +vt 0.250000 0.125000 +vt 0.125000 0.125000 +vt 0.000000 0.125000 +vt 0.500000 -0.000000 +vt 0.375000 -0.000000 +vt 0.250000 -0.000000 +vt 0.625000 -0.000000 +vt 0.750000 -0.000000 +vt 0.875000 -0.000000 +vt 1.000000 0.000000 +vt 0.125000 -0.000000 +vt 0.000000 0.000000 +vt 0.602303 0.167375 +vt 0.602303 0.082625 +vt 0.542375 0.022697 +vt 0.457625 0.022697 +vt 0.397698 0.082625 +vt 0.397698 0.167375 +vt 0.457625 0.227302 +vt 0.542375 0.227302 +vt 0.783956 0.889065 +vt 0.764065 0.908956 +vt 0.735935 0.908956 +vt 0.716044 0.889065 +vt 0.716044 0.860935 +vt 0.735935 0.841044 +vt 0.764065 0.841044 +vt 0.783956 0.860935 +vn -0.355200 0.371800 -0.857600 +vn -0.297200 0.630000 -0.717400 +vn 0.297200 0.630000 -0.717400 +vn 0.355200 0.371800 -0.857600 +vn 0.875900 0.317800 -0.362800 +vn 0.857600 0.371800 -0.355200 +vn 0.857600 0.371800 0.355200 +vn 0.875900 0.317800 0.362800 +vn 0.355200 0.371800 0.857600 +vn 0.362800 0.317800 0.875900 +vn 0.362800 0.317800 -0.875900 +vn -0.362800 0.317800 -0.875900 +vn -0.875900 0.317800 -0.362800 +vn -0.857600 0.371800 -0.355200 +vn -0.875900 0.317800 0.362800 +vn -0.857600 0.371800 0.355200 +vn -0.362800 0.317800 0.875900 +vn -0.355200 0.371800 0.857600 +vn 0.297200 0.630000 0.717500 +vn 0.717400 0.630000 0.297200 +vn -0.717500 0.630000 0.297200 +vn -0.717500 0.630000 -0.297200 +vn 0.717400 0.630000 -0.297200 +vn -0.297200 0.630000 0.717500 +vn -0.893200 -0.255300 -0.370000 +vn -0.893200 -0.255300 0.370000 +vn 0.370000 -0.255300 -0.893200 +vn -0.370000 -0.255300 -0.893200 +vn 0.893200 -0.255300 0.370000 +vn 0.893200 -0.255300 -0.370000 +vn 0.370000 -0.255300 0.893200 +vn -0.370000 -0.255300 0.893200 +vn 0.527200 -0.821200 -0.218400 +vn 0.527200 -0.821200 0.218400 +vn 0.218400 -0.821200 0.527200 +vn 0.218400 -0.821200 -0.527200 +vn -0.218400 -0.821200 -0.527200 +vn -0.527200 -0.821200 -0.218400 +vn -0.527200 -0.821200 0.218400 +vn -0.218400 -0.821200 0.527200 +g glass_bottle_glass_bottle_None +s 1 +f 18/1/1 5/2/2 6/3/3 16/4/4 +f 9/5/5 10/6/6 11/7/7 12/8/8 +f 12/8/8 11/7/7 13/9/9 14/10/10 +f 15/11/11 16/4/4 10/6/6 9/5/5 +f 17/12/12 18/1/1 16/4/4 15/11/11 +f 19/13/13 20/14/14 18/1/1 17/12/12 +f 21/15/15 22/16/16 20/14/14 19/13/13 +f 23/17/17 24/18/18 22/19/16 21/20/15 +f 14/10/10 13/9/9 24/18/18 23/17/17 +f 1/21/19 13/9/9 11/7/7 8/22/20 +f 22/16/16 3/23/21 4/24/22 20/14/14 +f 20/14/14 4/24/22 5/2/2 18/1/1 +f 10/6/6 7/25/23 8/22/20 11/7/7 +f 2/26/24 3/27/21 22/19/16 24/18/18 +f 13/9/9 1/21/19 2/26/24 24/18/18 +f 16/4/4 6/3/3 7/25/23 10/6/6 +f 21/15/15 19/13/13 28/28/25 27/29/26 +f 17/12/12 15/11/11 30/30/27 29/31/28 +f 9/5/5 12/8/8 32/32/29 31/33/30 +f 12/8/8 14/10/10 25/34/31 32/32/29 +f 14/10/10 23/17/17 26/35/32 25/34/31 +f 23/17/17 21/20/15 27/36/26 26/35/32 +f 19/13/13 17/12/12 29/31/28 28/28/25 +f 33/37/33 31/33/30 32/32/29 34/38/34 +f 34/38/34 32/32/29 25/34/31 35/39/35 +f 36/40/36 30/30/27 31/33/30 33/37/33 +f 37/41/37 29/31/28 30/30/27 36/40/36 +f 38/42/38 28/28/25 29/31/28 37/41/37 +f 39/43/39 27/29/26 28/28/25 38/42/38 +f 40/44/40 26/35/32 27/36/26 39/45/39 +f 35/39/35 25/34/31 26/35/32 40/44/40 +f 39/46/39 38/47/38 37/48/37 36/49/36 33/50/33 34/51/34 35/52/35 40/53/40 +f 3/54/21 2/55/24 1/56/19 8/57/20 7/58/23 6/59/3 5/60/2 4/61/22 +f 30/30/27 15/11/11 9/5/5 31/33/30 diff --git a/homedecor_3d_extras/models/3dvesseldrink.obj b/homedecor_3d_extras/models/3dvessels_drink.obj similarity index 100% rename from homedecor_3d_extras/models/3dvesseldrink.obj rename to homedecor_3d_extras/models/3dvessels_drink.obj diff --git a/homedecor_3d_extras/models/3dvesselshelf.obj b/homedecor_3d_extras/models/3dvessels_shelf.obj similarity index 100% rename from homedecor_3d_extras/models/3dvesselshelf.obj rename to homedecor_3d_extras/models/3dvessels_shelf.obj diff --git a/homedecor_3d_extras/textures/3dvesselshelf_glass.png b/homedecor_3d_extras/textures/3dvessels_shelf_glass.png similarity index 100% rename from homedecor_3d_extras/textures/3dvesselshelf_glass.png rename to homedecor_3d_extras/textures/3dvessels_shelf_glass.png diff --git a/homedecor_3d_extras/textures/bottle_metal_bright.png b/homedecor_3d_extras/textures/bottle_metal_bright.png index da12452035ac9b4b333f9e0d17791d9664beaa7c..c0d9c2e405f1d60004e6104d03ce99dfb405e80e 100644 GIT binary patch delta 172 zcmV;d08{_E0muQ6B!7=dL_t&-(@o96O+!Ht1ksw_wnQ%E9}*cDFn@P?d@w@P?VYOL z`Acij`ey`oRRBs=g&Z#;y5_c;PGnP{6wT;j{BR9er~5LK^>$#UPx8Y)ebongosu~N zzRMAWkdERnQzEE2LGfduMML^1!k;$@bjW6)+`yDVCm?z6-z5hVApQnr>O~Z9$OO=t a0zCm`Wm?8IyxIu>0000v9?M;EvR3N#