From dad386b56499eb7a2183062bb09d51b039f8ba99 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Fri, 16 Jan 2015 04:38:17 -0500
Subject: use animated water for pouring spigot

also remove a couple of extranous .mtl files and a redundant spigot texture
---
 models/pipeworks_spigot.obj         | 403 +++++++++++++-------------
 models/pipeworks_spigot_pouring.obj | 552 +++++++++++++++++++-----------------
 models/pipeworks_valve_off.mtl      |  11 -
 models/pipeworks_valve_on.mtl       |  11 -
 4 files changed, 492 insertions(+), 485 deletions(-)
 delete mode 100644 models/pipeworks_valve_off.mtl
 delete mode 100644 models/pipeworks_valve_on.mtl

(limited to 'models')

diff --git a/models/pipeworks_spigot.obj b/models/pipeworks_spigot.obj
index 615b9ff..f6e80c9 100644
--- a/models/pipeworks_spigot.obj
+++ b/models/pipeworks_spigot.obj
@@ -1,9 +1,8 @@
 # Blender v2.69 (sub 0) OBJ File: 'pipe-spigot.blend'
 # www.blender.org
-o pipe.001_Cylinder.000
+mtllib pipeworks_spigot.mtl
+o pipe.000_Cylinder.001
 v -0.122598 -0.024391 -0.024386
-v -0.122598 -0.187500 -0.024387
-v -0.122598 -0.187500 0.024386
 v -0.122598 -0.024391 0.024386
 v 0.129917 -0.250000 -0.086808
 v 0.153247 -0.250000 -0.030483
@@ -40,33 +39,19 @@ v 0.086808 -0.187500 -0.129917
 v 0.129917 -0.187500 -0.086808
 v 0.153248 -0.187500 -0.030483
 v 0.069446 -0.024391 -0.103934
-v 0.069446 -0.187500 -0.103934
-v 0.024386 -0.187500 -0.122598
 v 0.024386 -0.024391 -0.122598
 v 0.122598 -0.024391 -0.024386
-v 0.122598 -0.187500 -0.024386
-v 0.103933 -0.187500 -0.069446
 v 0.103934 -0.024391 -0.069446
 v 0.069446 -0.024391 0.103934
-v 0.069446 -0.187500 0.103933
-v 0.103934 -0.187500 0.069446
 v 0.103934 -0.024391 0.069446
 v 0.122598 -0.024391 0.024386
-v 0.122598 -0.187500 0.024386
 v 0.024386 -0.024391 0.122598
-v 0.024386 -0.187500 0.122598
 v -0.024386 -0.024391 0.122598
-v -0.024386 -0.187500 0.122598
 v -0.069446 -0.024391 0.103934
-v -0.069447 -0.187500 0.103933
 v -0.103934 -0.024391 0.069446
-v -0.103934 -0.187500 0.069446
 v -0.103934 -0.024391 -0.069446
-v -0.103934 -0.187500 -0.069447
 v -0.069446 -0.024391 -0.103934
-v -0.069446 -0.187500 -0.103934
 v -0.024386 -0.024391 -0.122598
-v -0.024386 -0.187500 -0.122598
 v -0.103934 0.041589 -0.041924
 v 0.103934 0.041589 -0.041925
 v 0.122598 0.009727 -0.010062
@@ -155,10 +140,22 @@ v 0.122598 -0.005780 -0.020763
 v 0.024386 0.031804 -0.111499
 v 0.069446 0.024662 -0.094256
 v -0.122598 0.009727 -0.010062
-vt 0.187500 0.578125
-vt 0.187500 0.328125
-vt 0.250000 0.328125
-vt 0.250000 0.578125
+v -0.122598 -0.246570 0.024386
+v -0.103934 -0.246570 0.069446
+v -0.069447 -0.246570 0.103934
+v -0.122598 -0.246570 -0.024386
+v 0.069446 -0.246571 0.103933
+v 0.122598 -0.246571 0.024386
+v 0.103934 -0.246571 0.069446
+v 0.103933 -0.246571 -0.069446
+v -0.024386 -0.246570 0.122598
+v 0.122598 -0.246571 -0.024386
+v -0.024386 -0.246571 -0.122598
+v 0.024386 -0.246571 -0.122598
+v 0.069446 -0.246571 -0.103934
+v -0.103934 -0.246570 -0.069446
+v -0.069446 -0.246570 -0.103934
+v 0.024386 -0.246570 0.122598
 vt 0.139725 0.682190
 vt 0.199773 0.657318
 vt 0.232270 0.820694
@@ -195,7 +192,9 @@ vt 0.672500 0.682190
 vt 0.612452 0.657318
 vt 0.125000 0.640625
 vt 0.125000 0.578125
+vt 0.187500 0.578125
 vt 0.187500 0.640625
+vt 0.250000 0.578125
 vt 0.250000 0.640625
 vt 0.062500 0.640625
 vt 0.062500 0.578125
@@ -225,21 +224,8 @@ vt 0.375000 0.640625
 vt 0.375000 0.578125
 vt 0.312500 0.640625
 vt 0.312500 0.578125
-vt 0.875000 0.328125
-vt 0.937500 0.328125
-vt 0.750000 0.328125
-vt 0.812500 0.328125
-vt 0.562500 0.328125
-vt 0.625000 0.328125
-vt 0.687500 0.328125
-vt 0.500000 0.328125
-vt 0.437500 0.328125
-vt 0.375000 0.328125
-vt 0.312500 0.328125
-vt 0.125000 0.328125
-vt 0.062500 0.328125
-vt 0.000000 0.328125
-vt 1.000000 0.328125
+vt 0.187500 0.453125
+vt 0.125000 0.453125
 vt 0.139892 0.682190
 vt 0.199940 0.657318
 vt 0.232437 0.820694
