From 791f58d790a56c6eaebe7d9ffef56a45eb3184d7 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Fri, 8 May 2015 23:21:57 -0400 Subject: [PATCH] fix plasma globe material ordering so that the glass renders properly and the base appears behind it. --- homedecor/lighting.lua | 4 +- homedecor/models/homedecor_plasma_ball.obj | 346 ++++++++++----------- 2 files changed, 175 insertions(+), 175 deletions(-) diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 18b56ced..845d5bb3 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -150,12 +150,12 @@ homedecor.register("plasma_ball", { description = "Plasma Ball", mesh = "homedecor_plasma_ball.obj", tiles = { + "homedecor_generic_plastic_black.png", { name = "homedecor_plasma_ball_streamers.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}, }, - "homedecor_plasma_ball_glass.png", - "homedecor_generic_plastic_black.png" + "homedecor_plasma_ball_glass.png" }, inventory_image = "homedecor_plasma_ball_inv.png", selection_box = { diff --git a/homedecor/models/homedecor_plasma_ball.obj b/homedecor/models/homedecor_plasma_ball.obj index ba6b7412..777ca117 100644 --- a/homedecor/models/homedecor_plasma_ball.obj +++ b/homedecor/models/homedecor_plasma_ball.obj @@ -1,6 +1,41 @@ # Blender v2.73 (sub 0) OBJ File: 'plasma-ball.blend' # www.blender.org -o streamers_Cylinder.002 +o base_Cylinder.007 +v -0.139130 -0.500000 0.139130 +v -0.139130 -0.500000 -0.139130 +v 0.139130 -0.500000 -0.139130 +v 0.139130 -0.500000 0.139130 +v -0.086956 -0.326087 0.086956 +v -0.086956 -0.326087 -0.086956 +v 0.086956 -0.326087 -0.086956 +v 0.086956 -0.326087 0.086956 +vt 0.000000 0.812500 +vt 0.000000 0.187500 +vt 0.566168 0.000000 +vt 0.566168 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.867665 0.000000 +vt 0.867665 1.000000 +vt 0.457709 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.625000 +vt 0.457710 0.625000 +vn -0.957800 0.287300 0.000000 +vn 0.000000 0.287300 -0.957800 +vn 0.957800 0.287300 0.000000 +vn 0.000000 0.287300 0.957800 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +g base_Cylinder.007_base +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 6/1/2 7/2/2 3/3/2 2/4/2 +f 7/1/3 8/2/3 4/3/3 3/4/3 +f 8/1/4 5/2/4 1/3/4 4/4/4 +f 1/5/5 2/6/5 3/7/5 4/8/5 +f 8/9/6 7/10/6 6/11/6 5/12/6 +o streamers_Cylinder.006 v -0.170156 -0.006805 0.000468 v -0.170156 -0.341022 0.000468 v 0.170156 -0.006805 0.000468 @@ -35,15 +70,15 @@ vn -0.866000 -0.000000 0.500000 vn 0.866000 -0.000000 -0.500000 vn 0.866000 -0.000000 0.500000 vn -0.866000 -0.000000 -0.500000 -g streamers_Cylinder.002_streamers +g streamers_Cylinder.006_streamers s off -f 1/1/1 3/2/1 4/3/1 2/4/1 -f 5/2/2 7/1/2 8/4/2 6/3/2 -f 9/1/3 11/2/3 12/3/3 10/4/3 -f 13/2/4 15/1/4 16/4/4 14/3/4 -f 20/2/5 18/1/5 17/4/5 19/3/5 -f 24/1/6 22/2/6 21/3/6 23/4/6 -o globe_Cylinder.001 +f 9/13/7 11/14/7 12/15/7 10/16/7 +f 13/14/8 15/13/8 16/16/8 14/15/8 +f 17/13/9 19/14/9 20/15/9 18/16/9 +f 21/14/10 23/13/10 24/16/10 22/15/10 +f 28/14/11 26/13/11 25/16/11 27/15/11 +f 32/13/12 30/14/12 29/15/12 31/16/12 +o globe_Cylinder.005 v -0.066554 -0.013239 0.000000 v -0.122975 -0.050938 0.000000 v -0.160675 -0.107360 0.000000 @@ -454,168 +489,133 @@ vn -0.108900 0.994000 0.000000 vn 0.041700 0.994000 0.100600 vn 0.077000 0.994000 0.077000 vn 0.000000 1.000000 0.000000 -g globe_Cylinder.001_globe +g globe_Cylinder.005_globe s 1 -f 31/5/7 30/6/8 37/7/9 38/8/10 -f 30/6/8 29/9/11 36/10/12 37/7/9 -f 29/9/11 28/11/13 35/12/14 36/10/12 -f 28/11/13 27/13/15 34/14/16 35/12/14 -f 27/13/15 26/15/17 33/16/18 34/14/16 -f 26/15/17 25/17/19 32/18/20 33/16/18 -f 38/8/10 37/7/9 44/19/21 45/20/22 -f 37/7/9 36/10/12 43/21/23 44/19/21 -f 36/10/12 35/12/14 42/22/24 43/21/23 -f 35/12/14 34/14/16 41/23/25 42/22/24 -f 34/14/16 33/16/18 40/24/26 41/23/25 -f 33/16/18 32/18/20 39/25/27 40/24/26 -f 45/20/22 44/19/21 51/26/28 52/27/29 -f 44/19/21 43/21/23 50/28/30 51/26/28 -f 43/21/23 42/22/24 49/29/31 50/28/30 -f 42/22/24 41/23/25 48/30/32 49/29/31 -f 41/23/25 40/24/26 47/31/33 48/30/32 -f 40/24/26 39/25/27 46/32/34 47/31/33 -f 52/27/29 51/26/28 58/33/35 59/34/36 -f 51/26/28 50/28/30 57/35/37 58/33/35 -f 50/28/30 49/29/31 56/36/38 57/35/37 -f 49/29/31 48/30/32 55/37/39 56/36/38 -f 48/30/32 47/31/33 54/38/40 55/37/39 -f 47/31/33 46/32/34 53/39/41 54/38/40 -f 59/34/36 58/33/35 65/40/42 66/41/43 -f 58/33/35 57/35/37 64/42/44 65/40/42 -f 57/35/37 56/36/38 63/43/45 64/42/44 -f 56/36/38 55/37/39 62/44/46 63/43/45 -f 55/37/39 54/38/40 61/45/47 62/44/46 -f 54/38/40 53/39/41 60/46/48 61/45/47 -f 66/41/43 65/40/42 72/47/49 73/48/50 -f 65/40/42 64/42/44 71/49/51 72/47/49 -f 64/42/44 63/43/45 70/50/52 71/49/51 -f 63/43/45 62/44/46 69/51/53 70/50/52 -f 62/44/46 61/45/47 68/52/54 69/51/53 -f 61/45/47 60/46/48 67/53/55 68/52/54 -f 73/48/50 72/47/49 79/54/56 80/55/57 -f 72/47/49 71/49/51 78/56/58 79/54/56 -f 71/49/51 70/50/52 77/57/59 78/56/58 -f 70/50/52 69/51/53 76/58/60 77/57/59 -f 69/51/53 68/52/54 75/59/61 76/58/60 -f 68/52/54 67/53/55 74/60/62 75/59/61 -f 80/55/57 79/54/56 86/61/63 87/62/64 -f 79/54/56 78/56/58 85/63/65 86/61/63 -f 78/56/58 77/57/59 84/64/66 85/63/65 -f 77/57/59 76/58/60 83/65/67 84/64/66 -f 76/58/60 75/59/61 82/66/68 83/65/67 -f 75/59/61 74/60/62 81/67/69 82/66/68 -f 87/62/64 86/61/63 93/68/70 94/69/71 -f 86/61/63 85/63/65 92/70/72 93/68/70 -f 85/63/65 84/64/66 91/71/73 92/70/72 -f 84/64/66 83/65/67 90/72/74 91/71/73 -f 83/65/67 82/66/68 89/73/75 90/72/74 -f 82/66/68 81/67/69 88/74/76 89/73/75 -f 94/69/71 93/68/70 100/75/77 101/76/78 -f 93/68/70 92/70/72 99/77/79 100/75/77 -f 92/70/72 91/71/73 98/78/80 99/77/79 -f 91/71/73 90/72/74 97/79/81 98/78/80 -f 90/72/74 89/73/75 96/80/82 97/79/81 -f 89/73/75 88/74/76 95/81/83 96/80/82 -f 101/76/78 100/75/77 107/82/84 108/83/85 -f 100/75/77 99/77/79 106/84/86 107/82/84 -f 99/77/79 98/78/80 105/85/87 106/84/86 -f 98/78/80 97/79/81 104/86/88 105/85/87 -f 97/79/81 96/80/82 103/87/89 104/86/88 -f 96/80/82 95/81/83 102/88/90 103/87/89 -f 108/83/85 107/82/84 114/89/91 115/90/92 -f 107/82/84 106/84/86 113/91/93 114/89/91 -f 106/84/86 105/85/87 112/92/94 113/91/93 -f 105/85/87 104/86/88 111/93/95 112/92/94 -f 104/86/88 103/87/89 110/94/96 111/93/95 -f 103/87/89 102/88/90 109/95/97 110/94/96 -f 115/96/92 114/97/91 121/98/98 122/99/99 -f 114/97/91 113/100/93 120/101/100 121/98/98 -f 113/100/93 112/102/94 119/103/101 120/101/100 -f 112/102/94 111/104/95 118/105/102 119/103/101 -f 111/104/95 110/106/96 117/107/103 118/105/102 -f 110/106/96 109/108/97 116/109/104 117/107/103 -f 122/99/99 121/98/98 128/110/105 129/111/106 -f 121/98/98 120/101/100 127/112/107 128/110/105 -f 120/101/100 119/103/101 126/113/108 127/112/107 -f 119/103/101 118/105/102 125/114/109 126/113/108 -f 118/105/102 117/107/103 124/115/110 125/114/109 -f 117/107/103 116/109/104 123/116/111 124/115/110 -f 129/111/106 128/110/105 135/117/112 136/118/113 -f 128/110/105 127/112/107 134/119/114 135/117/112 -f 127/112/107 126/113/108 133/120/115 134/119/114 -f 126/113/108 125/114/109 132/121/116 133/120/115 -f 125/114/109 124/115/110 131/122/117 132/121/116 -f 124/115/110 123/116/111 130/123/118 131/122/117 -f 136/118/113 135/117/112 30/6/8 31/5/7 -f 135/117/112 134/119/114 29/9/11 30/6/8 -f 134/119/114 133/120/115 28/11/13 29/9/11 -f 133/120/115 132/121/116 27/13/15 28/11/13 -f 132/121/116 131/122/117 26/15/17 27/13/15 -f 131/122/117 130/123/118 25/17/19 26/15/17 -f 88/124/76 81/125/69 145/126/119 146/127/120 -f 81/125/69 74/128/62 144/129/121 145/126/119 -f 74/128/62 67/130/55 143/131/122 144/129/121 -f 67/130/55 60/132/48 142/133/123 143/131/122 -f 60/132/48 53/134/41 141/135/124 142/133/123 -f 53/134/41 46/136/34 140/137/125 141/135/124 -f 130/138/118 123/139/111 151/140/126 152/141/127 -f 46/136/34 39/142/27 139/143/128 140/137/125 -f 123/139/111 116/144/104 150/145/129 151/140/126 -f 39/142/27 32/146/20 138/147/130 139/143/128 -f 116/144/104 109/148/97 149/149/131 150/145/129 -f 25/150/19 130/138/118 152/141/127 137/151/132 -f 32/146/20 25/150/19 137/151/132 138/147/130 -f 109/148/97 102/152/90 148/153/133 149/149/131 -f 102/152/90 95/154/83 147/155/134 148/153/133 -f 95/154/83 88/124/76 146/127/120 147/155/134 -f 137/151/132 152/141/127 153/156/135 -f 152/141/127 151/140/126 153/156/135 -f 151/140/126 150/145/129 153/156/135 -f 150/145/129 149/149/131 153/156/135 -f 149/149/131 148/153/133 153/156/135 -f 148/153/133 147/155/134 153/156/135 -f 147/155/134 146/127/120 153/156/135 -f 146/127/120 145/126/119 153/156/135 -f 145/126/119 144/129/121 153/156/135 -f 144/129/121 143/131/122 153/156/135 -f 143/131/122 142/133/123 153/156/135 -f 142/133/123 141/135/124 153/156/135 -f 141/135/124 140/137/125 153/156/135 -f 140/137/125 139/143/128 153/156/135 -f 139/143/128 138/147/130 153/156/135 -f 138/147/130 137/151/132 153/156/135 -o base_Cylinder -v -0.139130 -0.500000 0.139130 -v -0.139130 -0.500000 -0.139130 -v 0.139130 -0.500000 -0.139130 -v 0.139130 -0.500000 0.139130 -v -0.086956 -0.326087 0.086956 -v -0.086956 -0.326087 -0.086956 -v 0.086956 -0.326087 -0.086956 -v 0.086956 -0.326087 0.086956 -vt 0.000000 0.812500 -vt 0.000000 0.187500 -vt 0.566168 0.000000 -vt 0.566168 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 0.867665 0.000000 -vt 0.867665 1.000000 -vt 0.457709 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.625000 -vt 0.457710 0.625000 -vn -0.957800 0.287300 0.000000 -vn 0.000000 0.287300 -0.957800 -vn 0.957800 0.287300 0.000000 -vn 0.000000 0.287300 0.957800 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 1.000000 0.000000 -g base_Cylinder_base -s off -f 158/157/136 159/158/136 155/159/136 154/160/136 -f 159/157/137 160/158/137 156/159/137 155/160/137 -f 160/157/138 161/158/138 157/159/138 156/160/138 -f 161/157/139 158/158/139 154/159/139 157/160/139 -f 154/161/140 155/162/140 156/163/140 157/164/140 -f 161/165/141 160/166/141 159/167/141 158/168/141 +f 39/17/13 38/18/14 45/19/15 46/20/16 +f 38/18/14 37/21/17 44/22/18 45/19/15 +f 37/21/17 36/23/19 43/24/20 44/22/18 +f 36/23/19 35/25/21 42/26/22 43/24/20 +f 35/25/21 34/27/23 41/28/24 42/26/22 +f 34/27/23 33/29/25 40/30/26 41/28/24 +f 46/20/16 45/19/15 52/31/27 53/32/28 +f 45/19/15 44/22/18 51/33/29 52/31/27 +f 44/22/18 43/24/20 50/34/30 51/33/29 +f 43/24/20 42/26/22 49/35/31 50/34/30 +f 42/26/22 41/28/24 48/36/32 49/35/31 +f 41/28/24 40/30/26 47/37/33 48/36/32 +f 53/32/28 52/31/27 59/38/34 60/39/35 +f 52/31/27 51/33/29 58/40/36 59/38/34 +f 51/33/29 50/34/30 57/41/37 58/40/36 +f 50/34/30 49/35/31 56/42/38 57/41/37 +f 49/35/31 48/36/32 55/43/39 56/42/38 +f 48/36/32 47/37/33 54/44/40 55/43/39 +f 60/39/35 59/38/34 66/45/41 67/46/42 +f 59/38/34 58/40/36 65/47/43 66/45/41 +f 58/40/36 57/41/37 64/48/44 65/47/43 +f 57/41/37 56/42/38 63/49/45 64/48/44 +f 56/42/38 55/43/39 62/50/46 63/49/45 +f 55/43/39 54/44/40 61/51/47 62/50/46 +f 67/46/42 66/45/41 73/52/48 74/53/49 +f 66/45/41 65/47/43 72/54/50 73/52/48 +f 65/47/43 64/48/44 71/55/51 72/54/50 +f 64/48/44 63/49/45 70/56/52 71/55/51 +f 63/49/45 62/50/46 69/57/53 70/56/52 +f 62/50/46 61/51/47 68/58/54 69/57/53 +f 74/53/49 73/52/48 80/59/55 81/60/56 +f 73/52/48 72/54/50 79/61/57 80/59/55 +f 72/54/50 71/55/51 78/62/58 79/61/57 +f 71/55/51 70/56/52 77/63/59 78/62/58 +f 70/56/52 69/57/53 76/64/60 77/63/59 +f 69/57/53 68/58/54 75/65/61 76/64/60 +f 81/60/56 80/59/55 87/66/62 88/67/63 +f 80/59/55 79/61/57 86/68/64 87/66/62 +f 79/61/57 78/62/58 85/69/65 86/68/64 +f 78/62/58 77/63/59 84/70/66 85/69/65 +f 77/63/59 76/64/60 83/71/67 84/70/66 +f 76/64/60 75/65/61 82/72/68 83/71/67 +f 88/67/63 87/66/62 94/73/69 95/74/70 +f 87/66/62 86/68/64 93/75/71 94/73/69 +f 86/68/64 85/69/65 92/76/72 93/75/71 +f 85/69/65 84/70/66 91/77/73 92/76/72 +f 84/70/66 83/71/67 90/78/74 91/77/73 +f 83/71/67 82/72/68 89/79/75 90/78/74 +f 95/74/70 94/73/69 101/80/76 102/81/77 +f 94/73/69 93/75/71 100/82/78 101/80/76 +f 93/75/71 92/76/72 99/83/79 100/82/78 +f 92/76/72 91/77/73 98/84/80 99/83/79 +f 91/77/73 90/78/74 97/85/81 98/84/80 +f 90/78/74 89/79/75 96/86/82 97/85/81 +f 102/81/77 101/80/76 108/87/83 109/88/84 +f 101/80/76 100/82/78 107/89/85 108/87/83 +f 100/82/78 99/83/79 106/90/86 107/89/85 +f 99/83/79 98/84/80 105/91/87 106/90/86 +f 98/84/80 97/85/81 104/92/88 105/91/87 +f 97/85/81 96/86/82 103/93/89 104/92/88 +f 109/88/84 108/87/83 115/94/90 116/95/91 +f 108/87/83 107/89/85 114/96/92 115/94/90 +f 107/89/85 106/90/86 113/97/93 114/96/92 +f 106/90/86 105/91/87 112/98/94 113/97/93 +f 105/91/87 104/92/88 111/99/95 112/98/94 +f 104/92/88 103/93/89 110/100/96 111/99/95 +f 116/95/91 115/94/90 122/101/97 123/102/98 +f 115/94/90 114/96/92 121/103/99 122/101/97 +f 114/96/92 113/97/93 120/104/100 121/103/99 +f 113/97/93 112/98/94 119/105/101 120/104/100 +f 112/98/94 111/99/95 118/106/102 119/105/101 +f 111/99/95 110/100/96 117/107/103 118/106/102 +f 123/108/98 122/109/97 129/110/104 130/111/105 +f 122/109/97 121/112/99 128/113/106 129/110/104 +f 121/112/99 120/114/100 127/115/107 128/113/106 +f 120/114/100 119/116/101 126/117/108 127/115/107 +f 119/116/101 118/118/102 125/119/109 126/117/108 +f 118/118/102 117/120/103 124/121/110 125/119/109 +f 130/111/105 129/110/104 136/122/111 137/123/112 +f 129/110/104 128/113/106 135/124/113 136/122/111 +f 128/113/106 127/115/107 134/125/114 135/124/113 +f 127/115/107 126/117/108 133/126/115 134/125/114 +f 126/117/108 125/119/109 132/127/116 133/126/115 +f 125/119/109 124/121/110 131/128/117 132/127/116 +f 137/123/112 136/122/111 143/129/118 144/130/119 +f 136/122/111 135/124/113 142/131/120 143/129/118 +f 135/124/113 134/125/114 141/132/121 142/131/120 +f 134/125/114 133/126/115 140/133/122 141/132/121 +f 133/126/115 132/127/116 139/134/123 140/133/122 +f 132/127/116 131/128/117 138/135/124 139/134/123 +f 144/130/119 143/129/118 38/18/14 39/17/13 +f 143/129/118 142/131/120 37/21/17 38/18/14 +f 142/131/120 141/132/121 36/23/19 37/21/17 +f 141/132/121 140/133/122 35/25/21 36/23/19 +f 140/133/122 139/134/123 34/27/23 35/25/21 +f 139/134/123 138/135/124 33/29/25 34/27/23 +f 96/136/82 89/137/75 153/138/125 154/139/126 +f 89/137/75 82/140/68 152/141/127 153/138/125 +f 82/140/68 75/142/61 151/143/128 152/141/127 +f 75/142/61 68/144/54 150/145/129 151/143/128 +f 68/144/54 61/146/47 149/147/130 150/145/129 +f 61/146/47 54/148/40 148/149/131 149/147/130 +f 138/150/124 131/151/117 159/152/132 160/153/133 +f 54/148/40 47/154/33 147/155/134 148/149/131 +f 131/151/117 124/156/110 158/157/135 159/152/132 +f 47/154/33 40/158/26 146/159/136 147/155/134 +f 124/156/110 117/160/103 157/161/137 158/157/135 +f 33/162/25 138/150/124 160/153/133 145/163/138 +f 40/158/26 33/162/25 145/163/138 146/159/136 +f 117/160/103 110/164/96 156/165/139 157/161/137 +f 110/164/96 103/166/89 155/167/140 156/165/139 +f 103/166/89 96/136/82 154/139/126 155/167/140 +f 145/163/138 160/153/133 161/168/141 +f 160/153/133 159/152/132 161/168/141 +f 159/152/132 158/157/135 161/168/141 +f 158/157/135 157/161/137 161/168/141 +f 157/161/137 156/165/139 161/168/141 +f 156/165/139 155/167/140 161/168/141 +f 155/167/140 154/139/126 161/168/141 +f 154/139/126 153/138/125 161/168/141 +f 153/138/125 152/141/127 161/168/141 +f 152/141/127 151/143/128 161/168/141 +f 151/143/128 150/145/129 161/168/141 +f 150/145/129 149/147/130 161/168/141 +f 149/147/130 148/149/131 161/168/141 +f 148/149/131 147/155/134 161/168/141 +f 147/155/134 146/159/136 161/168/141 +f 146/159/136 145/163/138 161/168/141