use mesh nodes for bushes_classic baskets/baskets-with-pies.

2015-01-26 04:10:20 -05:00 · 2015-01-26 04:10:20 -05:00 · 117cab1474
parent d63e016b19
commit 117cab1474
19 changed files with 385 additions and 8 deletions
--- a/bushes_classic/models/bushes_basket_empty.obj
+++ b/bushes_classic/models/bushes_basket_empty.obj
@ -0,0 +1,46 @@
+# Blender v2.73 (sub 0) OBJ File: 'basket-of-pies.blend'
+# www.blender.org
+o basket_Cube.001
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 0.500000 -0.500000
+v 0.500000 0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+v -0.437500 0.500000 0.437500
+v -0.437500 0.500000 -0.437500
+v 0.437500 0.500000 -0.437500
+v 0.437500 0.500000 0.437500
+v -0.437500 -0.437500 0.437500
+v -0.437500 -0.437500 -0.437500
+v 0.437500 -0.437500 -0.437500
+v 0.437500 -0.437500 0.437500
+vt 0.484848 0.984848
+vt 0.015152 0.984848
+vt 0.015152 0.515152
+vt 0.484848 0.515152
+vt 0.515152 0.984848
+vt 0.515152 0.515152
+vt 0.984848 0.515152
+vt 0.984848 0.984848
+vt 0.954545 0.545455
+vt 0.545455 0.545455
+vt 0.954545 0.954545
+vt 0.545455 0.954545
+s off
+f 5/1 6/2 2/3 1/4
+f 6/1 7/2 3/3 2/4
+f 7/1 8/2 4/3 3/4
+f 8/1 5/2 1/3 4/4
+f 1/5 2/6 3/7 4/8
+f 5/6 8/7 12/9 9/10
+f 8/7 7/8 11/11 12/9
+f 7/8 6/5 10/12 11/11
+f 6/5 5/6 9/10 10/12
+f 9/1 12/2 16/3 13/4
+f 12/1 11/2 15/3 16/4
+f 11/1 10/2 14/3 15/4
+f 10/1 9/2 13/3 14/4
+f 13/10 16/9 15/11 14/12
--- a/bushes_classic/models/bushes_basket_full.obj
+++ b/bushes_classic/models/bushes_basket_full.obj
@ -0,0 +1,330 @@
+# Blender v2.73 (sub 0) OBJ File: 'basket-of-pies.blend'
+# www.blender.org
+o pies_Cylinder
+v -0.089468 -0.116804 -0.438000
+v -0.116691 -0.091480 -0.438000
+v 0.024696 0.005921 -0.404659
+v -0.002527 0.031245 -0.404659
+v 0.121480 0.109962 -0.309713
+v 0.094258 0.135286 -0.309713
+v 0.186149 0.179480 -0.167615
+v 0.158927 0.204804 -0.167615
+v 0.208858 0.203891 0.000000
+v 0.181635 0.229215 0.000000
+v 0.186149 0.179480 0.167615
+v 0.158927 0.204804 0.167615
+v 0.121480 0.109962 0.309713
+v 0.094258 0.135286 0.309713
+v 0.024696 0.005921 0.404659
+v -0.002527 0.031245 0.404659
+v -0.089468 -0.116804 0.438000
+v -0.116691 -0.091480 0.438000
+v -0.230856 -0.214204 0.404659
+v -0.327640 -0.318245 0.309713
+v -0.392309 -0.387763 0.167615
+v -0.415018 -0.412175 -0.000000
+v -0.392309 -0.387763 -0.167615
+v -0.327640 -0.318245 -0.309713
+v -0.230856 -0.214204 -0.404659
+v -0.135230 -0.074234 -0.383250
+v -0.035336 0.033150 -0.354077
+v 0.049350 0.124186 -0.270999
+v 0.105936 0.185014 -0.146663
+v 0.125806 0.206374 0.000000
+v 0.105936 0.185014 0.146663
+v 0.049350 0.124186 0.270999
+v -0.035336 0.033150 0.354077
+v -0.135230 -0.074234 0.383250
+v -0.235124 -0.181618 0.354077
+v -0.319810 -0.272654 0.270999
+v -0.376395 -0.333482 0.146663
+v -0.396266 -0.354842 -0.000000
+v -0.376395 -0.333482 -0.146664
+v -0.319810 -0.272654 -0.270999
+v -0.235124 -0.181618 -0.354077
+v 0.071215 -0.085999 -0.438000
+v 0.041377 -0.063816 -0.438000
+v 0.171221 0.048513 -0.404659
+v 0.141384 0.070697 -0.404659
+v 0.256002 0.162547 -0.309713
+v 0.226165 0.184731 -0.309713
+v 0.312652 0.238743 -0.167615
+v 0.282814 0.260926 -0.167615
+v 0.332544 0.265499 0.000000
+v 0.302707 0.287682 0.000000
+v 0.312652 0.238743 0.167615
+v 0.282814 0.260926 0.167615
+v 0.256002 0.162547 0.309713
+v 0.226165 0.184731 0.309713
+v 0.171221 0.048513 0.404659
+v 0.141383 0.070697 0.404659
+v 0.071215 -0.085999 0.438000
+v 0.041377 -0.063816 0.438000
+v -0.058629 -0.198328 0.404659
+v -0.058629 -0.198328 -0.404659
+v 0.021058 -0.048709 -0.383250
+v 0.108564 0.068989 -0.354077
+v 0.182747 0.168769 -0.270999
+v 0.232315 0.235440 -0.146663
+v 0.249721 0.258852 0.000000
+v 0.232315 0.235440 0.146663
+v 0.182747 0.168769 0.270999
+v 0.108564 0.068989 0.354077
+v 0.021058 -0.048709 0.383250
+v -0.066448 -0.166408 0.354077
+v -0.140632 -0.266188 0.270999
+v -0.190200 -0.332858 0.146663
+v -0.207605 -0.356270 -0.000000
+v -0.190199 -0.332858 -0.146664
+v -0.140631 -0.266188 -0.270999
+v -0.066448 -0.166408 -0.354077
+v 0.220377 -0.057101 -0.438000
+v 0.188086 -0.038671 -0.438000
+v 0.303465 0.088470 -0.404659
+v 0.271175 0.106901 -0.404659
+v 0.373905 0.211880 -0.309713
+v 0.341614 0.230311 -0.309713
+v 0.420971 0.294340 -0.167615
+v 0.388680 0.312771 -0.167615
+v 0.437498 0.323296 0.000000
+v 0.405208 0.341727 0.000000
+v 0.420971 0.294340 0.167615
+v 0.388680 0.312771 0.167615
+v 0.373905 0.211880 0.309713
+v 0.341614 0.230311 0.309713
+v 0.303465 0.088470 0.404659
+v 0.271175 0.106901 0.404659
+v 0.220377 -0.057101 0.438000
+v 0.188086 -0.038671 0.438000
+v 0.104997 -0.184242 0.404659
+v 0.104997 -0.184242 -0.404659
+v 0.166096 -0.026119 -0.383250
+v 0.238799 0.101256 -0.354077
+v 0.300433 0.209240 -0.270999
+v 0.341616 0.281392 -0.146663
+v 0.356078 0.306728 0.000000
+v 0.341616 0.281392 0.146664
+v 0.300433 0.209240 0.270999
+v 0.238799 0.101256 0.354077
+v 0.166096 -0.026119 0.383250
+v 0.093393 -0.153495 0.354077
+v 0.031759 -0.261478 0.270999
+v -0.009424 -0.333631 0.146663
+v -0.023885 -0.358967 -0.000000
+v -0.009424 -0.333631 -0.146664
+v 0.031759 -0.261478 -0.270999
+v 0.093394 -0.153495 -0.354077
+vt 0.000000 0.054054
+vt 0.000000 0.000000
+vt 0.062500 0.000000
+vt 0.062500 0.054054
+vt 0.125000 0.000000
+vt 0.125000 0.054054
+vt 0.187500 0.000000
+vt 0.187500 0.054054
+vt 0.250000 0.000000
+vt 0.250000 0.054054
+vt 0.312500 0.000000
+vt 0.312500 0.054054
+vt 0.375000 0.000000
+vt 0.375000 0.054054
+vt 0.437500 0.000000
+vt 0.437500 0.054054
+vt 0.500000 0.000000
+vt 0.500000 0.054054
+vt 0.055610 0.293778
+vt 0.110171 0.184656
+vt 0.123905 0.225763
+vt 0.076165 0.321244
+vt 0.316174 0.801264
+vt 0.253798 0.852938
+vt 0.186282 0.852938
+vt 0.123905 0.801264
+vt 0.076165 0.705782
+vt 0.050327 0.581029
+vt 0.050327 0.445997
+vt 0.186282 0.174088
+vt 0.253798 0.174089
+vt 0.316174 0.225763
+vt 0.363915 0.321245
+vt 0.389752 0.445997
+vt 0.389752 0.581029
+vt 0.363915 0.705782
+vt 0.384468 0.733249
+vt 0.329907 0.842371
+vt 0.055610 0.733249
+vt 0.026082 0.590674
+vt 0.384468 0.293778
+vt 0.413996 0.436353
+vt 0.258619 0.901428
+vt 0.181458 0.901428
+vt 0.181458 0.125599
+vt 0.258619 0.125599
+vt 0.026082 0.436353
+vt 0.413996 0.590674
+vt 0.110171 0.842371
+vt 0.329907 0.184656
+vt 0.076566 0.705251
+vt 0.050729 0.580498
+vt 0.050729 0.445466
+vt 0.076566 0.320713
+vt 0.124307 0.225232
+vt 0.186684 0.173557
+vt 0.254199 0.173557
+vt 0.316576 0.225232
+vt 0.364317 0.320713
+vt 0.390154 0.445466
+vt 0.390154 0.580498
+vt 0.364317 0.705251
+vt 0.316576 0.800732
+vt 0.254199 0.852407
+vt 0.186684 0.852407
+vt 0.124307 0.800732
+vt 0.110573 0.841838
+vt 0.056012 0.732716
+vt 0.330309 0.841838
+vt 0.259022 0.900894
+vt 0.026484 0.590141
+vt 0.026484 0.435819
+vt 0.414398 0.435819
+vt 0.414398 0.590141
+vt 0.181861 0.900894
+vt 0.384870 0.732716
+vt 0.384870 0.293245
+vt 0.389637 0.582094
+vt 0.363799 0.706847
+vt 0.316059 0.802329
+vt 0.253682 0.854003
+vt 0.186166 0.854003
+vt 0.123790 0.802329
+vt 0.076049 0.706847
+vt 0.050212 0.582094
+vt 0.050212 0.447062
+vt 0.076049 0.322309
+vt 0.123790 0.226828
+vt 0.186166 0.175153
+vt 0.253682 0.175153
+vt 0.316058 0.226828
+vt 0.363799 0.322310
+vt 0.389637 0.447062
+vt 0.413881 0.437419
+vt 0.413881 0.591741
+vt 0.258504 0.126666
+vt 0.329792 0.185722
+vt 0.384353 0.734315
+vt 0.329792 0.843437
+vt 0.055495 0.294844
+vt 0.110056 0.185722
+vt 0.384353 0.294844
+vt 0.181343 0.126666
+vt 0.025967 0.437419
+g pies_Cylinder_pie
+s off
+f 1/1 2/2 4/3 3/4
+f 3/4 4/3 6/5 5/6
+f 5/6 6/5 8/7 7/8
+f 7/8 8/7 10/9 9/10
+f 9/10 10/9 12/11 11/12
+f 11/12 12/11 14/13 13/14
+f 13/14 14/13 16/15 15/16
+f 15/16 16/15 18/17 17/18
+f 20/19 19/20 35/21 36/22
+f 27/23 26/24 41/25 40/26 39/27 38/28 37/29 36/22 35/21 34/30 33/31 32/32 31/33 30/34 29/35 28/36
+f 6/37 4/38 27/23 28/36
+f 23/39 22/40 38/28 39/27
+f 12/41 10/42 30/34 31/33
+f 2/43 25/44 41/25 26/24
+f 4/38 2/43 26/24 27/23
+f 18/45 16/46 33/31 34/30
+f 21/47 20/19 36/22 37/29
+f 8/48 6/37 28/36 29/35
+f 24/49 23/39 39/27 40/26
+f 14/50 12/41 31/33 32/32
+f 19/20 18/45 34/30 35/21
+f 22/40 21/47 37/29 38/28
+f 10/42 8/48 29/35 30/34
+f 25/44 24/49 40/26 41/25
+f 16/46 14/50 32/32 33/31
+f 42/1 43/2 45/3 44/4
+f 44/4 45/3 47/5 46/6
+f 46/6 47/5 49/7 48/8
+f 48/8 49/7 51/9 50/10
+f 50/10 51/9 53/11 52/12
+f 52/12 53/11 55/13 54/14
+f 54/14 55/13 57/15 56/16
+f 56/16 57/15 59/17 58/18
+f 63/51 62/52 77/53 76/54 75/55 74/56 73/57 72/58 71/59 70/60 69/61 68/62 67/63 66/64 65/65 64/66
+f 47/67 45/68 63/51 64/66
+f 53/69 51/70 66/64 67/63
+f 43/71 61/72 77/53 62/52
+f 45/68 43/71 62/52 63/51
+f 59/73 57/74 69/61 70/60
+f 49/75 47/67 64/66 65/65
+f 55/76 53/69 67/63 68/62
+f 60/77 59/73 70/60 71/59
+f 51/70 49/75 65/65 66/64
+f 57/74 55/76 68/62 69/61
+f 78/1 79/2 81/3 80/4
+f 80/4 81/3 83/5 82/6
+f 82/6 83/5 85/7 84/8
+f 84/8 85/7 87/9 86/10
+f 86/10 87/9 89/11 88/12
+f 88/12 89/11 91/13 90/14
+f 90/14 91/13 93/15 92/16
+f 92/16 93/15 95/17 94/18
+f 99/78 98/79 113/80 112/81 111/82 110/83 109/84 108/85 107/86 106/87 105/88 104/89 103/90 102/91 101/92 100/93
+f 83/94 81/95 99/78 100/93
+f 89/96 87/97 102/91 103/90
+f 79/98 97/99 113/80 98/79
+f 81/95 79/98 98/79 99/78
+f 95/100 93/101 105/88 106/87
+f 85/102 83/94 100/93 101/92
+f 91/103 89/96 103/90 104/89
+f 96/104 95/100 106/87 107/86
+f 87/97 85/102 101/92 102/91
+f 93/101 91/103 104/89 105/88
+o basket_Cube.001
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 0.500000 -0.500000
+v 0.500000 0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+v -0.437500 0.500000 0.437500
+v -0.437500 0.500000 -0.437500
+v 0.437500 0.500000 -0.437500
+v 0.437500 0.500000 0.437500
+v -0.437500 -0.437500 0.437500
+v -0.437500 -0.437500 -0.437500
+v 0.437500 -0.437500 -0.437500
+v 0.437500 -0.437500 0.437500
+vt 0.484848 0.984848
+vt 0.015152 0.984848
+vt 0.015152 0.515152
+vt 0.484848 0.515152
+vt 0.515152 0.984848
+vt 0.515152 0.515152
+vt 0.984848 0.515152
+vt 0.984848 0.984848
+vt 0.954545 0.545455
+vt 0.545455 0.545455
+vt 0.954545 0.954545
+vt 0.545455 0.954545
+g basket_Cube.001_basket
+s off
+f 118/105 119/106 115/107 114/108
+f 119/105 120/106 116/107 115/108
+f 120/105 121/106 117/107 116/108
+f 121/105 118/106 114/107 117/108
+f 114/109 115/110 116/111 117/112
+f 118/110 121/111 125/113 122/114
+f 121/111 120/112 124/115 125/113
+f 120/112 119/109 123/116 124/115
+f 119/109 118/110 122/114 123/116
+f 122/105 125/106 129/107 126/108
+f 125/105 124/106 128/107 129/108
+f 124/105 123/106 127/107 128/108
+f 123/105 122/106 126/107 127/108
+f 126/114 129/113 128/115 127/116
--- a/bushes_classic/nodes.lua
+++ b/bushes_classic/nodes.lua
@ -150,11 +150,13 @@ for i, bush_name in ipairs(bushes_classic.bushes) do

 	minetest.register_node(":bushes:basket_"..bush_name, {
 		description = S("Basket with "..desc.." Pies"),
+		drawtype = "mesh",
+		mesh = "bushes_basket_full.obj",
 		tiles = {
-		"bushes_basket_"..bush_name.."_top.png",
-		"bushes_basket_bottom.png",
-		"bushes_basket_side.png"
+			"bushes_basket_pie_"..bush_name..".png",
+			"bushes_basket.png"
 		},
+		paramtype = "light",
 		on_use = minetest.item_eat(18),
 		groups = { dig_immediate = 3 },
 	})