@@ -342,168 +328,185 @@ vt 0.988831 0.982323
 vt 0.988831 0.935448
 vt 0.801331 0.701073
 vt 0.754456 0.701073
+vt 0.250000 0.453125
+vt 0.875000 0.453125
+vt 0.937500 0.453125
+vt 0.750000 0.453125
+vt 0.812500 0.453125
+vt 0.562500 0.453125
+vt 0.625000 0.453125
+vt 0.687500 0.453125
+vt 0.500000 0.453125
+vt 0.437500 0.453125
+vt 0.375000 0.453125
+vt 0.312500 0.453125
+vt 0.062500 0.453125
+vt 0.000000 0.453125
+vt 1.000000 0.453125
+g pipe.000_Cylinder.001_metal
+usemtl metal
 s off
-f 1/1 2/2 3/3 4/4
-f 5/5 6/6 7/7
-f 8/8 5/5 7/7
-f 9/9 8/8 7/7
-f 10/10 9/9 7/7
-f 11/11 10/10 7/7
-f 12/12 11/11 7/7
-f 13/13 12/12 7/7
-f 14/14 13/13 7/7
-f 15/15 14/14 7/7
-f 16/16 15/15 7/7
-f 17/17 16/16 7/7
-f 18/18 17/17 7/7
-f 19/19 18/18 7/7
-f 20/20 19/19 7/7
-f 21/21 20/20 7/7
-f 22/22 23/23 24/24
-f 25/25 22/22 24/24
-f 26/26 25/25 24/24
-f 27/27 26/26 24/24
-f 28/28 27/27 24/24
-f 29/29 28/28 24/24
-f 30/30 29/29 24/24
-f 31/31 30/30 24/24
-f 32/32 31/31 24/24
-f 33/33 32/32 24/24
-f 34/34 33/33 24/24
-f 35/35 34/34 24/24
-f 36/36 35/35 24/24
-f 37/37 36/36 24/24
-f 38/38 37/37 24/24
-f 23/23 38/38 24/24
-f 6/6 21/21 7/7
-f 25/39 19/40 20/1 22/41
-f 22/41 20/1 21/4 23/42
-f 26/43 18/44 19/40 25/39
-f 27/45 17/46 18/44 26/43
-f 28/47 16/48 17/49 27/50
-f 29/51 15/52 16/48 28/47
-f 30/53 14/54 15/52 29/51
-f 31/55 13/56 14/54 30/53
-f 32/57 12/58 13/56 31/55
-f 33/59 11/60 12/58 32/57
-f 34/61 10/62 11/60 33/59
-f 35/63 9/64 10/62 34/61
-f 36/65 8/66 9/64 35/63
-f 37/67 5/68 8/66 36/65
-f 38/69 6/70 5/68 37/67
-f 23/42 21/4 6/70 38/69
-f 39/52 40/71 41/72 42/48
-f 43/56 44/73 45/74 46/54
-f 47/62 48/75 49/76 50/60
-f 51/58 52/77 44/73 43/56
-f 46/54 45/74 40/71 39/52
-f 50/60 49/76 52/77 51/58
-f 53/64 54/78 48/75 47/62
-f 55/66 56/79 54/78 53/64
-f 57/68 58/80 56/79 55/66
-f 59/70 60/81 58/80 57/68
-f 4/4 3/3 60/81 59/70
-f 2/2 1/1 61/40 62/82
-f 63/44 64/83 62/82 61/40
-f 65/46 66/84 64/83 63/44
-f 42/48 41/72 66/85 65/49
-f 85/86 86/87 87/88
-f 88/89 85/86 87/88
-f 89/90 88/89 87/88
-f 90/91 89/90 87/88
-f 91/92 90/91 87/88
-f 92/93 91/92 87/88
-f 93/94 92/93 87/88
-f 94/95 93/94 87/88
-f 95/96 94/95 87/88
-f 96/97 95/96 87/88
-f 97/98 96/97 87/88
-f 98/99 97/98 87/88
-f 99/100 98/99 87/88
-f 100/101 99/100 87/88
-f 101/102 100/101 87/88
-f 102/22 103/23 104/24
-f 105/25 102/22 104/24
-f 106/26 105/25 104/24
-f 107/27 106/26 104/24
-f 108/28 107/27 104/24
-f 109/29 108/28 104/24
-f 110/30 109/29 104/24
-f 111/31 110/30 104/24
-f 112/32 111/31 104/24
-f 113/33 112/32 104/24
-f 114/34 113/33 104/24
-f 115/35 114/34 104/24
-f 116/36 115/35 104/24
-f 117/37 116/36 104/24
-f 118/38 117/37 104/24
-f 103/23 118/38 104/24
-f 86/87 101/102 87/88
-f 105/39 99/40 100/1 102/41
-f 102/41 100/1 101/4 103/42
-f 106/43 98/44 99/40 105/39
-f 107/45 97/46 98/44 106/43
-f 108/47 96/48 97/49 107/50
-f 109/51 95/52 96/48 108/47
-f 110/53 94/54 95/52 109/51
-f 111/55 93/56 94/54 110/53
-f 112/57 92/58 93/56 111/55
-f 113/59 91/60 92/58 112/57
-f 114/61 90/62 91/60 113/59
-f 115/63 89/64 90/62 114/61
-f 116/65 88/66 89/64 115/63
-f 117/67 85/68 88/66 116/65
-f 118/69 86/70 85/68 117/67
-f 103/42 101/4 86/70 118/69
-f 119/103 120/104 121/105 122/106
-f 125/107 124/108 120/104 119/103
-f 128/109 127/110 130/111 129/112
-f 133/113 134/114 132/115 131/116
-f 135/117 136/118 134/114 133/113
-f 137/119 138/120 136/118 135/117
-f 84/121 83/122 138/120 137/119
-f 141/123 142/124 140/125 139/126
-f 143/127 144/128 142/124 141/123
-f 122/106 121/105 144/129 143/130
-f 4/131 82/132 83/122 84/121
-f 51/133 123/134 124/108 125/107
-f 145/135 126/136 127/110 128/109
-f 129/112 130/111 123/134 51/133
-f 131/116 132/115 126/136 145/135
-f 139/126 140/125 82/132 4/131
-f 51/137 43/138 151/139
-f 65/140 147/141 152/142 42/143
-f 42/143 152/142 153/144 39/145
-f 46/146 39/145 153/144 150/147
-f 46/146 150/147 151/148 43/149
-f 65/140 63/150 148/151 147/141
-f 63/152 61/153 149/154 148/155
-f 61/153 1/140 146/143 149/154
-f 4/45 146/156 1/157
-f 4/45 154/158 146/156
-f 4/45 79/159 154/158
-f 79/159 4/45 84/160
-f 137/161 73/162 79/146 84/149
-f 73/162 67/163 154/145 79/146
-f 149/154 146/143 154/145 67/163
-f 81/164 148/155 149/154 67/163
-f 80/165 147/141 148/151 81/166
-f 80/165 70/167 152/142 147/141
-f 70/167 71/168 153/144 152/142
-f 51/137 151/139 69/169
-f 51/137 69/169 77/170
-f 77/170 129/171 51/137
-f 150/147 68/172 69/173 151/148
-f 78/174 77/175 69/173 68/172
-f 68/172 150/147 153/144 71/168
-f 129/176 77/175 78/174 128/177
-f 78/174 68/172 71/168 72/178
-f 78/174 72/178 145/179 128/177
-f 76/180 72/178 71/168 70/167
-f 76/180 131/181 145/179 72/178
-f 80/165 75/182 76/180 70/167
-f 133/183 131/181 76/180 75/182
-f 135/184 133/183 75/182 74/185
-f 75/182 80/165 81/166 74/185
-f 74/186 81/164 67/163 73/162
-f 137/161 135/187 74/186 73/162
+f 3/1 4/2 5/3
+f 6/4 3/1 5/3
+f 7/5 6/4 5/3
+f 8/6 7/5 5/3
+f 9/7 8/6 5/3
+f 10/8 9/7 5/3
+f 11/9 10/8 5/3
+f 12/10 11/9 5/3
+f 13/11 12/10 5/3
+f 14/12 13/11 5/3
+f 15/13 14/12 5/3
+f 16/14 15/13 5/3
+f 17/15 16/14 5/3
+f 18/16 17/15 5/3
+f 19/17 18/16 5/3
+f 20/18 21/19 22/20
+f 23/21 20/18 22/20
+f 24/22 23/21 22/20
+f 25/23 24/22 22/20
+f 26/24 25/23 22/20
+f 27/25 26/24 22/20
+f 28/26 27/25 22/20
+f 29/27 28/26 22/20
+f 30/28 29/27 22/20
+f 31/29 30/28 22/20
+f 32/30 31/29 22/20
+f 33/31 32/30 22/20
+f 34/32 33/31 22/20
+f 35/33 34/32 22/20
+f 36/34 35/33 22/20
+f 21/19 36/34 22/20
+f 4/2 19/17 5/3
+f 23/35 17/36 18/37 20/38
+f 20/38 18/37 19/39 21/40
+f 24/41 16/42 17/36 23/35
+f 25/43 15/44 16/42 24/41
+f 26/45 14/46 15/47 25/48
+f 27/49 13/50 14/46 26/45
+f 28/51 12/52 13/50 27/49
+f 29/53 11/54 12/52 28/51
+f 30/55 10/56 11/54 29/53
+f 31/57 9/58 10/56 30/55
+f 32/59 8/60 9/58 31/57
+f 33/61 7/62 8/60 32/59
+f 34/63 6/64 7/62 33/61
+f 35/65 3/66 6/64 34/63
+f 36/67 4/68 3/66 35/65
+f 21/40 19/39 4/68 36/67
+f 142/69 1/37 48/36 152/70
+f 69/71 70/72 71/73
+f 72/74 69/71 71/73
+f 73/75 72/74 71/73
+f 74/76 73/75 71/73
+f 75/77 74/76 71/73
+f 76/78 75/77 71/73
+f 77/79 76/78 71/73
+f 78/80 77/79 71/73
+f 79/81 78/80 71/73
+f 80/82 79/81 71/73
+f 81/83 80/82 71/73
+f 82/84 81/83 71/73
+f 83/85 82/84 71/73
+f 84/86 83/85 71/73
+f 85/87 84/86 71/73
+f 86/18 87/19 88/20
+f 89/21 86/18 88/20
+f 90/22 89/21 88/20
+f 91/23 90/22 88/20
+f 92/24 91/23 88/20
+f 93/25 92/24 88/20
+f 94/26 93/25 88/20
+f 95/27 94/26 88/20
+f 96/28 95/27 88/20
+f 97/29 96/28 88/20
+f 98/30 97/29 88/20
+f 99/31 98/30 88/20
+f 100/32 99/31 88/20
+f 101/33 100/32 88/20
+f 102/34 101/33 88/20
+f 87/19 102/34 88/20
+f 70/72 85/87 71/73
+f 89/35 83/36 84/37 86/38
+f 86/38 84/37 85/39 87/40
+f 90/41 82/42 83/36 89/35
+f 91/43 81/44 82/42 90/41
+f 92/45 80/46 81/47 91/48
+f 93/49 79/50 80/46 92/45
+f 94/51 78/52 79/50 93/49
+f 95/53 77/54 78/52 94/51
+f 96/55 76/56 77/54 95/53
+f 97/57 75/58 76/56 96/55
+f 98/59 74/60 75/58 97/57
+f 99/61 73/62 74/60 98/59
+f 100/63 72/64 73/62 99/61
+f 101/65 69/66 72/64 100/63
+f 102/67 70/68 69/66 101/65
+f 87/40 85/39 70/68 102/67
+f 103/88 104/89 105/90 106/91
+f 109/92 108/93 104/89 103/88
+f 112/94 111/95 114/96 113/97
+f 117/98 118/99 116/100 115/101
+f 119/102 120/103 118/99 117/98
+f 121/104 122/105 120/103 119/102
+f 68/106 67/107 122/105 121/104
+f 125/108 126/109 124/110 123/111
+f 127/112 128/113 126/109 125/108
+f 106/91 105/90 128/114 127/115
+f 2/116 66/117 67/107 68/106
+f 43/118 107/119 108/93 109/92
+f 129/120 110/121 111/95 112/94
+f 113/97 114/96 107/119 43/118
+f 115/101 116/100 110/121 129/120
+f 123/111 124/110 66/117 2/116
+f 43/122 39/123 135/124
+f 50/125 131/126 136/127 38/128
+f 38/128 136/127 137/129 37/130
+f 40/131 37/130 137/129 134/132
+f 40/131 134/132 135/133 39/134
+f 50/125 49/135 132/136 131/126
+f 49/137 48/138 133/139 132/140
+f 48/138 1/125 130/128 133/139
+f 2/43 130/141 1/142
+f 2/43 138/143 130/141
+f 2/43 63/144 138/143
+f 63/144 2/43 68/145
+f 121/146 57/147 63/131 68/134
+f 57/147 51/148 138/130 63/131
+f 133/139 130/128 138/130 51/148
+f 65/149 132/140 133/139 51/148
+f 64/150 131/126 132/136 65/151
+f 64/150 54/152 136/127 131/126
+f 54/152 55/153 137/129 136/127
+f 43/122 135/124 53/154
+f 43/122 53/154 61/155
+f 61/155 113/156 43/122
+f 134/132 52/157 53/158 135/133
+f 62/159 61/160 53/158 52/157
+f 52/157 134/132 137/129 55/153
+f 113/161 61/160 62/159 112/162
+f 62/159 52/157 55/153 56/163
+f 62/159 56/163 129/164 112/162
+f 60/165 56/163 55/153 54/152
+f 60/165 115/166 129/164 56/163
+f 64/150 59/167 60/165 54/152
+f 117/168 115/166 60/165 59/167
+f 119/169 117/168 59/167 58/170
+f 59/167 64/150 65/151 58/170
+f 58/171 65/149 51/148 57/147
+f 121/146 119/172 58/171 57/147
+f 1/37 142/69 139/173 2/39
+f 37/50 151/174 150/175 38/46
+f 39/54 148/176 146/177 40/52
+f 41/60 143/178 145/179 42/58
+f 43/56 144/180 148/176 39/54
+f 40/52 146/177 151/174 37/50
+f 42/58 145/179 144/180 43/56
+f 44/62 154/181 143/178 41/60
+f 45/64 147/182 154/181 44/62
+f 46/66 141/183 147/182 45/64
+f 47/68 140/184 141/183 46/66
+f 2/39 139/173 140/184 47/68
+f 49/42 153/185 152/70 48/36
+f 50/44 149/186 153/185 49/42
+f 38/46 150/175 149/187 50/47
diff --git a/models/pipeworks_spigot_pouring.obj b/models/pipeworks_spigot_pouring.obj
index 34d73a6..50f653c 100644
--- a/models/pipeworks_spigot_pouring.obj
+++ b/models/pipeworks_spigot_pouring.obj
@@ -1,6 +1,129 @@
 # Blender v2.69 (sub 0) OBJ File: 'pipe-spigot-pouring.blend'
 # www.blender.org
