use mesh node for the various bushes

new texture filenames also.

bushes_classic/models/bushes_bush.obj

@@ -0,0 +1,329 @@
+# Blender v2.73 (sub 0) OBJ File: 'bush.blend'
+# www.blender.org
+o nodebox-4
+v 0.467076 -0.122686 -0.190481
+v -0.453590 -0.119789 -0.192145
+v 0.420865 -0.181680 -0.171396
+v -0.429008 -0.188000 -0.182314
+v -0.450977 0.041977 -0.191409
+v -0.271687 -0.294075 -0.114977
+v -0.096925 -0.495759 -0.044091
+v -0.070286 -0.344209 -0.030750
+v -0.163971 -0.173437 -0.403793
+v -0.188139 -0.116431 0.446425
+v 0.069865 0.462329 0.170043
+v -0.175980 -0.180649 0.417932
+v -0.184276 0.039248 0.437271
+v -0.121692 -0.319322 0.290049
+v -0.039557 -0.495759 0.097032
+v -0.029307 -0.346230 0.070496
+v -0.440307 0.205163 -0.203598
+v -0.440281 0.206327 0.191785
+v -0.339366 0.327086 -0.144329
+v -0.267923 0.418413 0.108270
+v -0.264994 0.405691 -0.113216
+v 0.173823 0.186657 0.424935
+v -0.172109 0.470396 -0.073638
+v -0.090743 0.491063 -0.039539
+v -0.173625 0.180559 0.412022
+v 0.108534 0.404586 0.263698
+v -0.137870 0.317286 0.327397
+v 0.149454 0.342906 0.361857
+v -0.115069 0.426252 0.274637
+v 0.116858 -0.311812 0.284557
+v -0.074459 0.465500 0.178311
+v -0.036397 0.486640 0.094150
+v 0.044199 -0.495759 -0.101459
+v 0.034559 -0.377127 -0.079219
+v 0.116886 -0.299764 -0.276145
+v -0.172864 0.462259 0.069984
+v 0.173974 -0.178414 -0.411782
+v 0.191827 0.042411 -0.453422
+v 0.190055 -0.117435 -0.449613
+v -0.136929 0.321997 -0.339476
+v 0.101567 -0.495759 0.039664
+v 0.076778 -0.365788 0.030191
+v 0.292232 -0.320027 0.121743
+v -0.067752 0.451498 -0.167691
+v 0.433751 -0.189348 0.181586
+v 0.457624 0.044950 0.184732
+v 0.473778 -0.128221 0.198329
+v -0.113891 -0.307852 -0.282552
+v 0.081961 0.458662 -0.191580
+v 0.042947 0.491063 -0.093885
+v 0.109202 0.397842 -0.257691
+v 0.145450 0.328672 -0.343352
+v 0.191241 0.038411 0.444768
+v -0.184306 0.045052 -0.456452
+v -0.289997 -0.318897 0.117161
+v 0.182461 0.185982 -0.431178
+v 0.180190 0.469152 0.074510
+v 0.097292 0.491063 0.039804
+v 0.264954 0.412421 0.110505
+v 0.355939 0.336100 0.148277
+v -0.474575 0.042725 0.191924
+v -0.169486 0.185035 -0.418844
+v -0.445009 -0.118527 0.180804
+v 0.427054 0.187979 0.172057
+v 0.350926 0.339079 -0.143384
+v 0.189060 -0.125023 0.462241
+v 0.269270 -0.290650 -0.109472
+v 0.175816 -0.186803 0.429367
+v 0.259570 0.406980 -0.105942
+v -0.103158 0.398344 -0.255462
+v -0.339105 0.330270 0.137302
+v -0.186029 -0.123369 -0.460126
+v -0.418539 -0.180131 0.169838
+v 0.041492 0.491063 0.094145
+v 0.487251 0.041118 -0.191308
+v 0.173059 0.459504 -0.070716
+v 0.460259 0.206607 -0.196213
+v 0.108065 0.487446 -0.045199
+v -0.103423 0.491173 0.040772
+v -0.040665 0.496765 -0.107957
+v -0.070153 -0.343292 0.028053
+v -0.028215 -0.347521 -0.072596
+v 0.028031 -0.329368 0.067986
+v 0.075170 -0.358957 -0.031186
+v -0.037332 -0.495759 -0.099759
+v 0.099867 -0.495759 -0.041867
+v -0.095225 -0.495759 0.037440
+v 0.041974 -0.495759 0.095332
+v 0.001777 0.503796 -0.003546
+v 0.002321 -0.495758 -0.002214
+vt 0.875000 0.281250
+vt 1.000000 0.281250
+vt 1.000000 0.421875
+vt 0.875000 0.421875
+vt 0.375000 0.125000
+vt 0.500000 0.125000
+vt 0.500000 0.234375
+vt 0.375000 0.234375
+vt 0.625000 0.234375
+vt 0.625000 0.281250
+vt 0.500000 0.281250
+vt 0.500000 0.609375
+vt 0.500000 0.656250
+vt 0.375000 0.656250
+vt 0.375000 0.609375
+vt 0.625000 0.421875
+vt 0.500000 0.421875
+vt 0.375000 0.281250
+vt 0.375000 0.421875
+vt 0.125000 0.609375
+vt 0.125000 0.656250
+vt 0.000000 0.656250
+vt 0.000000 0.609375
+vt 0.846670 0.983596
+vt 0.823789 0.862038
+vt 0.861831 0.862038
+vt 0.500000 0.531250
+vt 0.375000 0.531250
+vt 0.234375 0.609375
+vt 0.234375 0.531250
+vt 0.875000 0.234375
+vt 0.750000 0.234375
+vt 0.750000 0.125000
+vt 0.875000 0.125000
+vt 0.125000 0.234375
+vt 0.125000 0.125000
+vt 0.234375 0.125000
+vt 0.234375 0.234375
+vt 0.125000 0.281250
+vt 0.234375 0.281250
+vt 0.234375 0.421875
+vt 0.125000 0.421875
+vt 0.125000 0.703125
+vt 0.000000 0.703125
+vt 0.875000 0.656250
+vt 0.750000 0.656250
+vt 0.750000 0.609375
+vt 0.875000 0.609375
+vt 0.625000 0.656250
+vt 0.625000 0.609375
+vt 0.234375 0.656250
+vt 0.375000 0.703125
+vt 0.234375 0.703125
+vt 0.125000 0.531250
+vt 0.875000 0.531250
+vt 1.000000 0.531250
+vt 1.000000 0.609375
+vt 0.500000 0.703125
+vt 0.000000 0.421875
+vt 0.000000 0.531250
+vt 0.875000 0.703125
+vt 0.750000 0.703125
+vt 0.328125 0.812500
+vt 0.328125 0.875000
+vt 0.265625 0.890625
+vt 0.265625 0.781250
+vt 0.750000 0.531250
+vt 1.000000 0.234375
+vt -0.000000 0.281250
+vt 0.000000 0.234375
+vt 0.375000 0.921875
+vt 0.328125 0.984375
+vt 0.562500 0.812500
+vt 0.500000 0.828125
+vt 0.625000 0.125000
+vt 0.625000 0.531250
+vt 0.970570 0.983596
+vt 0.918853 0.862038
+vt 0.983390 0.862038
+vt 1.000000 0.703125
+vt 1.000000 0.656250
+vt 0.694849 0.983596
+vt 0.653099 0.862038
+vt 0.703461 0.862038
+vt 0.453125 1.000000
+vt 0.437500 0.937500
+vt 0.546875 0.937500
+vt 0.375000 0.765625
+vt 0.625000 0.703125
+vt 0.750000 0.281250
+vt 0.000000 0.125000
+vt 0.781059 0.974219
+vt 0.740272 0.862038
+vt 0.773590 0.862038
+vt 0.823762 0.862067
+vt 0.773656 0.862066
+vt 0.800723 0.801332
+vt 0.750000 0.421875
+vt 1.000000 0.125000
+vt 0.881508 0.980225
+vt 0.923791 0.982865
+vt 0.819499 0.959318
+vt 0.634200 0.973424
+vt 0.659430 0.971277
+vt 0.724959 0.956989
+vt 0.755822 0.968617
+vt 0.125000 0.000000
+vt 0.234375 0.000000
+vt 0.375000 0.000000
+vt 0.500000 0.000000
+vt 0.750000 0.000000
+vt 0.875000 0.000000
+vt 1.000000 0.000000
+vt 0.625000 0.000000
+vt 0.000000 0.000000
+vt 0.618713 0.862038
+vt 0.453125 0.781250
+vt 0.484375 0.890625
+vt 0.406250 0.859375
+vt 0.738525 0.828462
+vt 0.741806 0.778103
+vt 0.777683 0.740596
+vt 0.827789 0.740597
+vt 0.862920 0.774201
+vt 0.859639 0.824560
+s off
+f 63/1 10/2 13/3 61/4
+f 67/5 35/6 37/7 3/8
+f 9/9 72/10 39/11 37/7
+f 52/12 51/13 69/14 65/15
+f 72/10 54/16 38/17 39/11
+f 1/18 39/11 38/17 75/19
+f 28/20 26/21 29/22 27/23
+f 82/24 33/25 85/26
+f 75/19 38/17 56/27 77/28
+f 77/28 65/15 60/29 64/30
+f 73/31 4/32 6/33 55/34
+f 68/35 30/36 43/37 45/38
+f 66/39 47/40 46/41 53/42
+f 11/43 31/44 29/22 26/21
+f 20/45 21/46 19/47 71/48
+f 70/49 40/50 19/47 21/46
+f 59/51 69/14 76/52 57/53
+f 3/8 37/7 39/11 1/18
+f 28/20 22/54 64/30 60/29
+f 71/48 18/55 25/56 27/57
+f 69/14 51/13 49/58 76/52
+f 13/59 53/42 22/54 25/60
+f 36/61 23/62 21/46 20/45
+f 58/63 74/64 11/65 57/66
+f 57/53 11/43 26/21 59/51
+f 19/47 17/67 18/55 71/48
+f 73/31 12/68 10/2 63/1
+f 68/35 66/39 10/69 12/70
+f 74/64 32/71 31/72 11/65
+f 53/42 46/41 64/30 22/54
+f 25/56 18/55 61/4 13/3
+f 49/58 44/73 80/74
+f 45/38 3/8 1/18 47/40
+f 9/9 48/75 6/33 4/32
+f 62/76 40/50 52/12 56/27
+f 81/77 7/78 87/79
+f 31/80 36/61 20/45 29/81
+f 83/82 15/83 88/84
+f 36/85 79/86 23/87
+f 78/88 58/63 57/66
+f 17/67 19/47 40/50 62/76
+f 45/38 47/40 66/39 68/35
+f 51/13 70/49 44/89 49/58
+f 4/32 73/31 63/1 2/90
+f 12/70 14/91 30/36 68/35
+f 84/92 41/93 86/94
+f 33/95 86/96 90/97
+f 70/49 21/46 23/62 44/89
+f 54/16 62/76 56/27 38/17
+f 29/81 20/45 71/48 27/57
+f 37/7 35/6 48/75 9/9
+f 5/98 17/67 62/76 54/16
+f 18/55 17/67 5/98 61/4
+f 10/69 66/39 53/42 13/59
+f 12/68 73/31 55/34 14/99
+f 51/13 52/12 40/50 70/49
+f 27/23 25/60 22/54 28/20
+f 65/15 69/14 59/51 60/29
+f 56/27 52/12 65/15 77/28
+f 46/41 75/19 77/28 64/30
+f 60/29 59/51 26/21 28/20
+f 47/40 1/18 75/19 46/41
+f 2/90 5/98 54/16 72/10
+f 4/32 2/90 72/10 9/9
+f 43/37 67/5 3/8 45/38
+f 2/90 63/1 61/4 5/98
+f 82/100 7/78 8/101
+f 82/24 34/102 33/25
+f 81/103 15/83 16/104
+f 81/77 8/101 7/78
+f 83/82 41/93 42/105
+f 83/82 16/104 15/83
+f 84/92 33/25 34/102
+f 84/92 42/106 41/93
+f 30/36 83/107 42/108 43/37
+f 42/108 84/109 67/5 43/37
+f 67/5 84/109 34/110 35/6
+f 55/34 6/33 8/111 81/112
+f 55/34 81/112 16/113 14/99
+f 34/110 82/114 48/75 35/6
+f 48/75 82/114 8/111 6/33
+f 30/36 14/91 16/115 83/107
+f 7/78 82/100 85/26
+f 15/83 81/103 87/116
+f 41/93 83/82 88/84
+f 33/25 84/92 86/94
+f 80/74 50/117 49/58
+f 23/87 24/118 80/74
+f 80/74 44/73 23/87
+f 79/86 36/85 31/72
+f 79/86 24/118 23/87
+f 31/72 32/71 79/86
+f 78/88 49/58 50/117
+f 78/88 57/66 76/52
+f 76/52 49/58 78/88
+f 24/118 79/86 89/119
+f 79/86 32/71 89/119
+f 32/71 74/64 89/119
+f 74/64 58/63 89/119
+f 58/63 78/88 89/119
+f 78/88 50/117 89/119
+f 50/117 80/74 89/119
+f 80/74 24/118 89/119
+f 86/96 41/120 90/97
+f 41/120 88/121 90/97
+f 88/121 15/122 90/97
+f 15/122 87/123 90/97
+f 87/123 7/124 90/97
+f 7/124 85/125 90/97
+f 85/125 33/95 90/97

