use mesh node for former-"3dforniture" torch

homedecor/furniture_medieval.lua

@@ -60,11 +60,10 @@ homedecor.register("chains", {
 
 homedecor.register("torch_wall", {
 	description = S("Wall Torch"),
+	mesh = "forniture_torch.obj",
 	tiles = {
-		"forniture_torch_wall_s.png",
-		"forniture_torch_wall_i.png",
 		{
-			name="forniture_torch_wall_anim.png",
+			name="forniture_torch_flame.png",
 			animation={
 				type="vertical_frames",
 				aspect_w=40,
@@ -72,22 +71,11 @@ homedecor.register("torch_wall", {
 				length=1.0,
 			},
 		},
+		"forniture_black_metal.png",
+		"forniture_metal.png",
+		"forniture_coal.png",
 	},
-	inventory_image="3dforniture_inv_torch_wall.png",
+	inventory_image="forniture_torch_inv.png",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{ -0.05, -0.45,  0.45,  0.05, -0.35,  0.50, },
-			{ -0.05, -0.35,  0.40,  0.05, -0.25,  0.50, },
-			{ -0.05, -0.25,  0.35,  0.05, -0.15,  0.45, },
-			{ -0.05, -0.15,  0.30,  0.05, -0.05,  0.40, },
-			{ -0.05, -0.05,  0.25,  0.05,  0.00,  0.35, },
-			{ -0.10,  0.00,  0.20,  0.10,  0.05,  0.40, },
-			{ -0.15,  0.05,  0.15,  0.15,  0.15,  0.45, },
-			{ -0.10,  0.15,  0.20,  0.10,  0.25,  0.40, },
-			{ -0.05,  0.25,  0.25,  0.05,  0.35,  0.35, },
-		},
-	},
 	sunlight_propagates = true,
 	walkable = false,
 	light_source = 14,

homedecor/models/forniture_torch.obj

@@ -0,0 +1,437 @@
+# Blender v2.73 (sub 0) OBJ File: 'forniture-torch.blend'
+# www.blender.org
+o Cylinder
+v -0.070105 -0.451141 0.426038
+v -0.070105 -0.424562 0.499062
+v 0.007605 -0.424562 0.499062
+v 0.007605 -0.451141 0.426038
+v 0.007605 -0.098756 0.297781
+v 0.007605 -0.072177 0.370805
+v -0.070105 -0.072177 0.370805
+v -0.070105 -0.098756 0.297781
+v 0.007605 -0.116816 0.304330
+v 0.007605 -0.189840 0.330909
+v -0.070105 -0.189840 0.330909
+v -0.070105 -0.116816 0.304330
+v 0.069783 0.031995 0.193861
+v 0.069783 0.031995 0.393565
+v -0.132283 0.031995 0.393565
+v -0.132283 0.031995 0.193861
+v 0.013082 -0.113527 0.297353
+v 0.013082 -0.196844 0.327678
+v -0.075582 -0.196844 0.327678
+v -0.075582 -0.113527 0.297353
+v -0.070192 -0.045506 0.500000
+v -0.075582 -0.039769 0.500000
+v 0.007692 -0.045506 0.500000
+v 0.007680 -0.128375 0.500000
+v 0.013082 -0.039769 0.500000
+v -0.070180 -0.128375 0.500000
+v 0.013082 -0.134124 0.500000
+v -0.075582 -0.134124 0.500000
+v -0.031250 -0.424562 0.499062
+v 0.007605 -0.437851 0.462550
+v -0.070105 -0.437851 0.462550
+v -0.031250 -0.451141 0.426038
+v -0.031250 -0.470887 0.474574
+v -0.031250 -0.467388 0.438505
+v 0.001447 -0.456205 0.469230
+v -0.031250 -0.445022 0.499955
+v -0.063947 -0.456205 0.469230
+v 0.044525 0.031995 0.218824
+v 0.044527 0.031980 0.368602
+v -0.107009 0.031987 0.368578
+v -0.106916 0.031995 0.218975
+v -0.070742 -0.026956 0.277181
+v -0.070790 -0.026969 0.352884
+v 0.008333 -0.026981 0.352896
+v 0.008332 -0.026956 0.277105
+v -0.009642 0.004093 0.367884
+v -0.086372 0.004535 0.341291
+v -0.091607 0.004950 0.259544
+v -0.013029 0.016223 0.261872
+v 0.038407 0.003299 0.302325
+v -0.032436 0.040371 0.294073
+v 0.037459 -0.032366 0.318588
+v 0.029480 -0.023648 0.277887
+v -0.031236 -0.025288 0.373950
+v 0.014186 -0.033648 0.364907
+v -0.093899 -0.023106 0.326083
+v -0.076686 -0.033648 0.364907
+v -0.075118 -0.026614 0.248091
+v -0.093539 -0.021250 0.278824
+v 0.014181 -0.026351 0.245423
+v -0.030061 -0.018199 0.232075
+v -0.001778 0.028773 0.334271
+v -0.051815 0.025727 0.346143
+v -0.088532 0.013956 0.303905
+v -0.043659 0.008253 0.248510
+v 0.013600 0.011721 0.262111
+v -0.023834 0.035206 0.314610
+v 0.009766 0.034903 0.301827
+v -0.062347 0.035851 0.323176
+v -0.047034 0.029569 0.277077
+v -0.010182 0.035814 0.272572
+v -0.167964 -0.020341 0.298667
+v 0.105464 -0.020341 0.298667
+v -0.167964 0.311681 0.298667
+v 0.105464 0.311681 0.298667
+v -0.031250 -0.020341 0.161953
+v -0.031250 -0.020341 0.435381
+v -0.031250 0.311681 0.161953
+v -0.031250 0.311681 0.435381
+v 0.065422 -0.020341 0.395338
+v -0.127922 -0.020341 0.201995
+v 0.065422 0.311681 0.395338
+v -0.127922 0.311681 0.201995
+v -0.127922 -0.020341 0.395338
+v 0.065422 -0.020341 0.201995
+v -0.127922 0.311681 0.395338
+v 0.065422 0.311681 0.201995
+v -0.070105 -0.085467 0.334293
+v -0.031250 -0.072177 0.370805
+v 0.007605 -0.085467 0.334293
+v -0.031250 -0.098756 0.297781
+v -0.172703 0.031996 0.293707
+v -0.031256 0.031996 0.433499
+v 0.110190 0.031996 0.293707
+v -0.031256 0.031996 0.153914
+v -0.137254 0.031991 0.293796
+v -0.031244 0.031980 0.398534
+v 0.074830 0.031985 0.293707
+v -0.031180 0.031996 0.188968
+v -0.086583 -0.026963 0.315042
+v -0.031230 -0.026981 0.368042
+v 0.024156 -0.026972 0.314997
+v -0.031197 -0.026954 0.261997
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.734557 0.726642
+vt 0.734557 0.982003
+vt 0.515443 0.982003
+vt 0.515443 0.726641
+vt 0.015232 0.609057
+vt 0.015443 0.017844
+vt 0.234557 0.017844
+vt 0.234801 0.702194
+vt 0.750000 0.708644
+vt 0.750000 1.000000
+vt 0.500000 1.000000
+vt 0.500000 0.708644
+vt 1.000000 0.708644
+vt 0.750000 0.602600
+vt 0.750000 0.000000
+vt 0.250000 0.000000
+vt 0.250000 0.708645
+vt 0.478251 0.982003
+vt 0.478251 0.726641
+vt 0.000000 0.602600
+vt 0.500000 0.000000
+vt 0.265442 0.017844
+vt 0.265199 0.702194
+vt 0.484557 0.017844
+vt 0.484768 0.609057
+vt 0.500000 0.602600
+vt 1.000000 0.529038
+vt 1.000000 0.634845
+vt 0.942307 0.529038
+vt 1.000000 0.423230
+vt 0.942307 0.317423
+vt 1.000000 0.317423
+vt 1.000000 0.211615
+vt 0.937916 0.740653
+vt 0.880223 0.740653
+vt 0.937916 0.634845
+vt 1.000000 0.105808
+vt 0.942307 0.105808
+vt 0.062500 0.500000
+vt 0.062500 0.375000
+vt 0.250000 0.375000
+vt 0.250000 0.500000
+vt 0.062500 0.750000
+vt 0.062500 0.625000
+vt 0.250000 0.625000
+vt 0.250000 0.750000
+vt 0.062500 1.000000
+vt 0.062500 0.875000
+vt 0.250000 0.875000
+vt 0.250000 1.000000
+vt 0.062500 0.250000
+vt 0.062500 0.125000
+vt 0.250000 0.125000
+vt 0.250000 0.250000
+vt 0.937916 0.846461
+vt 0.923551 0.228385
+vt 0.923551 0.194846
+vt 0.923551 0.618076
+vt 0.923551 0.440000
+vt 0.880223 0.317423
+vt 0.880223 0.105808
+vt 0.880223 0.529038
+vt 0.187500 1.000000
+vt 0.062500 0.000000
+vt 0.187500 0.000000
+vt 0.375000 0.000000
+vt 0.375000 1.000000
+vt 0.312500 0.000000
+vt 0.562500 0.000000
+vt 0.687500 1.000000
+vt 0.562500 1.000000
+vt 0.312500 0.500000
+vt 0.312500 0.375000
+vt 0.375000 0.375000
+vt 0.375000 0.500000
+vt 0.312500 0.750000
+vt 0.312500 0.625000
+vt 0.375000 0.625000
+vt 0.375000 0.750000
+vt 0.312500 1.000000
+vt 0.312500 0.875000
+vt 0.375000 0.875000
+vt 0.312500 0.250000
+vt 0.312500 0.125000
+vt 0.375000 0.125000
+vt 0.375000 0.250000
+vt 0.437500 0.250000
+vt 0.437500 0.125000
+vt 0.812500 0.125000
+vt 0.812500 0.250000
+vt 0.437500 1.000000
+vt 0.437500 0.875000
+vt 0.812500 0.875000
+vt 0.812500 1.000000
+vt 0.437500 0.750000
+vt 0.437500 0.625000
+vt 0.812500 0.625000
+vt 0.812500 0.750000
+vt 0.437500 0.500000
+vt 0.437500 0.375000
+vt 0.812500 0.375000
+vt 0.812500 0.500000
+vt 0.437500 0.000000
+vt 0.812500 0.000000
+vt 0.563450 0.287982
+vt 0.591010 0.397840
+vt 0.513711 0.462096
+vt 0.294538 0.374896
+vt 0.415649 0.359039
+vt 0.378734 0.434099
+vt 0.276191 0.642067
+vt 0.286968 0.497086
+vt 0.432404 0.584766
+vt 0.551580 0.634461
+vt 0.444230 0.678132
+vt 0.561556 0.599491
+vt 0.731844 0.502250
+vt 0.644903 0.633680
+vt 0.631466 0.503876
+vt 0.483565 0.529218
+vt 0.700559 0.582119
+vt 0.646941 0.688222
+vt 0.491887 0.731844
+vt 0.333976 0.679501
+vt 0.269419 0.579056
+vt 0.268156 0.424601
+vt 0.328483 0.297711
+vt 0.487769 0.268156
+vt 0.646958 0.297711
+vt 0.728521 0.449096
+vn 0.000000 0.000000 1.000000
+vn -1.000000 0.000000 0.000000
+vn -0.707100 0.000000 0.707100
+vn 0.707100 0.000000 0.707100
+vn 0.000000 -0.342000 -0.939700
+vn 1.000000 0.000100 0.000400
+vn 1.000000 0.000000 -0.000000
+vn 0.000000 -0.904500 -0.426400
+vn 0.707100 0.664500 -0.241800
+vn 0.000000 -0.418800 0.908100
+vn 0.707100 -0.664500 0.241800
+vn -0.707100 0.664500 -0.241800
+vn -1.000000 0.000100 0.000400
+vn -0.707100 -0.664500 0.241800
+vn 0.000000 0.043600 0.999000
+vn 0.953700 -0.282600 0.102800
+vn 0.000000 -0.608800 -0.793400
+vn -0.953700 -0.282600 0.102800
+vn 0.196500 -0.698600 -0.688000
+vn -0.772800 -0.611700 -0.169500
+vn -0.247800 -0.430000 0.868100
+vn 0.780000 -0.556900 0.285400
+vn 0.369800 -0.927400 -0.056000
+vn -0.369800 -0.927400 -0.056000
+vn -0.369800 -0.674400 0.639000
+vn 0.369800 -0.674400 0.639000
+vn 0.395900 -0.914000 -0.088700
+vn -0.395900 -0.914000 -0.088700
+vn -0.395900 -0.643200 0.655400
+vn 0.395900 -0.643200 0.655400
+vn 0.000000 0.342000 0.939700
+vn -0.000000 1.000000 0.000000
+vn -0.000100 1.000000 0.000100
+vn -0.000200 1.000000 -0.000400
+vn 0.000200 1.000000 -0.000100
+vn 0.771000 0.553400 -0.315100
+vn -0.328600 0.430200 -0.840800
+vn -0.675200 0.683900 0.276300
+vn 0.239700 0.754100 0.611500
+vn 0.000100 1.000000 0.000000
+vn 0.000200 1.000000 -0.000300
+vn -0.000400 1.000000 -0.000100
+vn 0.772800 -0.611600 -0.169400
+vn 0.247800 -0.430000 0.868100
+vn -0.780000 -0.556900 0.285400
+vn -0.196500 -0.698600 -0.688000
+vn -0.238600 0.754400 0.611500
+vn -0.771100 0.553100 -0.315300
+vn 0.328900 0.430300 -0.840600
+vn 0.675200 0.683800 0.276800
+vn -0.242600 0.808200 0.536600
+vn -0.496000 0.687400 0.530500
+vn -0.431900 0.889200 -0.150600
+vn 0.263600 0.432600 -0.862200
+vn 0.708400 0.637200 -0.303500
+vn 0.139900 0.988100 -0.064600
+vn 0.575900 0.729100 -0.370000
+vn 0.087000 0.467700 -0.879600
+vn -0.200300 0.895600 -0.397100
+vn -0.204400 0.772800 -0.600800
+vn -0.191800 0.775600 -0.601400
+vn -0.374700 0.893900 -0.246300
+vn -0.489300 0.827500 -0.275300
+vn -0.713400 0.668600 0.209700
+vn 0.064800 0.973800 0.217800
+vn 0.096500 0.926300 0.364100
+vn 0.213000 0.867400 0.449800
+vn 0.088000 0.974100 0.208100
+vn 0.091000 0.972100 0.216100
+vn 0.687500 0.628700 0.363400
+vn 0.854600 0.163900 -0.492800
+vn 0.879200 0.202400 -0.431200
+vn 0.076000 0.401300 -0.912800
+vn 0.190600 0.586900 -0.786900
+vn -0.370900 0.345000 -0.862200
+vn -0.233200 0.221800 -0.946800
+vn -0.993100 0.107800 0.047000
+vn -0.989800 0.142200 -0.002000
+vn -0.972700 0.205500 0.108000
+vn -0.372600 0.417900 0.828500
+vn -0.247700 0.384800 0.889200
+vn -0.264000 0.377300 0.887600
+vn 0.751600 0.435400 0.495500
+vn 0.809500 0.412200 0.418100
+vn 0.700000 0.280800 0.656600
+vn 0.333100 0.517400 -0.788200
+vn -0.845100 -0.275100 -0.458500
+vn -0.911700 0.022500 0.410300
+vn 0.204200 0.051800 0.977600
+vn 0.968300 -0.124500 -0.216500
+vn -0.457500 -0.888400 -0.038400
+g Cylinder_Cylinder_flames
+s off
+f 72/1/1 73/2/1 75/3/1 74/4/1
+f 76/1/2 77/2/2 79/3/2 78/4/2
+f 80/1/3 82/4/3 83/3/3 81/2/3
+f 84/1/4 85/2/4 87/3/4 86/4/4
+g Cylinder_Cylinder_bracket
+f 9/5/5 10/6/5 11/7/5 12/8/5
+f 26/9/6 11/10/6 12/11/6 21/12/6
+f 17/13/5 18/14/5 19/15/5 20/16/5
+f 25/17/7 27/18/7 18/19/7 17/2/7
+f 12/8/8 20/16/8 17/13/8 9/5/8
+f 21/12/9 12/11/9 20/20/9 22/21/9
+f 10/22/10 11/23/10 19/16/10 18/15/10
+f 11/10/11 26/9/11 28/24/11 19/1/11
+f 28/18/2 22/16/2 20/25/2 19/19/2
+f 9/26/12 23/27/12 25/21/12 17/20/12
+f 23/27/13 9/26/13 10/28/13 24/29/13
+f 24/29/14 10/28/14 18/25/14 27/30/14
+g Cylinder_Cylinder_torch-body
+f 29/31/15 2/32/15 36/33/15
+f 3/34/16 35/35/16 30/36/16
+f 30/36/16 35/35/16 4/37/16
+f 32/38/17 34/39/17 1/40/17
+f 2/2/18 31/41/18 37/42/18
+f 95/43/19 13/44/19 5/45/19 91/46/19
+f 92/47/20 16/48/20 8/49/20 88/50/20
+f 93/51/21 15/52/21 7/53/21 89/54/21
+f 94/55/22 14/56/22 6/57/22 90/58/22
+f 3/34/15 29/31/15 36/33/15
+f 31/41/18 1/37/18 37/42/18
+f 4/59/17 34/39/17 32/38/17
+f 34/60/23 4/37/23 35/35/23
+f 34/61/24 37/42/24 1/37/24
+f 36/33/25 2/32/25 37/62/25
+f 35/63/26 3/34/26 36/33/26
+f 33/64/27 34/60/27 35/35/27
+f 33/65/28 37/42/28 34/61/28
+f 33/66/29 36/33/29 37/62/29
+f 33/66/30 35/63/30 36/33/30
+f 2/67/31 3/4/31 6/1/31 89/68/31 7/69/31
+f 8/70/2 1/71/2 2/67/2 7/69/2 88/72/2
+f 4/73/5 1/19/5 8/14/5 91/74/5 5/75/5
+f 6/71/7 3/70/7 4/73/7 5/75/7 90/15/7
+f 95/76/32 16/77/32 41/78/32 99/79/32
+f 94/80/33 13/81/33 38/82/33 98/83/33
+f 93/84/34 14/85/34 39/86/34 97/71/34
+f 92/87/35 15/88/35 40/89/35 96/90/35
+f 96/91/36 40/92/36 43/93/36 100/94/36
+f 97/95/37 39/96/37 44/97/37 101/98/37
+f 98/99/38 38/100/38 45/101/38 102/102/38
+f 99/103/39 41/104/39 42/105/39 103/106/39
+f 16/77/40 92/87/40 96/90/40 41/78/40
+f 15/88/41 93/72/41 97/70/41 40/89/41
+f 14/85/42 94/80/42 98/83/42 39/86/42
+f 13/81/32 95/76/32 99/79/32 38/82/32
+f 13/44/43 94/55/43 90/58/43 5/45/43
+f 14/56/44 93/68/44 89/20/44 6/57/44
+f 15/52/45 92/47/45 88/50/45 7/53/45
+f 16/48/46 95/43/46 91/46/46 8/49/46
+f 38/100/47 99/103/47 103/106/47 45/101/47
+f 39/96/48 98/99/48 102/102/48 44/97/48
+f 40/92/49 97/107/49 101/108/49 43/93/49
+f 41/104/50 96/91/50 100/94/50 42/105/50
+g Cylinder_Cylinder_coal
+f 46/109/51 62/110/51 67/111/51
+f 47/112/52 63/113/52 69/114/52
+f 48/115/53 64/116/53 70/117/53
+f 49/118/54 65/119/54 71/120/54
+f 50/121/55 66/122/55 68/123/55
+f 68/123/56 71/120/56 51/124/56
+f 68/123/57 66/122/57 71/120/57
+f 66/122/58 49/118/58 71/120/58
+f 71/120/59 70/117/59 51/124/59
+f 71/120/60 65/119/60 70/117/60
+f 65/119/61 48/115/61 70/117/61
+f 70/117/62 69/114/62 51/124/62
+f 70/117/63 64/116/63 69/114/63
+f 64/116/64 47/112/64 69/114/64
+f 69/114/65 67/111/65 51/124/65
+f 69/114/66 63/113/66 67/111/66
+f 63/113/67 46/109/67 67/111/67
+f 67/111/68 68/123/68 51/124/68
+f 67/111/69 62/110/69 68/123/69
+f 62/110/70 50/121/70 68/123/70
+f 53/125/71 66/122/71 50/121/71
+f 53/125/72 60/126/72 66/122/72
+f 60/126/73 49/118/73 66/122/73
+f 61/127/74 65/119/74 49/118/74
+f 61/127/75 58/128/75 65/119/75
+f 58/128/76 48/115/76 65/119/76
+f 59/129/77 64/116/77 48/115/77
+f 59/129/78 56/130/78 64/116/78
+f 56/130/79 47/112/79 64/116/79
+f 57/131/80 63/113/80 47/112/80
+f 57/131/81 54/132/81 63/113/81
+f 54/132/82 46/109/82 63/113/82
+f 55/133/83 62/110/83 46/109/83
+f 55/133/84 52/134/84 62/110/84
+f 52/134/85 50/121/85 62/110/85
+f 60/126/86 61/127/86 49/118/86
+f 58/128/87 59/129/87 48/115/87
+f 56/130/88 57/131/88 47/112/88
+f 54/132/89 55/133/89 46/109/89
+f 52/134/90 53/125/90 50/121/90
+f 56/130/91 59/129/91 57/131/91