+mtllib pipeworks_spigot_pouring.mtl
 o pipe.001_Cylinder.000
+v -0.094401 -0.559070 0.018777
+v -0.080029 -0.559070 0.053473
+v -0.053474 -0.559070 0.080029
+v -0.094401 -0.559070 -0.018778
+v 0.053473 -0.559070 0.080029
+v 0.094400 -0.559070 0.018777
+v 0.080029 -0.559070 0.053473
+v 0.080029 -0.559071 -0.053474
+v -0.018777 -0.559070 0.094400
+v 0.094400 -0.559071 -0.018777
+v -0.018777 -0.559071 -0.094401
+v 0.018777 -0.559071 -0.094401
+v 0.053473 -0.559071 -0.080029
+v -0.080029 -0.559070 -0.053474
+v -0.053474 -0.559070 -0.080029
+v 0.018777 -0.559070 0.094400
+v -0.000000 -0.559070 -0.000000
+v -0.094401 -0.243141 0.018777
+v -0.080029 -0.243141 0.053473
+v -0.053474 -0.243141 0.080029
+v -0.094401 -0.243141 -0.018778
+v 0.053473 -0.243141 0.080029
+v 0.094400 -0.243141 0.018777
+v 0.080029 -0.243141 0.053473
+v 0.080029 -0.243141 -0.053474
+v -0.018777 -0.243141 0.094400
+v 0.094400 -0.243141 -0.018777
+v -0.018777 -0.243141 -0.094401
+v 0.018777 -0.243141 -0.094401
+v 0.053473 -0.243141 -0.080029
+v -0.080029 -0.243141 -0.053474
+v -0.053474 -0.243141 -0.080029
+v 0.018777 -0.243141 0.094400
+vt 0.499995 0.000000
+vt 0.374998 0.000000
+vt 0.375003 1.000000
+vt 0.500001 1.000000
+vt 0.249999 0.000000
+vt 0.250003 1.000000
+vt 0.124999 0.000000
+vt 0.125002 1.000000
+vt 0.874999 0.000000
+vt 0.750001 0.000000
+vt 0.750000 1.000000
+vt 0.874999 1.000000
+vt 0.625002 0.000000
+vt 0.624999 1.000000
+vt 0.500003 0.000000
+vt 0.499998 1.000000
+vt 0.375006 0.000000
+vt 0.375000 1.000000
+vt 0.250008 0.000000
+vt 0.250001 1.000000
+vt 0.125008 0.000000
+vt 0.000010 0.000000
+vt 0.000000 1.000000
+vt 0.125000 1.000000
+vt 0.749993 0.000000
+vt 0.624993 0.000000
+vt 0.625001 1.000000
+vt 0.750002 1.000000
+vt 0.999987 0.000000
+vt 0.874991 0.000000
+vt 0.875002 1.000000
+vt 1.000000 1.000000
+vt 0.999997 0.000000
+vt 0.999998 1.000000
+vt 0.000003 1.000000
+vt 0.000002 0.000000
+vt 0.000000 0.400543
+vt 0.076119 0.216772
+vt 0.500000 0.500000
+vt 0.216773 0.076119
+vt 0.400545 0.000000
+vt 0.599455 0.000000
+vt 0.783226 0.076119
+vt 0.923879 0.216773
+vt 1.000000 0.400544
+vt 1.000000 0.599455
+vt 0.923881 0.783226
+vt 0.783227 0.923879
+vt 0.599455 1.000000
+vt 0.400545 1.000000
+vt 0.216772 0.923879
+vt 0.076119 0.783227
+vt 0.000000 0.599455
+g pipe.001_Cylinder.000_water
+usemtl water
+s off
+f 12/1 11/2 28/3 29/4
+f 11/2 15/5 32/6 28/3
+f 15/5 14/7 31/8 32/6
+f 1/9 2/10 19/11 18/12
+f 2/10 3/13 20/14 19/11
+f 3/13 9/15 26/16 20/14
+f 9/15 16/17 33/18 26/16
+f 16/17 5/19 22/20 33/18
+f 7/21 6/22 23/23 24/24
+f 8/25 13/26 30/27 25/28
+f 6/29 10/30 27/31 23/32
+f 5/19 7/21 24/24 22/20
+f 10/30 8/25 25/28 27/31
+f 13/26 12/1 29/4 30/27
+f 4/33 1/9 18/12 21/34
+f 21/35 31/8 14/7 4/36
+f 4/37 14/38 17/39
+f 14/38 15/40 17/39
+f 15/40 11/41 17/39
+f 11/41 12/42 17/39
+f 12/42 13/43 17/39
+f 13/43 8/44 17/39
+f 8/44 10/45 17/39
+f 10/45 6/46 17/39
+f 6/46 7/47 17/39
+f 7/47 5/48 17/39
+f 5/48 16/49 17/39
+f 16/49 9/50 17/39
+f 9/50 3/51 17/39
+f 3/51 2/52 17/39
+f 2/52 1/53 17/39
+f 1/53 4/37 17/39
+o pipe.000_Cylinder.001
 v -0.122598 -0.024391 -0.024386
 v -0.122598 -0.024391 0.024386
 v 0.129917 -0.250000 -0.086808
