Merge pull request #13 from NathanSalapat/master

fixed colision boxes, added lit columns
master
Nathan Salapat 2015-05-27 18:52:31 -05:00
commit dc455baea4
2 changed files with 286 additions and 7 deletions

View File

@ -1,16 +1,16 @@
local colbox_type1 = { --column
type = "fixed",
fixed = {{-.5, -.5, -.5, .5, .5, .5},}
fixed = {{.1, -.5, .1, .5, 0, .5},} -- Right, Bottom, Back, Left, Top, Front
}
local colbox_type2 = { --wall
type = "fixed",
fixed = {{-.5, -.5, -.3, .5, .5, .5},}
fixed = {{-.5, -.5, .4, .5, 0, .2},}
}
local block_type1 = { -- desc2, obj, colbox, grup
{"Deco Wall Round Top", "wall_r", colbox_type1, {cracky=2,not_in_creative_inventory=visible}},
{"Deco Wall Flat Top", "wall_f", colbox_type1, {cracky=2,not_in_creative_inventory=visible}},
{"Deco Wall Column", "column", colbox_type2, {cracky=2,not_in_creative_inventory=visible}},
{"Deco Wall Round Top", "wall_r", colbox_type2, {cracky=2,not_in_creative_inventory=visible}},
{"Deco Wall Flat Top", "wall_f", colbox_type2, {cracky=2,not_in_creative_inventory=visible}},
{"Deco Wall Column", "column", colbox_type1, {cracky=2,not_in_creative_inventory=visible}},
}
for i in ipairs (block_type1) do
local desc2 = block_type1[i][1]
@ -54,7 +54,29 @@ minetest.register_node('mylandscaping:deco_'..obj..'_'..col, {
sounds = default.node_sound_stone_defaults(),
})
minetest.register_node('mylandscaping:deco_column_light_'..col, {
description = coldesc..'lighted column',
drawtype = 'mesh',
mesh = 'mylandscaping_deco_column_l.obj',
tiles = {
{name='mylandscaping_block_split.png'..alpha},
{name='mylandscaping_block_smooth.png'..alpha},
{name='mylandscaping_block_smooth.png^[colorize:yellow:255'},
{name='mylandscaping_block_smooth.png^[colorize:#190B07:200'}},
groups = grup,
paramtype = 'light',
paramtype2 = 'facedir',
light_source = LIGHT_MAX,
selection_box = colbox_type1,
collision_box = colbox_type1,
sounds = default.node_sound_stone_defaults(),
})
minetest.register_craft({
type = 'shapeless',
output = 'mylandscaping:deco_column_light_'..col,
recipe = {'default:torch', 'mylandscaping:deco_column_'..col}
})
end
end

View File

