diff --git a/homedecor_3d_extras/init.lua b/homedecor_3d_extras/init.lua index 32b25f3f..eb1c9948 100644 --- a/homedecor_3d_extras/init.lua +++ b/homedecor_3d_extras/init.lua @@ -10,7 +10,11 @@ minetest.override_item("default:bookshelf", { paramtype2 = "facedir", }) -if minetest.get_modpath("vessels") and minetest.registered_nodes["vessels:shelf"] then +if minetest.get_modpath("vessels") + and minetest.registered_nodes["vessels:shelf"] + and minetest.registered_nodes["vessels:glass_bottle"] + and minetest.registered_nodes["vessels:drinking_glass"] then + minetest.override_item("vessels:shelf", { drawtype = "mesh", mesh = "3dvesselshelf.obj", @@ -19,9 +23,43 @@ if minetest.get_modpath("vessels") and minetest.registered_nodes["vessels:shelf" "default_wood.png^3dbookshelf_inside_back.png", "3dvesselshelf_glass.png", }, - use_texture_alpha = true, paramtype = "light", paramtype2 = "facedir", + use_texture_alpha = true + }) + + local sbox = { + type = "fixed", + fixed = { -0.15, -0.5, -0.15, 0.15, -0.1, 0.15 } + } + + minetest.override_item("vessels:glass_bottle", { + drawtype = "mesh", + mesh = "3dvesselbottle.obj", + tiles = {"3dvesselshelf_glass.png"}, + inventory_image = "3dvessels_glass_bottle_inv.png", + wield_image = "3dvessels_glass_bottle_inv.png", + use_texture_alpha = true, + selection_box = sbox + }) + + minetest.override_item("vessels:steel_bottle", { + drawtype = "mesh", + mesh = "3dvesselbottle.obj", + tiles = {"bottle_metal_bright.png"}, + inventory_image = "3dvessels_steel_bottle_inv.png", + wield_image = "3dvessels_steel_bottle_inv.png", + selection_box = sbox + }) + + minetest.override_item("vessels:drinking_glass", { + drawtype = "mesh", + mesh = "3dvesseldrink.obj", + tiles = {"3dvesselshelf_glass.png"}, + inventory_image = "3dvessels_drinking_glass_inv.png", + wield_image = "3dvessels_drinking_glass_inv.png", + use_texture_alpha = true, + selection_box = sbox }) end diff --git a/homedecor_3d_extras/models/3dvesselbottle.obj b/homedecor_3d_extras/models/3dvesselbottle.obj new file mode 100644 index 00000000..03e780ba --- /dev/null +++ b/homedecor_3d_extras/models/3dvesselbottle.obj @@ -0,0 +1,216 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib 3dvesselbottle.mtl +o glass_bottle +v 0.012054 -0.152742 0.028345 +v 0.010687 -0.139846 0.025046 +v -0.010104 -0.139846 0.025046 +v -0.011470 -0.152742 0.028345 +v -0.024805 -0.139846 0.010345 +v -0.028104 -0.152742 0.011711 +v -0.024805 -0.139846 -0.010446 +v -0.028104 -0.152742 -0.011813 +v -0.010103 -0.139846 -0.025148 +v -0.011470 -0.152742 -0.028447 +v 0.010687 -0.139846 -0.025148 +v 0.012054 -0.152742 -0.028447 +v 0.025389 -0.139846 -0.010446 +v 0.028688 -0.152742 -0.011813 +v 0.025389 -0.139846 0.010345 +v 0.028688 -0.152742 0.011711 +v 0.031611 -0.499996 0.075560 +v -0.031027 -0.499996 0.075560 +v -0.075319 -0.499996 0.031268 +v -0.075319 -0.499996 -0.031370 +v -0.031027 -0.499996 -0.075662 +v 0.031611 -0.499996 -0.075662 +v 0.075903 -0.499996 -0.031370 +v 0.075903 -0.499996 0.031268 +v 0.084304 -0.294604 -0.034850 +v 0.019356 -0.191432 -0.007947 +v 0.019356 -0.191432 0.007846 +v 0.084304 -0.294604 0.034748 +v 0.008188 -0.191432 0.019013 +v 0.035091 -0.294604 0.083961 +v 0.035091 -0.294604 -0.084063 +v 0.008188 -0.191432 -0.019115 +v -0.034507 -0.294604 -0.084063 +v -0.007604 -0.191432 -0.019115 +v -0.083720 -0.294604 -0.034850 +v -0.018772 -0.191432 -0.007947 +v -0.083720 -0.294604 0.034748 +v -0.018772 -0.191432 0.007846 +v -0.034507 -0.294604 0.083961 +v -0.007605 -0.191432 0.019013 +v 0.008188 -0.165639 0.019013 +v -0.007605 -0.165639 0.019013 +v -0.018772 -0.165639 0.007846 +v -0.018772 -0.165639 -0.007947 +v -0.007604 -0.165639 -0.019115 +v 0.008188 -0.165639 -0.019115 +v 0.019356 -0.165639 -0.007947 +v 0.019356 -0.165639 0.007846 +v 0.037642 -0.464327 0.090121 +v 0.039774 -0.371983 0.095268 +v -0.039190 -0.371983 0.095268 +v -0.037059 -0.464327 0.090121 +v -0.095027 -0.371983 0.039431 +v -0.089880 -0.464327 0.037300 +v -0.095027 -0.371983 -0.039533 +v -0.089880 -0.464327 -0.037401 +v -0.039190 -0.371983 -0.095370 +v -0.037058 -0.464327 -0.090223 +v 0.039774 -0.371983 -0.095370 +v 0.037642 -0.464327 -0.090223 +v 0.095611 -0.371983 -0.039533 +v 0.090464 -0.464327 -0.037401 +v 0.090464 -0.464327 0.037300 +v 0.095611 -0.371983 0.039431 +vt 0.250000 0.750000 +vt 0.250000 0.875000 +vt 0.125000 0.875000 +vt 0.125000 0.750000 +vt 0.000000 0.875000 +vt 0.000000 0.750000 +vt 1.000000 0.750000 +vt 1.000000 0.875000 +vt 0.875000 0.875000 +vt 0.875000 0.750000 +vt 0.750000 0.875000 +vt 0.750000 0.750000 +vt 0.625000 0.875000 +vt 0.625000 0.750000 +vt 0.500000 0.875000 +vt 0.500000 0.750000 +vt 0.375000 0.750000 +vt 0.375000 0.875000 +vt 0.500000 0.375000 +vt 0.500000 0.500000 +vt 0.375000 0.500000 +vt 0.375000 0.375000 +vt 0.250000 0.500000 +vt 0.250000 0.375000 +vt 0.625000 0.375000 +vt 0.625000 0.500000 +vt 0.750000 0.375000 +vt 0.750000 0.500000 +vt 0.875000 0.375000 +vt 0.875000 0.500000 +vt 1.000000 0.375000 +vt 1.000000 0.500000 +vt 0.125000 0.375000 +vt 0.125000 0.500000 +vt 0.000000 0.500000 +vt 0.000000 0.375000 +vt 0.250000 0.625000 +vt 0.125000 0.625000 +vt 0.000000 0.625000 +vt 1.000000 0.625000 +vt 0.875000 0.625000 +vt 0.750000 0.625000 +vt 0.625000 0.625000 +vt 0.500000 0.625000 +vt 0.375000 0.625000 +vt 0.250000 0.125000 +vt 0.250000 0.250000 +vt 0.125000 0.250000 +vt 0.125000 0.125000 +vt 0.000000 0.250000 +vt 0.000000 0.125000 +vt 1.000000 0.125000 +vt 1.000000 0.250000 +vt 0.875000 0.250000 +vt 0.875000 0.125000 +vt 0.750000 0.250000 +vt 0.750000 0.125000 +vt 0.625000 0.250000 +vt 0.625000 0.125000 +vt 0.500000 0.250000 +vt 0.500000 0.125000 +vt 0.375000 0.125000 +vt 0.375000 0.250000 +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.341044 0.514065 +vt 0.341044 0.485935 +vt 0.360935 0.466044 +vt 0.389065 0.466044 +vt 0.408956 0.485935 +vt 0.408956 0.514065 +vt 0.389065 0.533956 +vt 0.360935 0.533956 +vt 0.727303 0.457625 +vt 0.667375 0.397697 +vt 0.582625 0.397697 +vt 0.522698 0.457625 +vt 0.522698 0.542375 +vt 0.582625 0.602302 +vt 0.667375 0.602302 +vt 0.727303 0.542375 +usemtl None +s 1 +f 1/1 2/2 3/3 4/4 +f 4/4 3/3 5/5 6/6 +f 6/7 5/8 7/9 8/10 +f 8/10 7/9 9/11 10/12 +f 10/12 9/11 11/13 12/14 +f 12/14 11/13 13/15 14/16 +f 16/17 15/18 2/2 1/1 +f 14/16 13/15 15/18 16/17 +f 25/19 26/20 27/21 28/22 +f 28/22 27/21 29/23 30/24 +f 31/25 32/26 26/20 25/19 +f 33/27 34/28 32/26 31/25 +f 35/29 36/30 34/28 33/27 +f 37/31 38/32 36/30 35/29 +f 39/33 40/34 38/35 37/36 +f 30/24 29/23 40/34 39/33 +f 41/37 1/1 4/4 42/38 +f 42/38 4/4 6/6 43/39 +f 43/40 6/7 8/10 44/41 +f 44/41 8/10 10/12 45/42 +f 45/42 10/12 12/14 46/43 +f 46/43 12/14 14/16 47/44 +f 48/45 16/17 1/1 41/37 +f 26/20 47/44 48/45 27/21 +f 27/21 48/45 41/37 29/23 +f 32/26 46/43 47/44 26/20 +f 34/28 45/42 46/43 32/26 +f 36/30 44/41 45/42 34/28 +f 38/32 43/40 44/41 36/30 +f 40/34 42/38 43/39 38/35 +f 29/23 41/37 42/38 40/34 +f 49/46 50/47 51/48 52/49 +f 52/49 51/48 53/50 54/51 +f 54/52 53/53 55/54 56/55 +f 56/55 55/54 57/56 58/57 +f 58/57 57/56 59/58 60/59 +f 60/59 59/58 61/60 62/61 +f 63/62 64/63 50/47 49/46 +f 62/61 61/60 64/63 63/62 +f 47/44 14/16 16/17 48/45 +f 23/64 62/61 63/62 24/65 +f 24/65 63/62 49/46 17/66 +f 22/67 60/59 62/61 23/64 +f 21/68 58/57 60/59 22/67 +f 20/69 56/55 58/57 21/68 +f 19/70 54/52 56/55 20/69 +f 18/71 52/49 54/51 19/72 +f 50/47 30/24 39/33 51/48 +f 51/48 39/33 37/36 53/50 +f 53/53 37/31 35/29 55/54 +f 55/54 35/29 33/27 57/56 +f 57/56 33/27 31/25 59/58 +f 59/58 31/25 25/19 61/60 +f 64/63 28/22 30/24 50/47 +f 61/60 25/19 28/22 64/63 +f 17/66 49/46 52/49 18/71 +f 15/73 13/74 11/75 9/76 7/77 5/78 3/79 2/80 +f 20/81 21/82 22/83 23/84 24/85 17/86 18/87 19/88 diff --git a/homedecor_3d_extras/models/3dvesseldrink.obj b/homedecor_3d_extras/models/3dvesseldrink.obj new file mode 100644 index 00000000..f6cefac1 --- /dev/null +++ b/homedecor_3d_extras/models/3dvesseldrink.obj @@ -0,0 +1,204 @@ +# Blender v2.72 (sub 0) OBJ File: '' +# www.blender.org +mtllib 3dvesseldrink.mtl +o Torus.001 +v 0.027435 -0.500000 0.137430 +v -0.027433 -0.500000 0.137430 +v -0.078125 -0.500000 0.116433 +v -0.116923 -0.500000 0.077635 +v -0.137920 -0.500000 0.026944 +v -0.137920 -0.500000 -0.027925 +v -0.116923 -0.500000 -0.078617 +v -0.078125 -0.500000 -0.117415 +v -0.027433 -0.500000 -0.138412 +v 0.027435 -0.500000 -0.138412 +v 0.078127 -0.500000 -0.117415 +v 0.116925 -0.500000 -0.078617 +v 0.137922 -0.500000 -0.027925 +v 0.137922 -0.500000 0.026943 +v 0.116925 -0.500000 0.077635 +v 0.078127 -0.500000 0.116433 +v 0.078127 -0.125001 0.116433 +v 0.116925 -0.125001 0.077635 +v 0.102550 -0.125001 0.068030 +v 0.068522 -0.125001 0.102058 +v 0.078127 -0.125001 -0.117415 +v 0.027435 -0.125001 -0.138412 +v 0.024062 -0.125001 -0.121456 +v 0.068522 -0.125001 -0.103040 +v -0.137921 -0.125001 -0.027925 +v -0.137921 -0.125001 0.026944 +v -0.120964 -0.125001 0.023571 +v -0.120964 -0.125001 -0.024552 +v 0.027435 -0.125001 0.137430 +v 0.024062 -0.125001 0.120474 +v 0.116925 -0.125001 -0.078617 +v 0.102550 -0.125001 -0.069012 +v -0.116923 -0.125001 -0.078617 +v -0.102548 -0.125001 -0.069012 +v 0.137922 -0.125001 -0.027925 +v 0.120966 -0.125001 -0.024552 +v -0.078125 -0.125001 0.116433 +v -0.027433 -0.125001 0.137430 +v -0.024061 -0.125001 0.120474 +v -0.068520 -0.125001 0.102058 +v -0.078125 -0.125001 -0.117415 +v -0.068520 -0.125001 -0.103040 +v 0.137922 -0.125001 0.026943 +v 0.120966 -0.125001 0.023571 +v -0.116923 -0.125001 0.077635 +v -0.102548 -0.125001 0.068030 +v -0.027433 -0.125001 -0.138412 +v -0.024061 -0.125001 -0.121456 +v -0.102548 -0.487780 0.068030 +v -0.120964 -0.487780 0.023571 +v 0.102550 -0.487780 0.068030 +v 0.068522 -0.487780 0.102058 +v -0.024061 -0.487780 -0.121456 +v -0.068520 -0.487780 -0.103040 +v 0.068522 -0.487780 -0.103040 +v 0.102550 -0.487780 -0.069012 +v -0.102548 -0.487780 -0.069012 +v -0.068520 -0.487780 0.102058 +v 0.120966 -0.487780 0.023571 +v 0.024062 -0.487780 -0.121456 +v -0.120964 -0.487780 -0.024552 +v -0.024060 -0.487780 0.120474 +v 0.120966 -0.487780 -0.024552 +v 0.024062 -0.487780 0.120474 +vt 0.625000 0.906250 +vt 0.687500 0.906250 +vt 0.687500 0.937500 +vt 0.625000 0.937500 +vt 0.937500 0.906250 +vt 1.000000 0.906250 +vt 1.000000 0.937500 +vt 0.937500 0.937500 +vt 0.250000 0.906250 +vt 0.312500 0.906250 +vt 0.312500 0.937500 +vt 0.250000 0.937500 +vt 0.562500 0.906250 +vt 0.562500 0.937500 +vt 0.875000 0.906250 +vt 0.875000 0.937500 +vt 0.187500 0.906250 +vt 0.187500 0.937500 +vt 0.812500 0.906250 +vt 0.812500 0.937500 +vt 0.437500 0.906250 +vt 0.500000 0.906250 +vt 0.500000 0.937500 +vt 0.437500 0.937500 +vt 0.125000 0.906250 +vt 0.125000 0.937500 +vt 0.750000 0.906250 +vt 0.750000 0.937500 +vt 0.375000 0.906250 +vt 0.375000 0.937500 +vt 0.062500 0.906250 +vt 0.062500 0.937500 +vt -0.000000 0.906250 +vt -0.000000 0.937500 +vt 0.375000 1.000000 +vt 0.312500 1.000000 +vt 0.125000 0.406250 +vt 0.187500 0.406250 +vt 0.687500 1.000000 +vt 0.625000 1.000000 +vt 0.937500 0.406250 +vt 1.000000 0.406250 +vt 0.062500 1.000000 +vt 0.125000 1.000000 +vt 0.375000 0.406250 +vt 0.437500 0.406250 +vt 0.687500 0.406250 +vt 0.750000 0.406250 +vt 0.937500 1.000000 +vt 0.875000 1.000000 +vt 0.250000 0.406250 +vt 0.187500 1.000000 +vt 0.500000 0.406250 +vt 0.812500 0.406250 +vt 0.437500 1.000000 +vt 0.750000 1.000000 +vt 0.562500 0.406250 +vt -0.000000 0.406250 +vt 0.062500 0.406250 +vt 1.000000 1.000000 +vt 0.312500 0.406250 +vt 0.625000 0.406250 +vt 0.250000 1.000000 +vt 0.875000 0.406250 +vt 0.500000 1.000000 +vt 0.812500 1.000000 +vt 0.562500 1.000000 +vt -0.000000 1.000000 +vt 0.681251 0.549764 +vt 0.681251 0.621226 +vt 0.653904 0.687248 +vt 0.603372 0.737779 +vt 0.537350 0.765126 +vt 0.465889 0.765126 +vt 0.399867 0.737779 +vt 0.349335 0.687248 +vt 0.321988 0.621226 +vt 0.321988 0.549764 +vt 0.349335 0.483742 +vt 0.399867 0.433211 +vt 0.465889 0.405864 +vt 0.537350 0.405864 +vt 0.603372 0.433211 +vt 0.653903 0.483742 +usemtl None +s 1 +f 17/1 18/2 19/3 20/4 +f 21/5 22/6 23/7 24/8 +f 25/9 26/10 27/11 28/12 +f 29/13 17/1 20/4 30/14 +f 31/15 21/5 24/8 32/16 +f 33/17 25/9 28/12 34/18 +f 35/19 31/15 32/16 36/20 +f 37/21 38/22 39/23 40/24 +f 41/25 33/17 34/18 42/26 +f 43/27 35/19 36/20 44/28 +f 45/29 37/21 40/24 46/30 +f 47/31 41/25 42/26 48/32 +f 18/2 43/27 44/28 19/3 +f 22/33 47/31 48/32 23/34 +f 38/22 29/13 30/14 39/23 +f 49/35 50/36 27/11 46/30 +f 8/37 7/38 33/17 41/25 +f 51/39 52/40 20/4 19/3 +f 11/41 10/42 22/6 21/5 +f 53/43 48/32 42/26 54/44 +f 4/45 3/46 37/21 45/29 +f 15/47 14/48 43/27 18/2 +f 55/49 56/50 32/16 24/8 +f 7/38 6/51 25/9 33/17 +f 57/52 54/44 42/26 34/18 +f 3/46 2/53 38/22 37/21 +f 14/48 13/54 35/19 43/27 +f 58/55 49/35 46/30 40/24 +f 59/56 51/39 19/3 44/28 +f 2/53 1/57 29/13 38/22 +f 10/58 9/59 47/31 22/33 +f 60/60 55/49 24/8 23/7 +f 6/51 5/61 26/10 25/9 +f 1/57 16/62 17/1 29/13 +f 61/63 57/52 34/18 28/12 +f 13/54 12/64 31/15 35/19 +f 62/65 58/55 40/24 39/23 +f 63/66 59/56 44/28 36/20 +f 9/59 8/37 41/25 47/31 +f 64/67 62/65 39/23 30/14 +f 53/43 60/68 23/34 48/32 +f 5/61 4/45 45/29 26/10 +f 16/62 15/47 18/2 17/1 +f 50/36 61/63 28/12 27/11 +f 52/40 64/67 30/14 20/4 +f 12/64 11/41 21/5 31/15 +f 56/50 63/66 36/20 32/16 +f 26/10 45/29 46/30 27/11 +f 49/55 58/65 62/67 64/40 52/39 51/56 59/66 63/50 56/49 55/60 60/43 53/44 54/52 57/63 61/36 50/35 +f 5/69 6/70 7/71 8/72 9/73 10/74 11/75 12/76 13/77 14/78 15/79 16/80 1/81 2/82 3/83 4/84 diff --git a/homedecor_3d_extras/textures/3dvessels_drinking_glass_inv.png b/homedecor_3d_extras/textures/3dvessels_drinking_glass_inv.png new file mode 100644 index 00000000..ebbd6d05 Binary files /dev/null and b/homedecor_3d_extras/textures/3dvessels_drinking_glass_inv.png differ diff --git a/homedecor_3d_extras/textures/3dvessels_glass_bottle_inv.png b/homedecor_3d_extras/textures/3dvessels_glass_bottle_inv.png new file mode 100644 index 00000000..abfad425 Binary files /dev/null and b/homedecor_3d_extras/textures/3dvessels_glass_bottle_inv.png differ diff --git a/homedecor_3d_extras/textures/3dvessels_steel_bottle_inv.png b/homedecor_3d_extras/textures/3dvessels_steel_bottle_inv.png new file mode 100644 index 00000000..d385f445 Binary files /dev/null and b/homedecor_3d_extras/textures/3dvessels_steel_bottle_inv.png differ diff --git a/homedecor_3d_extras/textures/bottle_metal_bright.png b/homedecor_3d_extras/textures/bottle_metal_bright.png new file mode 100644 index 00000000..da124520 Binary files /dev/null and b/homedecor_3d_extras/textures/bottle_metal_bright.png differ