@@ -155,39 +278,6 @@ v 0.069446 -0.246571 -0.103934
 v -0.103934 -0.246570 -0.069446
 v -0.069446 -0.246570 -0.103934
 v 0.024386 -0.246570 0.122598
-v -0.098079 -0.593750 -0.019510
-v -0.098079 -0.593750 0.019509
-v 0.055556 -0.593750 -0.083147
-v 0.019508 -0.593750 -0.098078
-v 0.098078 -0.593750 -0.019509
-v 0.083146 -0.593750 -0.055557
-v 0.055557 -0.593750 0.083146
-v 0.083147 -0.593750 0.055557
-v 0.098078 -0.593750 0.019509
-v 0.019509 -0.593750 0.098078
-v -0.019509 -0.593750 0.098078
-v -0.055558 -0.593750 0.083146
-v -0.083147 -0.593750 0.055557
-v -0.083147 -0.593750 -0.055558
-v -0.055557 -0.593750 -0.083147
-v -0.019509 -0.593750 -0.098078
-v -0.000000 -0.593750 -0.000000
-v -0.098079 -0.246570 0.019509
-v -0.083147 -0.246570 0.055557
-v -0.055557 -0.246570 0.083147
-v -0.098079 -0.246570 -0.019509
-v 0.055557 -0.246571 0.083147
-v 0.098078 -0.246571 0.019509
-v 0.083147 -0.246571 0.055557
-v 0.083147 -0.246571 -0.055557
-v -0.019509 -0.246570 0.098078
-v 0.098078 -0.246571 -0.019509
-v -0.019509 -0.246571 -0.098078
-v 0.019509 -0.246571 -0.098079
-v 0.055557 -0.246571 -0.083147
-v -0.083147 -0.246570 -0.055557
-v -0.055557 -0.246570 -0.083147
-v 0.019509 -0.246570 0.098078
 vt 0.139725 0.682190
 vt 0.199773 0.657318
 vt 0.232270 0.820694
