From 4ac7b55d2f93bcc613d0f0edb068bbdeb7616afa Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 26 Apr 2015 18:27:39 -0400 Subject: [PATCH] add generic gold tile, use it for trophy tweak trophy UV map to use more of it. --- homedecor/misc-nodes.lua | 2 +- homedecor/models/homedecor_trophy.obj | 305 ++++++++++++--------- homedecor/textures/homedecor_tile_gold.png | Bin 0 -> 381 bytes 3 files changed, 176 insertions(+), 131 deletions(-) create mode 100644 homedecor/textures/homedecor_tile_gold.png diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 735ea36a..09f660e7 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -495,7 +495,7 @@ homedecor.register("trophy", { mesh = "homedecor_trophy.obj", tiles = { "default_wood.png", - "default_gold_block.png" + "homedecor_tile_gold.png" }, inventory_image = "homedecor_trophy_inv.png", groups = { snappy=3 }, diff --git a/homedecor/models/homedecor_trophy.obj b/homedecor/models/homedecor_trophy.obj index 33399e4c..80ea19cc 100644 --- a/homedecor/models/homedecor_trophy.obj +++ b/homedecor/models/homedecor_trophy.obj @@ -405,17 +405,21 @@ vt 0.562500 0.500000 vt 0.562500 0.812500 vt 0.562500 0.875000 vt 0.562500 0.750000 -vt 0.375000 0.250000 -vt 0.312500 0.250000 -vt 0.250000 0.250000 -vt 0.750000 0.250000 -vt 0.687500 0.250000 -vt 0.625000 0.250000 -vt 0.562500 0.250000 +vt 0.125000 0.250000 +vt 0.062500 0.562500 +vt 0.062500 0.250000 +vt 0.000000 0.562500 +vt 0.000000 0.250000 +vt 1.000000 0.250000 +vt 1.000000 0.562500 +vt 0.937500 0.562500 +vt 0.937500 0.250000 +vt 0.875000 0.250000 +vt 0.812500 0.250000 vt 0.582643 0.623684 vt 0.529020 0.645895 -vt 0.500000 0.250000 -vt 0.437500 0.250000 +vt 0.750000 0.250000 +vt 0.687500 0.250000 vt 0.572947 0.485490 vt 0.682369 0.463725 vt 0.682369 0.536275 @@ -432,15 +436,23 @@ vt 0.541321 0.438159 vt 0.603304 0.345396 vt 0.536276 0.317631 vt 0.514510 0.427054 -vt 0.375000 0.062500 -vt 0.312500 0.062500 -vt 0.250000 0.062500 -vt 0.750000 0.062500 -vt 0.687500 0.062500 -vt 0.625000 0.062500 -vt 0.562500 0.062500 -vt 0.500000 0.062500 -vt 0.437500 0.062500 +vt 0.125000 0.375000 +vt 0.062500 0.375000 +vt 0.000000 0.375000 +vt 1.000000 0.375000 +vt 0.937500 0.375000 +vt 0.875000 0.375000 +vt 0.812500 0.375000 +vt 0.750000 0.375000 +vt 0.687500 0.375000 +vt 0.500000 0.250000 +vt 0.437500 0.250000 +vt 0.375000 0.250000 +vt 0.312500 0.250000 +vt 0.250000 0.250000 +vt 0.187500 0.250000 +vt 0.625000 0.250000 +vt 0.562500 0.250000 vt 0.603304 0.654605 vt 0.541322 0.561842 vt 0.536276 0.682369 @@ -457,6 +469,22 @@ vt 0.317631 0.463724 vt 0.427053 0.485490 vt 0.345395 0.396696 vt 0.438158 0.458678 +vt 0.312500 0.375000 +vt 0.250000 0.375000 +vt 0.187500 0.375000 +vt 0.625000 0.375000 +vt 0.375000 0.375000 +vt 0.562500 0.375000 +vt 0.437500 0.375000 +vt 0.500000 0.375000 +vt 0.937500 0.625000 +vt 0.062500 0.625000 +vt 1.000000 0.625000 +vt -0.000000 0.625000 +vt 0.937500 0.875000 +vt 0.062500 0.875000 +vt 1.000000 0.875000 +vt 0.000000 0.875000 vt 0.470980 0.645895 vt 0.417357 0.623684 vt 0.376316 0.582643 @@ -471,6 +499,23 @@ vt 0.623684 0.417357 vt 0.645895 0.470980 vt 0.645895 0.529020 vt 0.623684 0.582643 +vt 0.812500 0.062500 +vt 0.750000 0.062500 +vt 0.687500 0.062500 +vt 0.875000 0.062500 +vt 0.125000 0.062500 +vt 0.062500 0.062500 +vt 0.937500 0.062500 +vt 0.000000 0.062500 +vt 1.000000 0.062500 +vt 0.625000 0.062500 +vt 0.562500 0.062500 +vt 0.500000 0.062500 +vt 0.437500 0.062500 +vt 0.375000 0.062500 +vt 0.312500 0.062500 +vt 0.250000 0.062500 +vt 0.187500 0.062500 vn -0.731900 -0.665700 -0.145600 vn -0.980800 0.000000 -0.195100 vn -0.831500 0.000000 -0.555600 @@ -794,115 +839,115 @@ f 69/37/86 63/138/80 62/137/97 68/126/101 f 70/124/102 64/139/98 63/140/80 69/125/86 f 71/123/103 65/141/99 64/139/98 70/124/102 f 72/122/89 66/136/83 65/141/99 71/123/103 -f 80/142/104 81/113/105 83/106/106 82/143/107 -f 82/143/107 83/106/106 85/99/108 84/144/109 -f 84/145/109 85/68/108 87/75/110 86/146/111 -f 86/146/111 87/75/110 89/130/112 88/147/113 -f 88/147/113 89/130/112 91/137/114 90/148/115 -f 186/149/116 185/150/117 214/37/118 -f 90/148/115 91/137/114 93/126/119 92/151/120 -f 92/151/120 93/126/119 95/120/121 94/152/122 -f 143/153/123 144/154/124 146/155/125 145/156/126 -f 145/156/126 146/155/125 148/157/127 147/158/128 -f 141/159/129 142/160/130 144/154/124 143/153/123 -f 149/161/131 150/162/132 152/163/133 151/164/134 -f 139/165/135 140/166/136 142/160/130 141/159/129 -f 151/164/134 152/163/133 137/167/137 138/168/138 -f 138/168/138 137/167/137 140/166/136 139/165/135 -f 153/169/16 154/28/139 156/26/140 155/170/14 -f 155/170/14 156/26/140 158/24/141 157/171/12 -f 157/172/12 158/2/141 160/3/142 159/173/10 -f 159/173/10 160/3/142 162/19/143 161/174/8 -f 161/174/8 162/19/143 164/29/144 163/175/6 -f 163/175/6 164/29/144 166/33/145 165/176/2 -f 165/176/2 166/33/145 168/32/146 167/177/3 -f 137/145/137 74/68/147 75/75/148 140/146/136 -f 140/146/136 75/75/148 76/130/149 142/147/130 -f 142/147/130 76/130/149 77/137/150 144/148/124 -f 144/148/124 77/137/150 78/126/151 146/151/125 -f 146/151/125 78/126/151 79/120/152 148/152/127 -f 148/152/127 79/120/152 81/113/105 80/142/104 -f 94/152/122 95/120/121 96/113/153 150/142/132 -f 152/143/133 97/106/154 74/99/147 137/144/137 -f 150/142/132 96/113/153 97/106/154 152/143/133 -f 147/158/128 148/157/127 80/178/104 154/179/139 -f 154/179/139 80/178/104 82/180/107 156/181/140 -f 156/181/140 82/180/107 84/182/109 158/183/141 -f 158/183/141 84/182/109 86/184/111 160/185/142 -f 160/185/142 86/184/111 88/186/113 162/187/143 -f 162/187/143 88/186/113 90/188/115 164/189/144 -f 164/189/144 90/188/115 92/190/120 166/191/145 -f 166/191/145 92/190/120 94/192/122 168/193/146 -f 168/193/146 94/192/122 150/162/132 149/161/131 -f 128/175/24 143/29/123 145/33/126 130/176/22 -f 132/177/20 147/32/128 154/28/139 153/169/16 -f 167/177/3 168/32/146 149/28/131 134/169/17 -f 130/176/22 145/33/126 147/32/128 132/177/20 -f 126/174/26 141/19/129 143/29/123 128/175/24 -f 134/169/17 149/28/131 151/26/134 136/170/27 -f 124/173/30 139/3/135 141/19/129 126/174/26 -f 136/170/27 151/26/134 138/24/138 121/171/31 -f 121/172/31 138/2/138 139/3/135 124/173/30 -f 74/99/147 97/106/154 184/107/155 169/100/156 -f 75/75/148 74/68/147 169/66/156 170/73/157 -f 96/113/153 95/120/121 182/121/158 183/114/159 -f 95/120/121 93/126/119 181/127/160 182/121/158 -f 78/126/151 77/137/150 172/135/161 173/127/162 -f 89/130/112 87/75/110 178/73/163 179/128/164 -f 77/137/150 76/130/149 171/128/165 172/135/161 -f 83/106/106 81/113/105 175/114/166 176/107/167 -f 93/126/119 91/137/114 180/135/168 181/127/160 -f 76/130/149 75/75/148 170/73/157 171/128/165 -f 87/75/110 85/68/108 177/66/169 178/73/163 -f 97/106/154 96/113/153 183/114/159 184/107/155 -f 81/113/105 79/120/152 174/121/170 175/114/166 -f 91/137/114 89/130/112 179/128/164 180/135/168 -f 79/120/152 78/126/151 173/127/162 174/121/170 -f 85/99/108 83/106/106 176/107/167 177/100/169 -f 176/78/167 175/133/166 191/128/171 192/73/172 -f 174/140/170 173/125/162 189/127/173 190/135/174 -f 169/71/156 184/78/155 200/73/175 185/66/117 -f 172/118/161 171/111/165 187/114/176 188/121/177 -f 183/133/159 182/140/158 198/135/178 199/128/179 -f 170/104/157 169/97/156 185/100/117 186/107/116 -f 181/125/160 180/118/168 196/121/180 197/127/181 -f 179/111/164 178/104/163 194/107/182 195/114/183 -f 177/71/169 176/78/167 192/73/172 193/66/184 -f 175/133/166 174/140/170 190/135/174 191/128/171 -f 173/125/162 172/118/161 188/121/177 189/127/173 -f 184/78/155 183/133/159 199/128/179 200/73/175 -f 171/111/165 170/104/157 186/107/116 187/114/176 -f 182/140/158 181/125/160 197/127/181 198/135/178 -f 180/118/168 179/111/164 195/114/183 196/121/180 -f 178/104/163 177/97/169 193/100/184 194/107/182 -f 185/150/117 200/194/175 214/37/118 -f 200/194/175 199/195/179 214/37/118 -f 199/195/179 198/196/178 214/37/118 -f 198/196/178 197/197/181 214/37/118 -f 197/197/181 196/198/180 214/37/118 -f 196/198/180 195/199/183 214/37/118 -f 195/199/183 194/200/182 214/37/118 -f 194/200/182 193/201/184 214/37/118 -f 193/201/184 192/202/172 214/37/118 -f 192/202/172 191/203/171 214/37/118 -f 191/203/171 190/204/174 214/37/118 -f 190/204/174 189/205/173 214/37/118 -f 189/205/173 188/206/177 214/37/118 -f 188/206/177 187/207/176 214/37/118 -f 187/207/176 186/149/116 214/37/118 -f 229/175/185 230/148/185 232/151/186 231/176/186 -f 231/176/186 232/151/186 234/152/187 233/177/187 -f 227/174/188 228/147/188 230/148/185 229/175/185 -f 235/169/189 236/142/189 238/143/190 237/170/190 -f 225/173/191 226/146/191 228/147/188 227/174/188 -f 237/170/190 238/143/190 223/144/192 224/171/192 -f 224/172/192 223/145/192 226/146/191 225/173/191 -f 233/177/187 234/152/187 239/142/193 215/169/193 -f 215/169/193 239/142/193 240/143/194 216/170/194 -f 216/170/194 240/143/194 241/144/195 217/171/195 -f 217/172/195 241/145/195 242/146/196 218/173/196 -f 218/173/196 242/146/196 243/147/197 219/174/197 -f 219/174/197 243/147/197 244/148/198 220/175/198 -f 220/175/198 244/148/198 245/151/199 221/176/199 -f 221/176/199 245/151/199 246/152/200 222/177/200 -f 222/177/200 246/152/200 236/142/189 235/169/189 +f 80/142/104 81/91/105 83/143/106 82/144/107 +f 82/144/107 83/143/106 85/145/108 84/146/109 +f 84/147/109 85/148/108 87/149/110 86/150/111 +f 86/150/111 87/149/110 89/57/112 88/151/113 +f 88/151/113 89/57/112 91/56/114 90/152/115 +f 186/153/116 185/154/117 214/37/118 +f 90/152/115 91/56/114 93/68/119 92/155/120 +f 92/155/120 93/68/119 95/75/121 94/156/122 +f 143/157/123 144/158/124 146/159/125 145/160/126 +f 145/160/126 146/159/125 148/161/127 147/162/128 +f 141/163/129 142/164/130 144/158/124 143/157/123 +f 149/165/131 150/166/132 152/167/133 151/168/134 +f 139/169/135 140/170/136 142/164/130 141/163/129 +f 151/168/134 152/167/133 137/171/137 138/172/138 +f 138/172/138 137/171/137 140/170/136 139/169/135 +f 153/18/16 154/173/139 156/174/140 155/14/14 +f 155/14/14 156/174/140 158/175/141 157/15/12 +f 157/12/12 158/176/141 160/177/142 159/10/10 +f 159/10/10 160/177/142 162/178/143 161/8/8 +f 161/8/8 162/178/143 164/179/144 163/6/6 +f 163/6/6 164/179/144 166/180/145 165/2/2 +f 165/2/2 166/180/145 168/181/146 167/3/3 +f 137/182/137 74/126/147 75/120/148 140/183/136 +f 140/183/136 75/120/148 76/113/149 142/184/130 +f 142/184/130 76/113/149 77/106/150 144/185/124 +f 144/185/124 77/106/150 78/99/151 146/186/125 +f 146/186/125 78/99/151 79/90/152 148/187/127 +f 148/187/127 79/90/152 81/91/105 80/142/104 +f 94/156/122 95/75/121 96/130/153 150/188/132 +f 152/189/133 97/137/154 74/126/147 137/182/137 +f 150/188/132 96/130/153 97/137/154 152/189/133 +f 147/162/128 148/161/127 80/190/104 154/191/139 +f 154/191/139 80/190/104 82/192/107 156/193/140 +f 156/193/140 82/192/107 84/194/109 158/195/141 +f 158/195/141 84/194/109 86/196/111 160/197/142 +f 160/197/142 86/196/111 88/198/113 162/199/143 +f 162/199/143 88/198/113 90/200/115 164/201/144 +f 164/201/144 90/200/115 92/202/120 166/203/145 +f 166/203/145 92/202/120 94/204/122 168/205/146 +f 168/205/146 94/204/122 150/166/132 149/165/131 +f 128/26/24 143/206/123 145/207/126 130/24/22 +f 132/22/20 147/208/128 154/173/139 153/18/16 +f 167/3/3 168/181/146 149/209/131 134/19/17 +f 130/24/22 145/207/126 147/208/128 132/22/20 +f 126/28/26 141/210/129 143/206/123 128/26/24 +f 134/19/17 149/209/131 151/211/134 136/29/27 +f 124/32/30 139/212/135 141/210/129 126/28/26 +f 136/29/27 151/211/134 138/213/138 121/33/31 +f 121/33/31 138/213/138 139/212/135 124/32/30 +f 74/126/147 97/137/154 184/135/155 169/127/156 +f 75/120/148 74/126/147 169/127/156 170/121/157 +f 96/130/153 95/75/121 182/73/158 183/128/159 +f 95/75/121 93/68/119 181/66/160 182/73/158 +f 78/99/151 77/106/150 172/107/161 173/100/162 +f 89/57/112 87/149/110 178/214/163 179/53/164 +f 77/106/150 76/113/149 171/114/165 172/107/161 +f 83/143/106 81/91/105 175/93/166 176/215/167 +f 93/68/119 91/56/114 180/52/168 181/66/160 +f 76/113/149 75/120/148 170/121/157 171/114/165 +f 87/149/110 85/148/108 177/216/169 178/214/163 +f 97/137/154 96/130/153 183/128/159 184/135/155 +f 81/91/105 79/90/152 174/92/170 175/93/166 +f 91/56/114 89/57/112 179/53/164 180/52/168 +f 79/90/152 78/99/151 173/100/162 174/92/170 +f 85/145/108 83/143/106 176/215/167 177/217/169 +f 176/218/167 175/62/166 191/53/171 192/214/172 +f 174/63/170 173/71/162 189/66/173 190/52/174 +f 169/125/156 184/118/155 200/121/175 185/127/117 +f 172/78/161 171/133/165 187/128/176 188/73/177 +f 183/111/159 182/104/158 198/107/178 199/114/179 +f 170/140/157 169/125/156 185/127/117 186/135/116 +f 181/97/160 180/86/168 196/92/180 197/100/181 +f 179/87/164 178/219/163 194/215/182 195/93/183 +f 177/220/169 176/218/167 192/214/172 193/216/184 +f 175/62/166 174/63/170 190/52/174 191/53/171 +f 173/71/162 172/78/161 188/73/177 189/66/173 +f 184/118/155 183/111/159 199/114/179 200/121/175 +f 171/133/165 170/140/157 186/135/116 187/128/176 +f 182/104/158 181/97/160 197/100/181 198/107/178 +f 180/86/168 179/87/164 195/93/183 196/92/180 +f 178/219/163 177/221/169 193/217/184 194/215/182 +f 185/154/117 200/222/175 214/37/118 +f 200/222/175 199/223/179 214/37/118 +f 199/223/179 198/224/178 214/37/118 +f 198/224/178 197/225/181 214/37/118 +f 197/225/181 196/226/180 214/37/118 +f 196/226/180 195/227/183 214/37/118 +f 195/227/183 194/228/182 214/37/118 +f 194/228/182 193/229/184 214/37/118 +f 193/229/184 192/230/172 214/37/118 +f 192/230/172 191/231/171 214/37/118 +f 191/231/171 190/232/174 214/37/118 +f 190/232/174 189/233/173 214/37/118 +f 189/233/173 188/234/177 214/37/118 +f 188/234/177 187/235/176 214/37/118 +f 187/235/176 186/153/116 214/37/118 +f 229/236/185 230/6/185 232/2/186 231/237/186 +f 231/237/186 232/2/186 234/3/187 233/238/187 +f 227/239/188 228/8/188 230/6/185 229/236/185 +f 235/240/189 236/18/189 238/14/190 237/241/190 +f 225/242/191 226/10/191 228/8/188 227/239/188 +f 237/241/190 238/14/190 223/15/192 224/243/192 +f 224/244/192 223/12/192 226/10/191 225/242/191 +f 233/238/187 234/3/187 239/19/193 215/245/193 +f 215/245/193 239/19/193 240/29/194 216/246/194 +f 216/246/194 240/29/194 241/33/195 217/247/195 +f 217/247/195 241/33/195 242/32/196 218/248/196 +f 218/248/196 242/32/196 243/28/197 219/249/197 +f 219/249/197 243/28/197 244/26/198 220/250/198 +f 220/250/198 244/26/198 245/24/199 221/251/199 +f 221/251/199 245/24/199 246/22/200 222/252/200 +f 222/252/200 246/22/200 236/18/189 235/240/189 diff --git a/homedecor/textures/homedecor_tile_gold.png b/homedecor/textures/homedecor_tile_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..dda7f2d224a311ed7a33eb495619f0e8d2b33b90 GIT binary patch literal 381 zcmV-@0fPRCP)?Fw_BKWlvlxRI^I_EE@MED*3(9Aha8UaXZ0* zu?mFeCm>)>PM`O@7Iia!9&{=MVha|*>@pQ>#vcVA0|*I<-1hgNRMuXX{>`EHz1^^;2@9E`@ zW;u9FHQE*`F|WScQ$u^+x$d1m9q;a+o_Ft$;&y)P9e?Mye^ff&y+6vIm$%-%KMKNI b@7|yPt};Z{+-ftp00000NkvXXu0mjf<_W9% literal 0 HcmV?d00001