bushes_classic/nodes.lua

@@ -96,8 +96,6 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	end
 end
 
-
-
 plantlife_bushes.after_place_node = function(pos, placer, itemstack)
 
 	if not (itemstack and pos) then
@@ -120,8 +118,6 @@ plantlife_bushes.after_place_node = function(pos, placer, itemstack)
 	meta:set_string("bush_type", name_parts[1])
 end
 
-
-
 -- regrow berries (uses a base abm instead of plants_lib because of the use of metadata).
 
 minetest.register_abm({
@@ -179,25 +175,12 @@ for i, bush_name in ipairs(bushes_classic.bushes) do
 
 	minetest.register_node(":bushes:" .. bush_name .. "_bush", {
 		description = S(desc.." Bush"),
-			drawtype = "nodebox",
+		drawtype = "mesh",
-			tiles = {texture_top, texture_bottom, "bushes_" .. bush_name .. "_bush.png"},
+		mesh = "bushes_bush.obj",
-			inventory_image = "bushes_" .. bush_name .. "_bush.png",
+		tiles = {"bushes_bush_"..bush_name..".png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/16,	-8/16,	-1/16,	1/16,	-6/16,	1/16},
-					{-4/16,	-6/16,	-4/16,	4/16,	5/16,	4/16},
-					{-5/16,	-5/16,	-5/16,	5/16,	3/16,	5/16},
-					{-6/16,	-4/16,	-6/16,	6/16,	2/16,	6/16},
-					{-6.5/16,	-3/16,	-6.5/16,	6.5/16,	-2/16,	6.5/16},
-					{-3/16,	5/16,	-3/16,	3/16,	6/16,	3/16},
-					{-2/16,	5/16,	-2/16,	2/16,	7/16,	2/16}
-				}
-			},
-
 		groups = groups,
 		sounds = default.node_sound_leaves_defaults(),
 		drop = "",
@@ -215,7 +198,6 @@ for i, bush_name in ipairs(bushes_classic.bushes) do
 	end
 end
 
-
 minetest.register_node(":bushes:basket_empty", {
     description = S("Basket"),
     tiles = {