@@ -375,234 +465,170 @@ vt 0.312500 0.453125
 vt 0.062500 0.453125
 vt 0.000000 0.453125
 vt 1.000000 0.453125
-vt 0.187500 0.281250
-vt 0.250000 0.281250
-vt 0.875000 0.281250
-vt 0.937500 0.281250
-vt 0.750000 0.281250
-vt 0.812500 0.281250
-vt 0.562500 0.281250
-vt 0.625000 0.281250
-vt 0.687500 0.281250
-vt 0.500000 0.281250
-vt 0.437500 0.281250
-vt 0.375000 0.281250
-vt 0.312500 0.281250
-vt 0.062500 0.281250
-vt 0.125000 0.281250
-vt 0.000000 0.281250
-vt 1.000000 0.281250
-vt 0.036995 0.295282
-vt 0.068358 0.282292
-vt 0.085331 0.367623
-vt 0.102305 0.282292
-vt 0.133667 0.295282
-vt 0.157671 0.319287
-vt 0.170663 0.350650
-vt 0.170663 0.384596
-vt 0.157672 0.415959
-vt 0.133668 0.439963
-vt 0.102305 0.452954
-vt 0.068358 0.452954
-vt 0.036994 0.439963
-vt 0.012991 0.415959
-vt 0.000000 0.384596
-vt 0.000000 0.350649
-vt 0.012991 0.319286
+g pipe.000_Cylinder.001_metal
+usemtl metal
 s off