@ -0,0 +1,257 @@
# Blender v2.74 (sub 5) OBJ File: 'Walls.blend'
# www.blender.org
o Deco_column.001_Cube.036
v -0.100000 -0.500000 0.100000
v -0.100000 -0.100000 0.100000
v -0.100000 -0.500000 0.500000
v -0.100000 -0.100000 0.500000
v -0.500000 -0.500000 0.100000
v -0.500000 -0.100000 0.100000
v -0.500000 -0.500000 0.500000
v -0.500000 -0.100000 0.500000
v -0.180000 -0.050000 0.180000
v -0.180000 -0.050000 0.420000
v -0.420000 -0.050000 0.420000
v -0.420000 -0.050000 0.180000
v -0.180000 0.142211 0.180000
v -0.180000 0.142211 0.420000
v -0.420000 0.142211 0.420000
v -0.420000 0.142211 0.180000
v -0.300000 0.177296 0.300000
v -0.396000 -0.023301 0.180000
v -0.204000 -0.023301 0.180000
v -0.396000 0.115512 0.180000
v -0.204000 0.115512 0.180000
v -0.180000 -0.023301 0.204000
v -0.180000 -0.023301 0.396000
v -0.180000 0.115512 0.204000
v -0.180000 0.115512 0.396000
v -0.420000 -0.023301 0.396000
v -0.420000 -0.023301 0.204000
v -0.420000 0.115512 0.396000
v -0.420000 0.115512 0.204000
v -0.204000 -0.023301 0.420000
v -0.396000 -0.023301 0.420000
v -0.204000 0.115512 0.420000
v -0.396000 0.115512 0.420000
v -0.202000 -0.023301 0.398000
v -0.398000 -0.023301 0.398000
v -0.202000 0.115512 0.398000
v -0.398000 0.115512 0.398000
v -0.202000 -0.023301 0.202000
v -0.202000 0.115512 0.202000
v -0.398000 -0.023301 0.202000
v -0.398000 0.115512 0.202000
v -0.350000 -0.022745 0.300000
v -0.343741 0.067255 0.300000
v -0.325000 -0.022745 0.256699
v -0.321870 0.067255 0.262119
v -0.275000 -0.022745 0.256699
v -0.278130 0.067255 0.262119
v -0.250000 -0.022745 0.300000
v -0.256259 0.067255 0.300000
v -0.275000 -0.022745 0.343301
v -0.278130 0.067255 0.337880
v -0.325000 -0.022745 0.343301
v -0.321870 0.067255 0.337881
v -0.300000 0.078956 0.300000
v -0.275000 0.041784 0.343301
v -0.250000 0.041784 0.300000
v -0.275000 0.041784 0.256699
v -0.325000 0.041784 0.256699
v -0.350000 0.041784 0.300000
v -0.325000 0.041784 0.343301
vt 0.850960 0.849202
vt 0.146966 0.849202
vt 0.303069 0.691939
vt 0.692022 0.691939
vt 0.848123 0.145482
vt 0.692022 0.302744
vt 0.144133 0.145482
vt 0.303069 0.302744
vt 0.490835 0.490836
vt 0.000000 0.490836
vt 0.000000 0.000000
vt 0.490835 0.000000
vt 1.000000 1.000000
vt 0.507353 1.000000
vt 0.507353 0.507353
vt 1.000000 0.507353
vt 0.014706 1.000000
vt 0.014706 0.507353
vt 0.981671 0.490836
vt 0.981671 0.000000
vt 0.984819 0.985446
vt 0.418207 0.985446
vt 0.418207 0.418835
vt 0.984819 0.418835
vt 0.543161 0.438946
vt 0.518385 0.468486
vt 0.476558 0.466859
vt 0.463363 0.430633
vt 0.454236 0.502269
vt 0.416265 0.495583
vt 0.473741 0.539306
vt 0.448965 0.568846
vt 0.515568 0.540933
vt 0.528762 0.577159
vt 0.838917 0.134661
vt 0.347723 0.022358
vt 0.575860 0.512209
vt 0.537890 0.505523
vt 0.004869 0.391593
vt 0.153209 0.873131
vt 0.644402 0.985434
vt 0.987256 0.616200
vt 0.496063 0.503896
vt 0.233973 0.522750
vt 0.372193 0.687492
vt 0.368946 0.693948
vt 0.214528 0.522493
vt 0.184253 0.999891
vt 0.000449 0.676383
vt 0.008346 0.682882
vt 0.173144 0.958829
vt 0.144940 0.516369
vt 0.141443 0.482052
vt 0.161372 0.483610
vt 0.164586 0.519119
vt 0.187873 0.000109
vt 0.372191 0.320478
vt 0.364662 0.314199
vt 0.199128 0.041206
vt 0.099516 0.912710
vt 0.099516 0.033705
vt 0.539018 0.473207
vt 0.978521 0.033705
vt 0.978521 0.912710
vt 0.206569 0.482505
vt 0.210661 0.519521
vt 0.192553 0.520015
vt 0.187802 0.482682
vt 0.229360 0.482820
vt 0.210258 0.479387
vt 0.372808 0.317940
vt 0.187838 0.965335
vt 0.364126 0.690922
vt 0.000109 0.679533
vt 0.000859 0.308908
vt 0.003823 0.300070
vt 0.009045 0.305194
vt 0.184448 0.034605
vt 0.193403 0.048074
vt 0.009536 0.286270
vt 0.005176 0.697428
vt 0.178944 0.951880
vt 0.364087 0.709723
vt 0.368036 0.299942
vt 0.168376 0.515660
vt 0.165203 0.487020
vt 0.182564 0.488155
vt 0.187599 0.514423
vn 0.000000 0.848000 0.530000
vn -0.530000 0.848000 0.000000
vn 0.530000 0.848000 0.000000
vn 0.000000 0.848000 -0.530000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.000000 1.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 1.000000 0.000000
vn -0.847100 0.208200 -0.489000
vn 0.000000 0.208200 -0.978100
vn 0.847100 0.208200 -0.489000
vn 0.847100 0.208200 0.489000
vn -0.866000 0.000000 -0.500000
vn -0.847100 0.208200 0.489000
vn 0.000000 0.208200 0.978100
vn 0.866000 0.000000 -0.500000
vn 0.866000 0.000000 0.500000
vn -0.866000 0.000000 0.500000
vn 0.000000 0.955500 -0.295100
vn 0.000000 0.955500 0.295100
vn -0.255600 0.955500 -0.147600
vn 0.255600 0.955500 -0.147600
vn -0.255600 0.955500 0.147600
vn 0.255600 0.955500 0.147600
vn 0.280600 0.959800 0.000000
vn 0.000000 0.959800 -0.280600
vn 0.000000 0.959800 0.280600
vn -0.280600 0.959800 0.000000
vn 0.995900 0.000000 0.090500
vn 0.995900 0.000000 -0.090500
vn 0.000000 -1.000000 -0.000000
vn -0.995900 0.000000 -0.090500
vn -0.090500 0.000000 0.995900
vn -0.090500 0.000000 -0.995900
vn 0.090500 0.000000 0.995900
vn -0.995900 0.000000 0.090500
vn 0.090500 0.000000 -0.995900
g Deco_column.001_Cube.036_Split
s off
f 8/1/1 4/2/1 10/3/1 11/4/1
f 6/5/2 8/1/2 11/4/2 12/6/2
f 4/2/3 2/7/3 9/8/3 10/3/3
f 2/7/4 6/5/4 12/6/4 9/8/4
g Deco_column.001_Cube.036_Smooth
f 2/9/5 4/10/5 3/11/5 1/12/5
f 4/13/6 8/14/6 7/15/6 3/16/6
f 8/14/7 6/17/7 5/18/7 7/15/7
f 6/19/8 2/9/8 1/12/8 5/20/8
f 34/21/9 38/22/9 40/23/9 35/24/9
g Deco_column.001_Cube.036_Light
f 59/25/10 43/26/10 45/27/10 58/28/10
f 58/28/11 45/27/11 47/29/11 57/30/11
f 57/30/12 47/29/12 49/31/12 56/32/12
f 56/32/13 49/31/13 51/33/13 55/34/13
f 42/35/14 59/25/14 58/28/14 44/36/14
f 60/37/15 53/38/15 43/26/15 59/25/15
f 55/34/16 51/33/16 53/38/16 60/37/16
f 44/36/8 58/28/8 57/30/8 46/39/8
f 46/39/17 57/30/17 56/32/17 48/40/17
f 48/40/18 56/32/18 55/34/18 50/41/18
f 52/42/19 60/37/19 59/25/19 42/35/19
f 50/41/6 55/34/6 60/37/6 52/42/6
f 47/29/20 45/27/20 54/43/20
f 53/38/21 51/33/21 54/43/21
f 45/27/22 43/26/22 54/43/22
f 49/31/23 47/29/23 54/43/23
f 43/26/24 53/38/24 54/43/24
f 51/33/25 49/31/25 54/43/25
g Deco_column.001_Cube.036_Metal
f 16/44/8 13/45/8 21/46/8 20/47/8
f 14/48/6 15/49/6 33/50/6 32/51/6
f 16/52/7 12/53/7 27/54/7 29/55/7
f 10/56/5 9/57/5 22/58/5 23/59/5
f 14/60/26 13/61/26 17/62/26
f 13/61/27 16/63/27 17/62/27
f 15/64/28 14/60/28 17/62/28
f 16/63/29 15/64/29 17/62/29
f 18/65/30 20/66/30 41/67/30 40/68/30
f 9/57/8 12/69/8 18/70/8 19/71/8
f 12/69/8 16/44/8 20/47/8 18/70/8
f 13/45/8 9/57/8 19/71/8 21/46/8
f 14/48/5 10/56/5 23/59/5 25/72/5
f 13/45/5 14/48/5 25/72/5 24/73/5
f 9/57/5 13/45/5 24/73/5 22/58/5
f 15/49/7 16/52/7 29/55/7 28/74/7
f 11/75/7 15/49/7 28/74/7 26/76/7
f 12/53/7 11/75/7 26/76/7 27/54/7
f 31/77/9 30/78/9 34/79/9 35/80/9
f 10/56/6 14/48/6 32/51/6 30/78/6
f 11/75/6 10/56/6 30/78/6 31/77/6
f 15/49/6 11/75/6 31/77/6 33/50/6
f 33/50/31 31/77/31 35/80/31 37/81/31
f 32/51/32 33/50/32 37/81/32 36/82/32
f 30/78/33 32/51/33 36/82/33 34/79/33
f 22/58/34 24/73/34 39/83/34 38/84/34
f 25/72/35 23/59/35 34/79/35 36/82/35
f 29/85/36 27/86/36 40/87/36 41/88/36
f 24/73/32 25/72/32 36/82/32 39/83/32
f 23/59/9 22/58/9 38/84/9 34/79/9
f 19/71/9 18/65/9 40/68/9 38/84/9
f 21/46/37 19/71/37 38/84/37 39/83/37
f 20/66/32 21/46/32 39/83/32 41/67/32
f 27/86/9 26/76/9 35/80/9 40/87/9
f 26/76/38 28/74/38 37/81/38 35/80/38
f 28/74/32 29/85/32 41/88/32 37/81/32