@ -200,11 +202,10 @@ end

 minetest.register_node(":bushes:basket_empty", {
    description = S("Basket"),
-    tiles = {
-	"bushes_basket_empty_top.png",
-	"bushes_basket_bottom.png",
-	"bushes_basket_side.png"
-    },
+	drawtype = "mesh",
+	mesh = "bushes_basket_empty.obj",
+	tiles = { "bushes_basket.png" },
+	paramtype = "light",
    groups = { dig_immediate = 3 },
 })

--- a/bushes_classic/textures/bushes_basket.png
+++ b/bushes_classic/textures/bushes_basket.png
--- a/bushes_classic/textures/bushes_basket_blackberry_top.png
+++ b/bushes_classic/textures/bushes_basket_blackberry_top.png
--- a/bushes_classic/textures/bushes_basket_blueberry_top.png
+++ b/bushes_classic/textures/bushes_basket_blueberry_top.png
--- a/bushes_classic/textures/bushes_basket_bottom.png
+++ b/bushes_classic/textures/bushes_basket_bottom.png
--- a/bushes_classic/textures/bushes_basket_empty_top.png
+++ b/bushes_classic/textures/bushes_basket_empty_top.png
--- a/bushes_classic/textures/bushes_basket_gooseberry_top.png
+++ b/bushes_classic/textures/bushes_basket_gooseberry_top.png
--- a/bushes_classic/textures/bushes_basket_mixed_berry_top.png
+++ b/bushes_classic/textures/bushes_basket_mixed_berry_top.png
--- a/bushes_classic/textures/bushes_basket_pie_blackberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_blackberry.png
--- a/bushes_classic/textures/bushes_basket_pie_blueberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_blueberry.png
--- a/bushes_classic/textures/bushes_basket_pie_gooseberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_gooseberry.png
--- a/bushes_classic/textures/bushes_basket_pie_mixed_berry.png
+++ b/bushes_classic/textures/bushes_basket_pie_mixed_berry.png
--- a/bushes_classic/textures/bushes_basket_pie_raspberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_raspberry.png
--- a/bushes_classic/textures/bushes_basket_pie_strawberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_strawberry.png
--- a/bushes_classic/textures/bushes_basket_raspberry_top.png
+++ b/bushes_classic/textures/bushes_basket_raspberry_top.png
--- a/bushes_classic/textures/bushes_basket_side.png
+++ b/bushes_classic/textures/bushes_basket_side.png
--- a/bushes_classic/textures/bushes_basket_strawberry_top.png
+++ b/bushes_classic/textures/bushes_basket_strawberry_top.png