-f 3/1 4/2 5/3
-f 6/4 3/1 5/3
-f 7/5 6/4 5/3
-f 8/6 7/5 5/3
-f 9/7 8/6 5/3
-f 10/8 9/7 5/3
-f 11/9 10/8 5/3
-f 12/10 11/9 5/3
-f 13/11 12/10 5/3
-f 14/12 13/11 5/3
-f 15/13 14/12 5/3
-f 16/14 15/13 5/3
-f 17/15 16/14 5/3
-f 18/16 17/15 5/3
-f 19/17 18/16 5/3
-f 20/18 21/19 22/20
-f 23/21 20/18 22/20
-f 24/22 23/21 22/20
-f 25/23 24/22 22/20
-f 26/24 25/23 22/20
-f 27/25 26/24 22/20
-f 28/26 27/25 22/20
-f 29/27 28/26 22/20
-f 30/28 29/27 22/20
-f 31/29 30/28 22/20
-f 32/30 31/29 22/20
-f 33/31 32/30 22/20
-f 34/32 33/31 22/20
-f 35/33 34/32 22/20
-f 36/34 35/33 22/20
-f 21/19 36/34 22/20
-f 4/2 19/17 5/3
-f 23/35 17/36 18/37 20/38
-f 20/38 18/37 19/39 21/40
-f 24/41 16/42 17/36 23/35
-f 25/43 15/44 16/42 24/41
-f 26/45 14/46 15/47 25/48
-f 27/49 13/50 14/46 26/45
-f 28/51 12/52 13/50 27/49
-f 29/53 11/54 12/52 28/51
-f 30/55 10/56 11/54 29/53
-f 31/57 9/58 10/56 30/55
-f 32/59 8/60 9/58 31/57
-f 33/61 7/62 8/60 32/59
-f 34/63 6/64 7/62 33/61
-f 35/65 3/66 6/64 34/63
-f 36/67 4/68 3/66 35/65
-f 21/40 19/39 4/68 36/67
-f 142/69 1/37 48/36 152/70
-f 69/71 70/72 71/73
-f 72/74 69/71 71/73
-f 73/75 72/74 71/73
-f 74/76 73/75 71/73
-f 75/77 74/76 71/73
-f 76/78 75/77 71/73
-f 77/79 76/78 71/73
-f 78/80 77/79 71/73
-f 79/81 78/80 71/73
-f 80/82 79/81 71/73
-f 81/83 80/82 71/73
-f 82/84 81/83 71/73
-f 83/85 82/84 71/73
-f 84/86 83/85 71/73
-f 85/87 84/86 71/73
-f 86/18 87/19 88/20
-f 89/21 86/18 88/20
-f 90/22 89/21 88/20
-f 91/23 90/22 88/20
-f 92/24 91/23 88/20
-f 93/25 92/24 88/20
-f 94/26 93/25 88/20
-f 95/27 94/26 88/20
-f 96/28 95/27 88/20
-f 97/29 96/28 88/20
-f 98/30 97/29 88/20
-f 99/31 98/30 88/20
-f 100/32 99/31 88/20
-f 101/33 100/32 88/20
-f 102/34 101/33 88/20
-f 87/19 102/34 88/20
-f 70/72 85/87 71/73
-f 89/35 83/36 84/37 86/38
-f 86/38 84/37 85/39 87/40
-f 90/41 82/42 83/36 89/35
-f 91/43 81/44 82/42 90/41
-f 92/45 80/46 81/47 91/48
-f 93/49 79/50 80/46 92/45
-f 94/51 78/52 79/50 93/49
-f 95/53 77/54 78/52 94/51
-f 96/55 76/56 77/54 95/53
-f 97/57 75/58 76/56 96/55
-f 98/59 74/60 75/58 97/57
-f 99/61 73/62 74/60 98/59
-f 100/63 72/64 73/62 99/61
-f 101/65 69/66 72/64 100/63
-f 102/67 70/68 69/66 101/65
-f 87/40 85/39 70/68 102/67
-f 103/88 104/89 105/90 106/91
-f 109/92 108/93 104/89 103/88
-f 112/94 111/95 114/96 113/97
-f 117/98 118/99 116/100 115/101
-f 119/102 120/103 118/99 117/98
-f 121/104 122/105 120/103 119/102
-f 68/106 67/107 122/105 121/104
-f 125/108 126/109 124/110 123/111
-f 127/112 128/113 126/109 125/108
-f 106/91 105/90 128/114 127/115
-f 2/116 66/117 67/107 68/106
-f 43/118 107/119 108/93 109/92
-f 129/120 110/121 111/95 112/94
-f 113/97 114/96 107/119 43/118
-f 115/101 116/100 110/121 129/120
-f 123/111 124/110 66/117 2/116
-f 43/122 39/123 135/124
-f 50/125 131/126 136/127 38/128
-f 38/128 136/127 137/129 37/130
-f 40/131 37/130 137/129 134/132
-f 40/131 134/132 135/133 39/134
-f 50/125 49/135 132/136 131/126
-f 49/137 48/138 133/139 132/140
-f 48/138 1/125 130/128 133/139
-f 2/43 130/141 1/142
-f 2/43 138/143 130/141
-f 2/43 63/144 138/143
-f 63/144 2/43 68/145
-f 121/146 57/147 63/131 68/134
-f 57/147 51/148 138/130 63/131
-f 133/139 130/128 138/130 51/148
-f 65/149 132/140 133/139 51/148
-f 64/150 131/126 132/136 65/151
-f 64/150 54/152 136/127 131/126
-f 54/152 55/153 137/129 136/127
-f 43/122 135/124 53/154
-f 43/122 53/154 61/155
-f 61/155 113/156 43/122
-f 134/132 52/157 53/158 135/133
-f 62/159 61/160 53/158 52/157
-f 52/157 134/132 137/129 55/153
-f 113/161 61/160 62/159 112/162
-f 62/159 52/157 55/153 56/163
-f 62/159 56/163 129/164 112/162
-f 60/165 56/163 55/153 54/152
-f 60/165 115/166 129/164 56/163
-f 64/150 59/167 60/165 54/152
-f 117/168 115/166 60/165 59/167
-f 119/169 117/168 59/167 58/170
-f 59/167 64/150 65/151 58/170
-f 58/171 65/149 51/148 57/147
-f 121/146 119/172 58/171 57/147
-f 1/37 142/69 139/173 2/39
-f 37/50 151/174 150/175 38/46
-f 39/54 148/176 146/177 40/52
-f 41/60 143/178 145/179 42/58
-f 43/56 144/180 148/176 39/54
-f 40/52 146/177 151/174 37/50
-f 42/58 145/179 144/180 43/56
-f 44/62 154/181 143/178 41/60
-f 45/64 147/182 154/181 44/62
-f 46/66 141/183 147/182 45/64
-f 47/68 140/184 141/183 46/66
-f 2/39 139/173 140/184 47/68
-f 49/42 153/185 152/70 48/36
-f 50/44 149/186 153/185 49/42
-f 38/46 150/175 149/187 50/47
-f 175/69 155/188 156/189 172/173
-f 184/174 157/190 158/191 183/175
-f 181/176 159/192 160/193 179/177
-f 176/178 161/194 162/195 178/179
-f 177/180 163/196 159/192 181/176
-f 179/177 160/193 157/190 184/174
-f 178/179 162/195 163/196 177/180
-f 187/181 164/197 161/194 176/178
-f 180/182 165/198 164/197 187/181
-f 174/183 166/199 165/198 180/182
-f 173/184 167/200 166/199 174/183
-f 172/173 156/189 167/200 173/184
-f 186/185 169/201 168/202 185/70
-f 182/186 170/203 169/201 186/185
-f 183/175 158/191 170/204 182/187
-f 169/205 170/206 171/207
-f 170/206 158/208 171/207
-f 158/208 157/209 171/207
-f 157/209 160/210 171/207
-f 160/210 159/211 171/207
-f 159/211 163/212 171/207
-f 163/212 162/213 171/207
-f 162/213 161/214 171/207
-f 161/214 164/215 171/207
-f 164/215 165/216 171/207
-f 165/216 166/217 171/207
-f 166/217 167/218 171/207
-f 167/218 156/219 171/207
-f 156/219 155/220 171/207
-f 155/220 168/221 171/207
-f 168/221 169/205 171/207
-f 155/188 175/69 185/70 168/202
+f 36/54 37/55 38/56
+f 39/57 36/54 38/56
+f 40/58 39/57 38/56
+f 41/59 40/58 38/56
+f 42/60 41/59 38/56
+f 43/61 42/60 38/56
+f 44/62 43/61 38/56
+f 45/63 44/62 38/56
+f 46/64 45/63 38/56
+f 47/65 46/64 38/56
+f 48/66 47/65 38/56
+f 49/67 48/66 38/56
+f 50/68 49/67 38/56
+f 51/69 50/68 38/56
+f 52/70 51/69 38/56
+f 53/71 54/72 55/73
+f 56/74 53/71 55/73
+f 57/75 56/74 55/73
+f 58/76 57/75 55/73
+f 59/77 58/76 55/73
+f 60/78 59/77 55/73
+f 61/79 60/78 55/73
+f 62/80 61/79 55/73
+f 63/81 62/80 55/73
+f 64/82 63/81 55/73
+f 65/83 64/82 55/73
+f 66/84 65/83 55/73
+f 67/85 66/84 55/73
+f 68/86 67/85 55/73
+f 69/87 68/86 55/73
+f 54/72 69/87 55/73
+f 37/55 52/70 38/56
+f 56/88 50/89 51/90 53/91
+f 53/91 51/90 52/92 54/93
+f 57/94 49/95 50/89 56/88
+f 58/96 48/97 49/95 57/94
+f 59/98 47/99 48/100 58/101
+f 60/102 46/103 47/99 59/98
+f 61/104 45/105 46/103 60/102
+f 62/106 44/107 45/105 61/104
+f 63/108 43/109 44/107 62/106
+f 64/110 42/111 43/109 63/108
+f 65/112 41/113 42/111 64/110
+f 66/114 40/115 41/113 65/112
+f 67/116 39/117 40/115 66/114
+f 68/118 36/119 39/117 67/116
+f 69/120 37/121 36/119 68/118
+f 54/93 52/92 37/121 69/120
+f 175/122 34/90 81/89 185/123
+f 102/124 103/125 104/126
+f 105/127 102/124 104/126
+f 106/128 105/127 104/126
+f 107/129 106/128 104/126
+f 108/130 107/129 104/126
+f 109/131 108/130 104/126
+f 110/132 109/131 104/126
+f 111/133 110/132 104/126
+f 112/134 111/133 104/126
+f 113/135 112/134 104/126
+f 114/136 113/135 104/126
+f 115/137 114/136 104/126
+f 116/138 115/137 104/126
+f 117/139 116/138 104/126
+f 118/140 117/139 104/126
+f 119/71 120/72 121/73
+f 122/74 119/71 121/73
+f 123/75 122/74 121/73
+f 124/76 123/75 121/73
+f 125/77 124/76 121/73
+f 126/78 125/77 121/73
+f 127/79 126/78 121/73
+f 128/80 127/79 121/73
+f 129/81 128/80 121/73
+f 130/82 129/81 121/73
+f 131/83 130/82 121/73
+f 132/84 131/83 121/73
+f 133/85 132/84 121/73
+f 134/86 133/85 121/73
+f 135/87 134/86 121/73
+f 120/72 135/87 121/73
+f 103/125 118/140 104/126
+f 122/88 116/89 117/90 119/91
+f 119/91 117/90 118/92 120/93
+f 123/94 115/95 116/89 122/88
+f 124/96 114/97 115/95 123/94
+f 125/98 113/99 114/100 124/101
+f 126/102 112/103 113/99 125/98
+f 127/104 111/105 112/103 126/102
+f 128/106 110/107 111/105 127/104
+f 129/108 109/109 110/107 128/106
+f 130/110 108/111 109/109 129/108
+f 131/112 107/113 108/111 130/110
+f 132/114 106/115 107/113 131/112
+f 133/116 105/117 106/115 132/114
+f 134/118 102/119 105/117 133/116
+f 135/120 103/121 102/119 134/118
+f 120/93 118/92 103/121 135/120
+f 136/141 137/142 138/143 139/144
+f 142/145 141/146 137/142 136/141
+f 145/147 144/148 147/149 146/150
+f 150/151 151/152 149/153 148/154
+f 152/155 153/156 151/152 150/151
+f 154/157 155/158 153/156 152/155
+f 101/159 100/160 155/158 154/157
+f 158/161 159/162 157/163 156/164
+f 160/165 161/166 159/162 158/161
+f 139/144 138/143 161/167 160/168
+f 35/169 99/170 100/160 101/159
+f 76/171 140/172 141/146 142/145
+f 162/173 143/174 144/148 145/147
+f 146/150 147/149 140/172 76/171
+f 148/154 149/153 143/174 162/173
+f 156/164 157/163 99/170 35/169
+f 76/175 72/176 168/177
+f 83/178 164/179 169/180 71/181
+f 71/181 169/180 170/182 70/183
+f 73/184 70/183 170/182 167/185
+f 73/184 167/185 168/186 72/187
+f 83/178 82/188 165/189 164/179
+f 82/190 81/191 166/192 165/193
+f 81/191 34/178 163/181 166/192
+f 35/96 163/194 34/195
+f 35/96 171/196 163/194
+f 35/96 96/197 171/196
+f 96/197 35/96 101/198
+f 154/199 90/200 96/184 101/187
+f 90/200 84/201 171/183 96/184
+f 166/192 163/181 171/183 84/201
+f 98/202 165/193 166/192 84/201
+f 97/203 164/179 165/189 98/204
+f 97/203 87/205 169/180 164/179
+f 87/205 88/206 170/182 169/180
+f 76/175 168/177 86/207
+f 76/175 86/207 94/208
+f 94/208 146/209 76/175
+f 167/185 85/210 86/211 168/186
+f 95/212 94/213 86/211 85/210
+f 85/210 167/185 170/182 88/206
+f 146/214 94/213 95/212 145/215
+f 95/212 85/210 88/206 89/216
+f 95/212 89/216 162/217 145/215
+f 93/218 89/216 88/206 87/205
+f 93/218 148/219 162/217 89/216
+f 97/203 92/220 93/218 87/205
+f 150/221 148/219 93/218 92/220
+f 152/222 150/221 92/220 91/223
+f 92/220 97/203 98/204 91/223
+f 91/224 98/202 84/201 90/200
+f 154/199 152/225 91/224 90/200
+f 34/90 175/122 172/226 35/92
+f 70/103 184/227 183/228 71/99
+f 72/107 181/229 179/230 73/105
+f 74/113 176/231 178/232 75/111
+f 76/109 177/233 181/229 72/107
+f 73/105 179/230 184/227 70/103
+f 75/111 178/232 177/233 76/109
+f 77/115 187/234 176/231 74/113
+f 78/117 180/235 187/234 77/115
+f 79/119 174/236 180/235 78/117
+f 80/121 173/237 174/236 79/119
+f 35/92 172/226 173/237 80/121
+f 82/95 186/238 185/123 81/89
+f 83/97 182/239 186/238 82/95
+f 71/99 183/228 182/240 83/100
diff --git a/models/pipeworks_valve_off.mtl b/models/pipeworks_valve_off.mtl
deleted file mode 100644
index 8270973..0000000
--- a/models/pipeworks_valve_off.mtl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Blender MTL File: 'pipe-valve-off.blend'
-# Material Count: 1
-
-newmtl None
-Ns 0
-Ka 0.000000 0.000000 0.000000
-Kd 0.8 0.8 0.8
-Ks 0.8 0.8 0.8
-d 1
-illum 2
-map_Kd /home/vanessa/Minetest-related/mods/my_mods/pipeworks/textures/pipeworks_valve.png
diff --git a/models/pipeworks_valve_on.mtl b/models/pipeworks_valve_on.mtl
deleted file mode 100644
index d5c178e..0000000
--- a/models/pipeworks_valve_on.mtl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Blender MTL File: 'pipe-valve-on.blend'
-# Material Count: 1
-
-newmtl None
-Ns 0
-Ka 0.000000 0.000000 0.000000
-Kd 0.8 0.8 0.8
-Ks 0.8 0.8 0.8
-d 1
-illum 2
-map_Kd /home/vanessa/Minetest-related/mods/my_mods/pipeworks/textures/pipeworks_valve.png
-- 
cgit v1.2.3