diff --git a/mods/ikea/light.lua b/mods/ikea/light.lua index 5217919..991df7f 100644 --- a/mods/ikea/light.lua +++ b/mods/ikea/light.lua @@ -8,14 +8,14 @@ local function toggle_light(pos, node, play_sound) end if is_off and is_open then - minetest.swap_node(pos, {name = node.name:sub(0, -5)}) + minetest.swap_node(pos, {name = node.name:sub(0, -5), param2 = node.param2}) if play_sound then minetest.sound_play({name = "ikea_light_toggle", pos = pos, max_hear_distance = 150, gain = sound_gain, pitch = 1.0}) end elseif not is_off and not is_open then - minetest.swap_node(pos, {name = node.name .. "_off"}) + minetest.swap_node(pos, {name = node.name .. "_off", param2 = node.param2}) if play_sound then minetest.sound_play({name = "ikea_light_toggle", pos = pos, max_hear_distance = 150, gain = sound_gain, pitch = 1.0}) diff --git a/mods/ikea_warehouse/models/ikea_warehouse_light.obj b/mods/ikea_warehouse/models/ikea_warehouse_light.obj index 7b68a4f..8cf7f97 100644 --- a/mods/ikea_warehouse/models/ikea_warehouse_light.obj +++ b/mods/ikea_warehouse/models/ikea_warehouse_light.obj @@ -1,247 +1,84 @@ -# Blender v2.80 (sub 75) OBJ File: 'ikea_warehouse_light.blend' +# Blender v2.81 (sub 16) OBJ File: 'ikea_warehouse_light.blend' # www.blender.org o Cube_Cube.001 -v -0.187500 -0.062500 1.500000 -v -0.187500 0.062500 1.500000 -v -0.187500 0.062500 -1.500000 -v -0.187500 -0.062500 -1.500000 -v 0.187500 0.062500 -1.500000 -v 0.187500 -0.062500 -1.500000 -v 0.187500 0.062500 1.500000 -v 0.187500 -0.062500 1.500000 -v 0.000000 -10.000000 -5.400910 -v 0.000000 -0.062500 -1.466443 -v 1.053665 -10.000000 -5.297133 -v 0.031869 -0.062500 -1.438265 -v 2.066839 -10.000000 -4.989790 -v 0.062514 -0.062500 -1.354817 -v 3.000585 -10.000000 -4.490693 -v 0.090756 -0.062500 -1.219303 -v 3.819020 -10.000000 -3.819020 -v 0.115510 -0.062500 -1.036932 -v 4.490693 -10.000000 -3.000585 -v 0.135825 -0.062500 -0.814712 -v 4.989790 -10.000000 -2.066839 -v 0.150921 -0.062500 -0.561183 -v 5.297133 -10.000000 -1.053666 -v 0.160217 -0.062500 -0.286089 -v 5.400910 -10.000000 -0.000000 -v 0.163356 -0.062500 -0.000000 -v 5.297133 -10.000000 1.053665 -v 0.160217 -0.062500 0.286089 -v 4.989791 -10.000000 2.066838 -v 0.150921 -0.062500 0.561183 -v 4.490693 -10.000000 3.000585 -v 0.135825 -0.062500 0.814712 -v 3.819020 -10.000000 3.819021 -v 0.115510 -0.062500 1.036932 -v 3.000585 -10.000000 4.490693 -v 0.090756 -0.062500 1.219303 -v 2.066838 -10.000000 4.989791 -v 0.062514 -0.062500 1.354817 -v 1.053664 -10.000000 5.297134 -v 0.031869 -0.062500 1.438266 -v -0.000002 -10.000000 5.400910 -v -0.000000 -0.062500 1.466443 -v -1.053668 -10.000000 5.297133 -v -0.031869 -0.062500 1.438265 -v -2.066841 -10.000000 4.989789 -v -0.062514 -0.062500 1.354816 -v -3.000587 -10.000000 4.490691 -v -0.090756 -0.062500 1.219302 -v -3.819023 -10.000000 3.819018 -v -0.115510 -0.062500 1.036931 -v -4.490695 -10.000000 3.000582 -v -0.135825 -0.062500 0.814711 -v -4.989792 -10.000000 2.066835 -v -0.150921 -0.062500 0.561182 -v -5.297134 -10.000000 1.053661 -v -0.160217 -0.062500 0.286088 -v -5.400910 -10.000000 -0.000005 -v -0.163356 -0.062500 -0.000001 -v -5.297132 -10.000000 -1.053671 -v -0.160217 -0.062500 -0.286090 -v -4.989788 -10.000000 -2.066844 -v -0.150921 -0.062500 -0.561185 -v -4.490689 -10.000000 -3.000590 -v -0.135825 -0.062500 -0.814714 -v -3.819016 -10.000000 -3.819025 -v -0.115510 -0.062500 -1.036933 -v -3.000579 -10.000000 -4.490697 -v -0.090755 -0.062500 -1.219304 -v -2.066832 -10.000000 -4.989793 -v -0.062513 -0.062500 -1.354817 -v -1.053657 -10.000000 -5.297135 -v -0.031869 -0.062500 -1.438266 -v 0.031250 1000.048035 -1.343750 -v 0.031250 0.062500 -1.343750 -v 0.031250 1000.048035 -1.281250 -v 0.031250 0.062500 -1.281250 -v -0.031250 1000.048035 -1.343750 -v -0.031250 0.062500 -1.343750 -v -0.031250 1000.048035 -1.281250 -v -0.031250 0.062500 -1.281250 -v 0.031250 1000.048035 1.281250 -v 0.031250 0.062500 1.281250 -v 0.031250 1000.048035 1.343750 -v 0.031250 0.062500 1.343750 -v -0.031250 1000.048035 1.281250 -v -0.031250 0.062500 1.281250 -v -0.031250 1000.048035 1.343750 -v -0.031250 0.062500 1.343750 -vt 0.031250 0.961538 +v 0.187500 -0.500000 -1.500000 +v 0.187500 -0.375000 -1.500000 +v 0.187500 -0.375000 1.500000 +v 0.187500 -0.500000 1.500000 +v -0.187500 -0.375000 1.500000 +v -0.187500 -0.500000 1.500000 +v -0.187500 -0.375000 -1.500000 +v -0.187500 -0.500000 -1.500000 +v -0.031250 99.625000 1.343750 +v -0.031250 -0.375000 1.343750 +v -0.031250 99.625000 1.281250 +v -0.031250 -0.375000 1.281250 +v 0.031250 99.625000 1.343750 +v 0.031250 -0.375000 1.343750 +v 0.031250 99.625000 1.281250 +v 0.031250 -0.375000 1.281250 +v -0.031250 99.625000 -1.281250 +v -0.031250 -0.375000 -1.281250 +v -0.031250 99.625000 -1.343750 +v -0.031250 -0.375000 -1.343750 +v 0.031250 99.625000 -1.281250 +v 0.031250 -0.375000 -1.281250 +v 0.031250 99.625000 -1.343750 +v 0.031250 -0.375000 -1.343750 +vt 0.062500 0.961538 vt 0.000000 0.961538 vt 0.000000 0.038462 -vt 0.031250 0.038462 -vt 0.031250 0.000000 -vt 0.125000 0.000000 -vt 0.125000 0.038462 -vt 0.156250 0.038462 -vt 0.156250 0.961538 -vt 0.125000 0.961538 -vt 0.125000 1.000000 -vt 0.031250 1.000000 -vt 0.250000 0.961538 -vt 0.156250 0.961538 -vt 0.156250 0.038462 +vt 0.062500 0.038462 +vt 0.062500 0.000000 +vt 0.250000 0.000000 vt 0.250000 0.038462 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.984375 1.000000 -vt 0.984375 0.000000 -vt 0.968750 1.000000 -vt 0.968750 0.000000 -vt 0.953125 1.000000 -vt 0.953125 0.000000 -vt 0.937500 1.000000 -vt 0.937500 0.000000 -vt 0.921875 1.000000 -vt 0.921875 0.000000 -vt 0.906250 1.000000 -vt 0.906250 0.000000 -vt 0.890625 1.000000 -vt 0.890625 0.000000 -vt 0.875000 1.000000 -vt 0.875000 0.000000 -vt 0.859375 1.000000 -vt 0.859375 0.000000 -vt 0.843750 1.000000 -vt 0.843750 0.000000 -vt 0.828125 1.000000 -vt 0.828125 0.000000 -vt 0.812500 1.000000 -vt 0.812500 0.000000 -vt 0.796875 1.000000 -vt 0.796875 0.000000 -vt 0.781250 1.000000 -vt 0.781250 0.000000 -vt 0.765625 1.000000 -vt 0.765625 0.000000 -vt 0.750000 1.000000 -vt 0.750000 0.000000 -vt 0.734375 1.000000 -vt 0.734375 0.000000 -vt 0.718750 1.000000 -vt 0.718750 0.000000 -vt 0.703125 1.000000 -vt 0.703125 0.000000 -vt 0.687500 1.000000 -vt 0.687500 0.000000 -vt 0.671875 1.000000 -vt 0.671875 0.000000 -vt 0.656250 1.000000 -vt 0.656250 0.000000 -vt 0.640625 1.000000 -vt 0.640625 0.000000 -vt 0.625000 1.000000 -vt 0.625000 0.000000 -vt 0.609375 1.000000 -vt 0.609375 0.000000 -vt 0.593750 1.000000 -vt 0.593750 0.000000 -vt 0.578125 1.000000 -vt 0.578125 0.000000 -vt 0.562500 1.000000 -vt 0.562500 0.000000 -vt 0.546875 1.000000 -vt 0.546875 0.000000 -vt 0.531250 1.000000 +vt 0.312500 0.038462 +vt 0.312500 0.961538 +vt 0.250000 0.961538 +vt 0.250000 1.000000 +vt 0.062500 1.000000 +vt 0.500000 0.961538 +vt 0.312500 0.961538 +vt 0.312500 0.038462 +vt 0.500000 0.038462 vt 0.531250 0.000000 -vt 0.515625 1.000000 -vt 0.515625 0.000000 +vt 0.531250 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.531250 0.000000 +vt 0.531250 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.531250 0.000000 +vt 0.531250 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.531250 0.000000 +vt 0.531250 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.531250 0.000000 +vt 0.531250 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.531250 0.000000 +vt 0.531250 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.531250 0.000000 +vt 0.531250 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.531250 0.000000 +vt 0.531250 1.000000 vt 0.500000 1.000000 vt 0.500000 0.000000 -vt 0.265625 0.000000 -vt 0.265625 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.000000 -vt 0.265625 0.000000 -vt 0.265625 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.000000 -vt 0.265625 0.000000 -vt 0.265625 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.000000 -vt 0.265625 0.000000 -vt 0.265625 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.000000 -vt 0.265625 0.000000 -vt 0.265625 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.000000 -vt 0.265625 0.000000 -vt 0.265625 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.000000 -vt 0.265625 0.000000 -vt 0.265625 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.000000 -vt 0.265625 0.000000 -vt 0.265625 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.000000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 vn 1.0000 0.0000 0.0000 vn 0.0000 0.0000 1.0000 -vn 0.0000 -1.0000 -0.0000 -vn 0.0000 1.0000 0.0000 -vn 0.1122 0.3677 -0.9231 -vn 0.3248 0.3766 -0.8676 -vn 0.5066 0.3921 -0.7679 -vn 0.6487 0.4110 -0.6405 -vn 0.7519 0.4298 -0.5000 -vn 0.8213 0.4460 -0.3557 -vn 0.8634 0.4577 -0.2122 -vn 0.8832 0.4637 -0.0705 -vn 0.8832 0.4637 0.0705 -vn 0.8634 0.4577 0.2122 -vn 0.8213 0.4460 0.3557 -vn 0.7519 0.4298 0.5000 -vn 0.6487 0.4110 0.6405 -vn 0.5066 0.3921 0.7679 -vn 0.3248 0.3766 0.8676 -vn 0.1122 0.3677 0.9231 -vn -0.1122 0.3677 0.9231 -vn -0.3248 0.3766 0.8676 -vn -0.5066 0.3921 0.7679 -vn -0.6487 0.4110 0.6405 -vn -0.7519 0.4298 0.5000 -vn -0.8213 0.4460 0.3557 -vn -0.8634 0.4577 0.2122 -vn -0.8832 0.4637 0.0705 -vn -0.8832 0.4637 -0.0705 -vn -0.8634 0.4577 -0.2122 -vn -0.8213 0.4460 -0.3557 -vn -0.7519 0.4298 -0.5000 -vn -0.6487 0.4110 -0.6405 -vn -0.5066 0.3921 -0.7679 -vn -0.3248 0.3766 -0.8676 -vn -0.1122 0.3677 -0.9231 -g Cube_Cube.001_Cube_Cube.001_Material.001 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 -0.0000 s off f 1/1/1 2/2/1 3/3/1 4/4/1 f 4/4/2 3/5/2 5/6/2 6/7/2 @@ -249,43 +86,11 @@ f 6/7/3 5/8/3 7/9/3 8/10/3 f 8/10/4 7/11/4 2/12/4 1/1/4 f 4/4/5 6/7/5 8/10/5 1/1/5 f 5/13/6 3/14/6 2/15/6 7/16/6 -f 9/17/7 10/18/7 12/19/7 11/20/7 -f 11/20/8 12/19/8 14/21/8 13/22/8 -f 13/22/9 14/21/9 16/23/9 15/24/9 -f 15/24/10 16/23/10 18/25/10 17/26/10 -f 17/26/11 18/25/11 20/27/11 19/28/11 -f 19/28/12 20/27/12 22/29/12 21/30/12 -f 21/30/13 22/29/13 24/31/13 23/32/13 -f 23/32/14 24/31/14 26/33/14 25/34/14 -f 25/34/15 26/33/15 28/35/15 27/36/15 -f 27/36/16 28/35/16 30/37/16 29/38/16 -f 29/38/17 30/37/17 32/39/17 31/40/17 -f 31/40/18 32/39/18 34/41/18 33/42/18 -f 33/42/19 34/41/19 36/43/19 35/44/19 -f 35/44/20 36/43/20 38/45/20 37/46/20 -f 37/46/21 38/45/21 40/47/21 39/48/21 -f 39/48/22 40/47/22 42/49/22 41/50/22 -f 41/50/23 42/49/23 44/51/23 43/52/23 -f 43/52/24 44/51/24 46/53/24 45/54/24 -f 45/54/25 46/53/25 48/55/25 47/56/25 -f 47/56/26 48/55/26 50/57/26 49/58/26 -f 49/58/27 50/57/27 52/59/27 51/60/27 -f 51/60/28 52/59/28 54/61/28 53/62/28 -f 53/62/29 54/61/29 56/63/29 55/64/29 -f 55/64/30 56/63/30 58/65/30 57/66/30 -f 57/66/31 58/65/31 60/67/31 59/68/31 -f 59/68/32 60/67/32 62/69/32 61/70/32 -f 61/70/33 62/69/33 64/71/33 63/72/33 -f 63/72/34 64/71/34 66/73/34 65/74/34 -f 65/74/35 66/73/35 68/75/35 67/76/35 -f 67/76/36 68/75/36 70/77/36 69/78/36 -f 69/78/37 70/77/37 72/79/37 71/80/37 -f 71/80/38 72/79/38 10/81/38 9/82/38 -f 78/83/2 77/84/2 73/85/2 74/86/2 -f 80/87/1 79/88/1 77/89/1 78/90/1 -f 74/91/3 73/92/3 75/93/3 76/94/3 -f 76/95/4 75/96/4 79/97/4 80/98/4 -f 86/99/2 85/100/2 81/101/2 82/102/2 -f 88/103/1 87/104/1 85/105/1 86/106/1 -f 82/107/3 81/108/3 83/109/3 84/110/3 -f 84/111/4 83/112/4 87/113/4 88/114/4 +f 14/17/2 13/18/2 9/19/2 10/20/2 +f 16/21/1 15/22/1 13/23/1 14/24/1 +f 10/25/3 9/26/3 11/27/3 12/28/3 +f 12/29/4 11/30/4 15/31/4 16/32/4 +f 22/33/2 21/34/2 17/35/2 18/36/2 +f 24/37/1 23/38/1 21/39/1 22/40/1 +f 18/41/3 17/42/3 19/43/3 20/44/3 +f 20/45/4 19/46/4 23/47/4 24/48/4 diff --git a/mods/ikea_warehouse/models/ikea_warehouse_light_ray.obj b/mods/ikea_warehouse/models/ikea_warehouse_light_ray.obj new file mode 100644 index 0000000..5e59838 --- /dev/null +++ b/mods/ikea_warehouse/models/ikea_warehouse_light_ray.obj @@ -0,0 +1,288 @@ +# Blender v2.81 (sub 16) OBJ File: 'ikea_warehouse_light_ray.blend' +# www.blender.org +o Cube_Cube.000 +v -0.000000 -8.500000 4.320729 +v 0.000000 0.500000 1.466443 +v -0.842933 -8.500000 4.237707 +v -0.031869 0.500000 1.438265 +v -1.653471 -8.500000 3.991833 +v -0.062514 0.500000 1.354817 +v -2.400468 -8.500000 3.592555 +v -0.090756 0.500000 1.219303 +v -3.055216 -8.500000 3.055216 +v -0.115510 0.500000 1.036932 +v -3.592555 -8.500000 2.400468 +v -0.135825 0.500000 0.814712 +v -3.991833 -8.500000 1.653471 +v -0.150921 0.500000 0.561183 +v -4.237707 -8.500000 0.842933 +v -0.160217 0.500000 0.286089 +v -4.320728 -8.500000 0.000001 +v -0.163356 0.500000 0.000000 +v -4.237707 -8.500000 -0.842931 +v -0.160217 0.500000 -0.286089 +v -3.991833 -8.500000 -1.653470 +v -0.150921 0.500000 -0.561183 +v -3.592555 -8.500000 -2.400468 +v -0.135825 0.500000 -0.814712 +v -3.055216 -8.500000 -3.055216 +v -0.115510 0.500000 -1.036932 +v -2.400468 -8.500000 -3.592554 +v -0.090756 0.500000 -1.219303 +v -1.653471 -8.500000 -3.991833 +v -0.062514 0.500000 -1.354817 +v -0.842931 -8.500000 -4.237707 +v -0.031869 0.500000 -1.438266 +v 0.000001 -8.500000 -4.320728 +v 0.000000 0.500000 -1.466443 +v 0.842934 -8.500000 -4.237706 +v 0.031869 0.500000 -1.438265 +v 1.653473 -8.500000 -3.991831 +v 0.062514 0.500000 -1.354816 +v 2.400470 -8.500000 -3.592552 +v 0.090756 0.500000 -1.219302 +v 3.055218 -8.500000 -3.055214 +v 0.115510 0.500000 -1.036931 +v 3.592556 -8.500000 -2.400465 +v 0.135825 0.500000 -0.814711 +v 3.991833 -8.500000 -1.653468 +v 0.150921 0.500000 -0.561182 +v 4.237708 -8.500000 -0.842928 +v 0.160217 0.500000 -0.286088 +v 4.320728 -8.500000 0.000004 +v 0.163356 0.500000 0.000001 +v 4.237706 -8.500000 0.842937 +v 0.160217 0.500000 0.286090 +v 3.991830 -8.500000 1.653476 +v 0.150921 0.500000 0.561185 +v 3.592551 -8.500000 2.400473 +v 0.135825 0.500000 0.814714 +v 3.055212 -8.500000 3.055220 +v 0.115510 0.500000 1.036933 +v 2.400463 -8.500000 3.592558 +v 0.090755 0.500000 1.219304 +v 1.653465 -8.500000 3.991835 +v 0.062513 0.500000 1.354817 +v 0.842926 -8.500000 4.237708 +v 0.031869 0.500000 1.438266 +vt 0.499990 0.125010 +vt 0.250010 0.125010 +vt 0.250010 0.249990 +vt 0.499990 0.249990 +vt 0.249990 0.125010 +vt 0.000010 0.125010 +vt 0.000010 0.249990 +vt 0.249990 0.249990 +vt 0.499990 0.000010 +vt 0.250010 0.000010 +vt 0.250010 0.124990 +vt 0.499990 0.124990 +vt 0.249990 0.000010 +vt 0.000010 0.000010 +vt 0.000010 0.124990 +vt 0.249990 0.124990 +vt 0.999990 0.125010 +vt 0.750010 0.125010 +vt 0.750010 0.249990 +vt 0.999990 0.249990 +vt 0.749990 0.125010 +vt 0.500010 0.125010 +vt 0.500010 0.249990 +vt 0.749990 0.249990 +vt 0.999990 0.000010 +vt 0.750010 0.000010 +vt 0.750010 0.124990 +vt 0.999990 0.124990 +vt 0.749990 0.000010 +vt 0.500010 0.000010 +vt 0.500010 0.124990 +vt 0.749990 0.124990 +vt 0.499990 0.375010 +vt 0.250010 0.375010 +vt 0.250010 0.499990 +vt 0.499990 0.499990 +vt 0.249990 0.375010 +vt 0.000010 0.375010 +vt 0.000010 0.499990 +vt 0.249990 0.499990 +vt 0.499990 0.250010 +vt 0.250010 0.250010 +vt 0.250010 0.374990 +vt 0.499990 0.374990 +vt 0.249990 0.250010 +vt 0.000010 0.250010 +vt 0.000010 0.374990 +vt 0.249990 0.374990 +vt 0.999990 0.375010 +vt 0.750010 0.375010 +vt 0.750010 0.499990 +vt 0.999990 0.499990 +vt 0.749990 0.375010 +vt 0.500010 0.375010 +vt 0.500010 0.499990 +vt 0.749990 0.499990 +vt 0.999990 0.250010 +vt 0.750010 0.250010 +vt 0.750010 0.374990 +vt 0.999990 0.374990 +vt 0.749990 0.250010 +vt 0.500010 0.250010 +vt 0.500010 0.374990 +vt 0.749990 0.374990 +vt 0.499990 0.625010 +vt 0.250010 0.625010 +vt 0.250010 0.749990 +vt 0.499990 0.749990 +vt 0.249990 0.625010 +vt 0.000010 0.625010 +vt 0.000010 0.749990 +vt 0.249990 0.749990 +vt 0.499990 0.500010 +vt 0.250010 0.500010 +vt 0.250010 0.624990 +vt 0.499990 0.624990 +vt 0.249990 0.500010 +vt 0.000010 0.500010 +vt 0.000010 0.624990 +vt 0.249990 0.624990 +vt 0.999990 0.625010 +vt 0.750010 0.625010 +vt 0.750010 0.749990 +vt 0.999990 0.749990 +vt 0.749990 0.625010 +vt 0.500010 0.625010 +vt 0.500010 0.749990 +vt 0.749990 0.749990 +vt 0.999990 0.500010 +vt 0.750010 0.500010 +vt 0.750010 0.624990 +vt 0.999990 0.624990 +vt 0.749990 0.500010 +vt 0.500010 0.500010 +vt 0.500010 0.624990 +vt 0.749990 0.624990 +vt 0.499990 0.875010 +vt 0.250010 0.875010 +vt 0.250010 0.999990 +vt 0.499990 0.999990 +vt 0.249990 0.875010 +vt 0.000010 0.875010 +vt 0.000010 0.999990 +vt 0.249990 0.999990 +vt 0.499990 0.750010 +vt 0.250010 0.750010 +vt 0.250010 0.874990 +vt 0.499990 0.874990 +vt 0.249990 0.750010 +vt 0.000010 0.750010 +vt 0.000010 0.874990 +vt 0.249990 0.874990 +vt 0.999990 0.875010 +vt 0.750010 0.875010 +vt 0.750010 0.999990 +vt 0.999990 0.999990 +vt 0.749990 0.875010 +vt 0.500010 0.875010 +vt 0.500010 0.999990 +vt 0.749990 0.999990 +vt 0.999990 0.750010 +vt 0.750010 0.750010 +vt 0.750010 0.874990 +vt 0.999990 0.874990 +vt 0.749990 0.750010 +vt 0.500010 0.750010 +vt 0.500010 0.874990 +vt 0.749990 0.874990 +vn -0.0000 0.3046 0.9525 +vn -0.2482 0.3106 0.9176 +vn -0.2368 0.3101 0.9208 +vn -0.4568 0.3260 0.8277 +vn -0.4465 0.3250 0.8337 +vn -0.6200 0.3467 0.7038 +vn -0.6137 0.3457 0.7099 +vn -0.7392 0.3687 0.5636 +vn -0.7358 0.3680 0.5685 +vn -0.8204 0.3888 0.4192 +vn -0.8189 0.3883 0.4226 +vn -0.8717 0.4045 0.2766 +vn -0.8712 0.4043 0.2786 +vn -0.8997 0.4144 0.1372 +vn -0.8996 0.4144 0.1381 +vn -0.9085 0.4178 -0.0000 +vn -0.8997 0.4144 -0.1372 +vn -0.8996 0.4144 -0.1381 +vn -0.8717 0.4045 -0.2766 +vn -0.8712 0.4043 -0.2786 +vn -0.8204 0.3888 -0.4192 +vn -0.8189 0.3883 -0.4226 +vn -0.7392 0.3687 -0.5636 +vn -0.7358 0.3680 -0.5685 +vn -0.6200 0.3467 -0.7038 +vn -0.6137 0.3457 -0.7099 +vn -0.4568 0.3260 -0.8277 +vn -0.4465 0.3250 -0.8337 +vn -0.2482 0.3106 -0.9176 +vn -0.2368 0.3101 -0.9208 +vn 0.0000 0.3046 -0.9525 +vn 0.2482 0.3106 -0.9176 +vn 0.2368 0.3101 -0.9208 +vn 0.4568 0.3260 -0.8277 +vn 0.4465 0.3250 -0.8337 +vn 0.6200 0.3467 -0.7038 +vn 0.6137 0.3457 -0.7099 +vn 0.7392 0.3687 -0.5636 +vn 0.7358 0.3680 -0.5685 +vn 0.8204 0.3888 -0.4192 +vn 0.8189 0.3883 -0.4226 +vn 0.8717 0.4045 -0.2766 +vn 0.8712 0.4043 -0.2786 +vn 0.8997 0.4144 -0.1372 +vn 0.8996 0.4144 -0.1381 +vn 0.9085 0.4178 0.0000 +vn 0.8997 0.4144 0.1372 +vn 0.8996 0.4144 0.1381 +vn 0.8717 0.4045 0.2766 +vn 0.8712 0.4043 0.2786 +vn 0.8204 0.3888 0.4192 +vn 0.8189 0.3883 0.4226 +vn 0.7392 0.3687 0.5636 +vn 0.7358 0.3680 0.5685 +vn 0.6200 0.3467 0.7038 +vn 0.6137 0.3457 0.7099 +vn 0.4568 0.3260 0.8277 +vn 0.4465 0.3250 0.8337 +vn 0.2482 0.3106 0.9176 +vn 0.2368 0.3101 0.9208 +s 1 +f 1/1/1 2/2/1 4/3/2 3/4/3 +f 3/5/3 4/6/2 6/7/4 5/8/5 +f 5/9/5 6/10/4 8/11/6 7/12/7 +f 7/13/7 8/14/6 10/15/8 9/16/9 +f 9/17/9 10/18/8 12/19/10 11/20/11 +f 11/21/11 12/22/10 14/23/12 13/24/13 +f 13/25/13 14/26/12 16/27/14 15/28/15 +f 15/29/15 16/30/14 18/31/16 17/32/16 +f 17/33/16 18/34/16 20/35/17 19/36/18 +f 19/37/18 20/38/17 22/39/19 21/40/20 +f 21/41/20 22/42/19 24/43/21 23/44/22 +f 23/45/22 24/46/21 26/47/23 25/48/24 +f 25/49/24 26/50/23 28/51/25 27/52/26 +f 27/53/26 28/54/25 30/55/27 29/56/28 +f 29/57/28 30/58/27 32/59/29 31/60/30 +f 31/61/30 32/62/29 34/63/31 33/64/31 +f 33/65/31 34/66/31 36/67/32 35/68/33 +f 35/69/33 36/70/32 38/71/34 37/72/35 +f 37/73/35 38/74/34 40/75/36 39/76/37 +f 39/77/37 40/78/36 42/79/38 41/80/39 +f 41/81/39 42/82/38 44/83/40 43/84/41 +f 43/85/41 44/86/40 46/87/42 45/88/43 +f 45/89/43 46/90/42 48/91/44 47/92/45 +f 47/93/45 48/94/44 50/95/46 49/96/46 +f 49/97/46 50/98/46 52/99/47 51/100/48 +f 51/101/48 52/102/47 54/103/49 53/104/50 +f 53/105/50 54/106/49 56/107/51 55/108/52 +f 55/109/52 56/110/51 58/111/53 57/112/54 +f 57/113/54 58/114/53 60/115/55 59/116/56 +f 59/117/56 60/118/55 62/119/57 61/120/58 +f 61/121/58 62/122/57 64/123/59 63/124/60 +f 63/125/60 64/126/59 2/127/1 1/128/1 diff --git a/mods/ikea_warehouse/models/src/ikea_warehouse_light.blend b/mods/ikea_warehouse/models/src/ikea_warehouse_light.blend index 74cbcb5..313fdfe 100644 Binary files a/mods/ikea_warehouse/models/src/ikea_warehouse_light.blend and b/mods/ikea_warehouse/models/src/ikea_warehouse_light.blend differ diff --git a/mods/ikea_warehouse/models/src/ikea_warehouse_light_ray.blend b/mods/ikea_warehouse/models/src/ikea_warehouse_light_ray.blend new file mode 100644 index 0000000..9a3be04 Binary files /dev/null and b/mods/ikea_warehouse/models/src/ikea_warehouse_light_ray.blend differ diff --git a/mods/ikea_warehouse/nodes.lua b/mods/ikea_warehouse/nodes.lua index 84d9507..907cf22 100644 --- a/mods/ikea_warehouse/nodes.lua +++ b/mods/ikea_warehouse/nodes.lua @@ -18,13 +18,22 @@ minetest.register_node(":warehouse:rack", { sunlight_propagates = true, }) -ikea.register_light("warehouse:light", { +ikea.register_light("warehouse:light_ray", { description = "Lights That Light The Warehouse", - mesh = "ikea_warehouse_light.obj", - tiles = {{name = "ikea_warehouse_light.png", backface_culling = true}}, + mesh = "ikea_warehouse_light_ray.obj", + tiles = {{name = "ikea_warehouse_light_ray.png", backface_culling = true}}, light_source = minetest.LIGHT_MAX, }) +minetest.register_node(":warehouse:light", { + description = "Lights That Light The Warehouse", + paramtype = "light", + paramtype2 = "facedir", + drawtype = "mesh", + mesh = "ikea_warehouse_light.obj", + tiles = {{name = "ikea_warehouse_light.png"}}, +}) + minetest.register_node(":warehouse:row_sign", { paramtype = "light", description = "Signs To \"Mark\" Each Row", diff --git a/mods/ikea_warehouse/schematics.lua b/mods/ikea_warehouse/schematics.lua index 2839120..28addb5 100644 --- a/mods/ikea_warehouse/schematics.lua +++ b/mods/ikea_warehouse/schematics.lua @@ -5,7 +5,9 @@ local floor_node = {name = "warehouse:floor"} local rack_node = {name = "warehouse:rack"} local air_node = {name = "air"} local rack_light_node = {name = "warehouse:light", param2 = 1} +local rack_ray_node = {name = "warehouse:light_ray", param2 = 1} local aisle_light_node = {name = "warehouse:light", param2 = 0} +local aisle_ray_node = {name = "warehouse:light_ray", param2 = 0} local row_sign_node = {name = "warehouse:row_sign"} local function place_racks(schem, x, z, num) @@ -35,12 +37,17 @@ schematic.fill_area(schems.rack, floor_node, {x = 0, y = 0, z = 0}, {x = 15, y = place_racks(schems.rack, 0, 1, 4) place_racks(schems.rack, 0, 9, 4) -local rack_light_index_1 = schematic.index(schems.rack, {x = 8, y = 9, z = 3}) -schems.rack.data[rack_light_index_1] = rack_light_node +local rack_light_index_1 = schematic.index(schems.rack, {x = 8, y = 10, z = 3}) +local rack_light_index_2 = schematic.index(schems.rack, {x = 8, y = 10, z = 12}) +local rack_ray_index_1 = schematic.index(schems.rack, {x = 8, y = 9, z = 3}) +local rack_ray_index_2 = schematic.index(schems.rack, {x = 8, y = 9, z = 12}) -local rack_light_index_2 = schematic.index(schems.rack, {x = 8, y = 9, z = 12}) +schems.rack.data[rack_light_index_1] = rack_light_node schems.rack.data[rack_light_index_2] = rack_light_node +schems.rack.data[rack_ray_index_1] = rack_ray_node +schems.rack.data[rack_ray_index_2] = rack_ray_node + -- Aisle Schematic schems.aisle = schematic.new({x = 16, y = 16, z = 16}, air_node) schematic.fill_area(schems.aisle, floor_node, {x = 0, y = 0, z = 0}, {x = 15, y = 0, z = 15}) @@ -48,9 +55,13 @@ place_row_signs(schems.aisle, {0, 1, 8, 9}) local aisle_light_index_1 = schematic.index(schems.aisle, {x = 2, y = 10, z = 8}) local aisle_light_index_2 = schematic.index(schems.aisle, {x = 13, y = 10, z = 8}) +local aisle_ray_index_1 = schematic.index(schems.aisle, {x = 2, y = 9, z = 8}) +local aisle_ray_index_2 = schematic.index(schems.aisle, {x = 13, y = 9, z = 8}) schems.aisle.data[aisle_light_index_1] = aisle_light_node schems.aisle.data[aisle_light_index_2] = aisle_light_node +schems.aisle.data[aisle_ray_index_1] = aisle_ray_node +schems.aisle.data[aisle_ray_index_2] = aisle_ray_node -- North Schematic schems.north = schematic.new({x = 16, y = 16, z = 16}, air_node) diff --git a/mods/ikea_warehouse/textures/ikea_warehouse_light.png b/mods/ikea_warehouse/textures/ikea_warehouse_light.png index 3bfdb81..2131ca6 100644 Binary files a/mods/ikea_warehouse/textures/ikea_warehouse_light.png and b/mods/ikea_warehouse/textures/ikea_warehouse_light.png differ diff --git a/mods/ikea_warehouse/textures/ikea_warehouse_light_ray.png b/mods/ikea_warehouse/textures/ikea_warehouse_light_ray.png new file mode 100644 index 0000000..cc2003d Binary files /dev/null and b/mods/ikea_warehouse/textures/ikea_warehouse_light_ray.png differ