diff --git a/resources/assets/resonantinduction/models/wire.blend b/resources/assets/resonantinduction/models/wire.blend index 48331178..766a27b0 100644 Binary files a/resources/assets/resonantinduction/models/wire.blend and b/resources/assets/resonantinduction/models/wire.blend differ diff --git a/resources/assets/resonantinduction/models/wire.obj b/resources/assets/resonantinduction/models/wire.obj index 8a078574..4d2a200a 100644 --- a/resources/assets/resonantinduction/models/wire.obj +++ b/resources/assets/resonantinduction/models/wire.obj @@ -26,38 +26,28 @@ v -0.125000 0.375000 -0.500000 v -0.125000 0.625000 -0.500000 v 0.125000 0.625000 -0.500000 v 0.125000 0.375000 -0.500000 -vt 0.000058 0.000058 -vt 0.999942 0.000058 -vt 0.999942 0.333353 -vt 0.000058 0.333353 -vt 0.000058 0.333352 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.166667 0.000000 -vt 0.166667 0.174442 -vt 0.166667 0.833330 -vt 0.166667 1.000000 -vt 0.833333 1.000000 -vt 0.833333 0.833355 -vt 0.833333 0.000000 -vt 0.833333 0.174517 -vt 0.833333 0.833318 -vt 0.000058 1.001022 -vt 0.000058 0.656250 -vt 0.999942 0.656250 -vt 0.999942 1.001023 -vt 0.749971 1.001023 -vt 0.250029 1.001022 -vt 0.999942 0.666758 -vt 0.999942 1.000053 -vt 0.000058 1.000053 -vt 0.000058 0.666758 -vt 0.250029 0.666758 -vt 0.749971 0.666758 -vt 1.000000 0.656250 -vt 0.000000 0.656250 +vt 0.687500 0.562500 +vt 0.687500 0.937500 +vt 0.562500 0.937500 +vt 0.562500 0.562500 +vt 0.062500 0.437500 +vt 0.062500 0.062500 +vt 0.437500 0.062500 +vt 0.437500 0.437500 +vt 0.125000 0.062500 +vt 0.125000 0.125000 +vt 0.125000 0.375000 +vt 0.125000 0.437500 +vt 0.375000 0.437500 +vt 0.375000 0.375000 +vt 0.375000 0.062500 +vt 0.375000 0.125000 +vt 0.875000 0.937500 +vt 0.750000 0.937500 +vt 0.750000 0.562500 +vt 0.875000 0.562500 +vt 0.875000 0.625000 +vt 0.875000 0.875000 vn -1.000000 0.000000 -0.000000 vn 0.000000 -1.000000 -0.000000 vn 1.000000 0.000000 0.000000 @@ -68,19 +58,19 @@ usemtl None s off f 13/1/1 16/2/1 2/3/1 1/4/1 f 16/1/2 15/2/2 3/3/2 2/4/2 -f 15/3/3 14/5/3 4/1/3 3/2/3 -f 14/3/4 13/5/4 1/1/4 4/2/4 -f 1/6/5 2/7/5 3/8/5 4/9/5 -f 6/6/6 5/7/6 18/10/6 22/11/6 21/12/6 19/13/6 -f 17/14/6 19/13/6 21/12/6 24/15/6 -f 22/11/6 18/10/6 20/16/6 23/17/6 -f 8/8/6 7/9/6 17/14/6 24/18/6 23/17/6 20/16/6 -f 5/19/4 10/20/4 12/21/4 8/22/4 20/23/4 18/24/4 -f 7/25/2 11/26/2 9/27/2 6/28/2 19/29/2 17/30/2 -f 9/9/5 11/6/5 12/7/5 10/8/5 -f 6/25/1 9/26/1 10/27/1 5/28/1 -f 11/9/3 7/31/3 8/32/3 12/6/3 -f 14/8/6 15/9/6 16/6/6 13/7/6 +f 15/1/3 14/2/3 4/3/3 3/4/3 +f 14/1/4 13/2/4 1/3/4 4/4/4 +f 1/5/5 2/6/5 3/7/5 4/8/5 +f 6/5/6 5/6/6 18/9/6 22/10/6 21/11/6 19/12/6 +f 17/13/6 19/12/6 21/11/6 24/14/6 +f 22/10/6 18/9/6 20/15/6 23/16/6 +f 8/7/6 7/8/6 17/13/6 24/14/6 23/16/6 20/15/6 +f 5/17/4 10/18/4 12/19/4 8/20/4 20/21/4 18/22/4 +f 7/17/2 11/18/2 9/19/2 6/20/2 19/21/2 17/22/2 +f 9/8/5 11/5/5 12/6/5 10/7/5 +f 6/17/1 9/18/1 10/19/1 5/20/1 +f 11/18/3 7/17/3 8/20/3 12/19/3 +f 14/7/6 15/8/6 16/5/6 13/6/6 g eastInsulation v 0.187500 0.687500 0.187500 v 0.187500 0.687500 -0.187500 @@ -106,55 +96,49 @@ v 0.500000 0.625000 -0.125000 v 0.500000 0.625000 0.125000 v 0.500000 0.375000 0.125000 v 0.500000 0.375000 -0.125000 -vt 0.000058 0.000058 -vt 0.999942 0.000058 -vt 0.999942 0.333353 -vt 0.000058 0.333353 -vt 0.000058 0.333352 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.166667 0.000000 -vt 0.166667 0.174442 -vt 0.166667 0.833330 -vt 0.166667 1.000000 -vt 0.833333 1.000000 -vt 0.833333 0.833355 -vt 0.833333 0.000000 -vt 0.833333 0.174517 -vt 0.833333 0.833318 -vt 0.000058 1.001022 -vt 0.000058 0.656250 -vt 0.999942 0.656250 -vt 0.999942 1.001023 -vt 0.749971 1.001023 -vt 0.250029 1.001022 -vt 0.999942 0.666758 -vt 0.999942 1.000053 -vt 0.000058 1.000053 -vt 0.000058 0.666758 -vt 0.250029 0.666758 -vt 0.749971 0.666758 -vt 1.000000 0.656250 -vt 0.000000 0.656250 +vt 0.687500 0.562500 +vt 0.687500 0.937500 +vt 0.562500 0.937500 +vt 0.562500 0.562500 +vt 0.062500 0.937500 +vt 0.062500 0.562500 +vt 0.437500 0.562500 +vt 0.437500 0.937500 +vt 0.062500 0.437500 +vt 0.062500 0.062500 +vt 0.125000 0.062500 +vt 0.125000 0.125000 +vt 0.125000 0.375000 +vt 0.125000 0.437500 +vt 0.375000 0.437500 +vt 0.375000 0.375000 +vt 0.375000 0.062500 +vt 0.375000 0.125000 +vt 0.437500 0.062500 +vt 0.437500 0.437500 +vt 0.875000 0.937500 +vt 0.750000 0.937500 +vt 0.750000 0.562500 +vt 0.875000 0.562500 +vt 0.875000 0.625000 +vt 0.875000 0.875000 usemtl None s off -f 37/33/4 40/34/4 26/35/4 25/36/4 -f 40/33/6 39/34/6 27/35/6 26/36/6 -f 39/35/2 38/37/2 28/33/2 27/34/2 -f 38/35/5 37/37/5 25/33/5 28/34/5 -f 25/38/1 26/39/1 27/40/1 28/41/1 -f 30/38/3 29/39/3 42/42/3 46/43/3 45/44/3 43/45/3 -f 41/46/3 43/45/3 45/44/3 48/47/3 -f 46/43/3 42/42/3 44/48/3 47/49/3 -f 32/40/3 31/41/3 41/46/3 48/50/3 47/49/3 44/48/3 -f 29/51/5 34/52/5 36/53/5 32/54/5 44/55/5 42/56/5 -f 31/57/6 35/58/6 33/59/6 30/60/6 43/61/6 41/62/6 -f 33/41/1 35/38/1 36/39/1 34/40/1 -f 30/57/4 33/58/4 34/59/4 29/60/4 -f 35/41/2 31/63/2 32/64/2 36/38/2 -f 38/40/3 39/41/3 40/38/3 37/39/3 +f 37/23/4 40/24/4 26/25/4 25/26/4 +f 40/23/6 39/24/6 27/25/6 26/26/6 +f 39/23/2 38/24/2 28/25/2 27/26/2 +f 38/23/5 37/24/5 25/25/5 28/26/5 +f 25/27/1 26/28/1 27/29/1 28/30/1 +f 30/31/3 29/32/3 42/33/3 46/34/3 45/35/3 43/36/3 +f 41/37/3 43/36/3 45/35/3 48/38/3 +f 46/34/3 42/33/3 44/39/3 47/40/3 +f 32/41/3 31/42/3 41/37/3 48/38/3 47/40/3 44/39/3 +f 29/43/5 34/44/5 36/45/5 32/46/5 44/47/5 42/48/5 +f 31/43/6 35/44/6 33/45/6 30/46/6 43/47/6 41/48/6 +f 33/30/1 35/27/1 36/28/1 34/29/1 +f 30/43/4 33/44/4 34/45/4 29/46/4 +f 35/44/2 31/43/2 32/46/2 36/45/2 +f 38/29/3 39/30/3 40/27/3 37/28/3 g westInsulation v -0.187500 0.312500 0.187500 v -0.187500 0.312500 -0.187500 @@ -180,55 +164,45 @@ v -0.500000 0.375000 -0.125000 v -0.500000 0.375000 0.125000 v -0.500000 0.625000 0.125000 v -0.500000 0.625000 -0.125000 -vt 0.000058 0.000058 -vt 0.999942 0.000058 -vt 0.999942 0.333353 -vt 0.000058 0.333353 -vt 0.000058 0.333352 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.166667 0.000000 -vt 0.166667 0.174442 -vt 0.166667 0.833330 -vt 0.166667 1.000000 -vt 0.833333 1.000000 -vt 0.833333 0.833355 -vt 0.833333 0.000000 -vt 0.833333 0.174517 -vt 0.833333 0.833318 -vt 0.000058 1.001022 -vt 0.000058 0.656250 -vt 0.999942 0.656250 -vt 0.999942 1.001023 -vt 0.749971 1.001023 -vt 0.250029 1.001022 -vt 0.999942 0.666758 -vt 0.999942 1.000053 -vt 0.000058 1.000053 -vt 0.000058 0.666758 -vt 0.250029 0.666758 -vt 0.749971 0.666758 -vt 1.000000 0.656250 -vt 0.000000 0.656250 +vt 0.687500 0.562500 +vt 0.687500 0.937500 +vt 0.562500 0.937500 +vt 0.562500 0.562500 +vt 0.062500 0.437500 +vt 0.062500 0.062500 +vt 0.437500 0.062500 +vt 0.437500 0.437500 +vt 0.125000 0.062500 +vt 0.125000 0.125000 +vt 0.125000 0.375000 +vt 0.125000 0.437500 +vt 0.375000 0.437500 +vt 0.375000 0.375000 +vt 0.375000 0.062500 +vt 0.375000 0.125000 +vt 0.875000 0.937500 +vt 0.750000 0.937500 +vt 0.750000 0.562500 +vt 0.875000 0.562500 +vt 0.875000 0.625000 +vt 0.875000 0.875000 usemtl None s off -f 61/65/2 64/66/2 50/67/2 49/68/2 -f 64/65/6 63/66/6 51/67/6 50/68/6 -f 63/67/4 62/69/4 52/65/4 51/66/4 -f 62/67/5 61/69/5 49/65/5 52/66/5 -f 49/70/3 50/71/3 51/72/3 52/73/3 -f 54/70/1 53/71/1 66/74/1 70/75/1 69/76/1 67/77/1 -f 65/78/1 67/77/1 69/76/1 72/79/1 -f 70/75/1 66/74/1 68/80/1 71/81/1 -f 56/72/1 55/73/1 65/78/1 72/82/1 71/81/1 68/80/1 -f 53/83/5 58/84/5 60/85/5 56/86/5 68/87/5 66/88/5 -f 55/89/6 59/90/6 57/91/6 54/92/6 67/93/6 65/94/6 -f 57/73/3 59/70/3 60/71/3 58/72/3 -f 54/89/2 57/90/2 58/91/2 53/92/2 -f 59/73/4 55/95/4 56/96/4 60/70/4 -f 62/72/1 63/73/1 64/70/1 61/71/1 +f 61/49/2 64/50/2 50/51/2 49/52/2 +f 64/49/6 63/50/6 51/51/6 50/52/6 +f 63/49/4 62/50/4 52/51/4 51/52/4 +f 62/49/5 61/50/5 49/51/5 52/52/5 +f 49/53/3 50/54/3 51/55/3 52/56/3 +f 54/53/1 53/54/1 66/57/1 70/58/1 69/59/1 67/60/1 +f 65/61/1 67/60/1 69/59/1 72/62/1 +f 70/58/1 66/57/1 68/63/1 71/64/1 +f 56/55/1 55/56/1 65/61/1 72/62/1 71/64/1 68/63/1 +f 53/65/5 58/66/5 60/67/5 56/68/5 68/69/5 66/70/5 +f 55/65/6 59/66/6 57/67/6 54/68/6 67/69/6 65/70/6 +f 57/56/3 59/53/3 60/54/3 58/55/3 +f 54/65/2 57/66/2 58/67/2 53/68/2 +f 59/66/4 55/65/4 56/68/4 60/67/4 +f 62/55/1 63/56/1 64/53/1 61/54/1 g downInsulation v -0.187500 0.312500 -0.187500 v -0.187500 0.312500 0.187500 @@ -254,55 +228,45 @@ v -0.125000 0.000000 0.125000 v -0.125000 0.000000 -0.125000 v 0.125000 0.000000 -0.125000 v 0.125000 0.000000 0.125000 -vt 0.000058 0.000058 -vt 0.999942 0.000058 -vt 0.999942 0.333353 -vt 0.000058 0.333353 -vt 0.000058 0.333352 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.166667 0.000000 -vt 0.166667 0.174442 -vt 0.166667 0.833330 -vt 0.166667 1.000000 -vt 0.833333 1.000000 -vt 0.833333 0.833355 -vt 0.833333 0.000000 -vt 0.833333 0.174517 -vt 0.833333 0.833318 -vt 0.000058 1.001022 -vt 0.000058 0.656250 -vt 0.999942 0.656250 -vt 0.999942 1.001023 -vt 0.749971 1.001023 -vt 0.250029 1.001022 -vt 0.999942 0.666758 -vt 0.999942 1.000053 -vt 0.000058 1.000053 -vt 0.000058 0.666758 -vt 0.250029 0.666758 -vt 0.749971 0.666758 -vt 1.000000 0.656250 -vt 0.000000 0.656250 +vt 0.687500 0.562500 +vt 0.687500 0.937500 +vt 0.562500 0.937500 +vt 0.562500 0.562500 +vt 0.062500 0.437500 +vt 0.062500 0.062500 +vt 0.437500 0.062500 +vt 0.437500 0.437500 +vt 0.125000 0.062500 +vt 0.125000 0.125000 +vt 0.125000 0.375000 +vt 0.125000 0.437500 +vt 0.375000 0.437500 +vt 0.375000 0.375000 +vt 0.375000 0.062500 +vt 0.375000 0.125000 +vt 0.875000 0.937500 +vt 0.750000 0.937500 +vt 0.750000 0.562500 +vt 0.875000 0.562500 +vt 0.875000 0.625000 +vt 0.875000 0.875000 usemtl None s off -f 85/97/1 88/98/1 74/99/1 73/100/1 -f 88/97/5 87/98/5 75/99/5 74/100/5 -f 87/99/3 86/101/3 76/97/3 75/98/3 -f 86/99/6 85/101/6 73/97/6 76/98/6 -f 73/102/4 74/103/4 75/104/4 76/105/4 -f 78/102/2 77/103/2 90/106/2 94/107/2 93/108/2 91/109/2 -f 89/110/2 91/109/2 93/108/2 96/111/2 -f 94/107/2 90/106/2 92/112/2 95/113/2 -f 80/104/2 79/105/2 89/110/2 96/114/2 95/113/2 92/112/2 -f 77/115/6 82/116/6 84/117/6 80/118/6 92/119/6 90/120/6 -f 79/121/5 83/122/5 81/123/5 78/124/5 91/125/5 89/126/5 -f 81/105/4 83/102/4 84/103/4 82/104/4 -f 78/121/1 81/122/1 82/123/1 77/124/1 -f 83/105/3 79/127/3 80/128/3 84/102/3 -f 86/104/2 87/105/2 88/102/2 85/103/2 +f 85/71/1 88/72/1 74/73/1 73/74/1 +f 88/71/5 87/72/5 75/73/5 74/74/5 +f 87/71/3 86/72/3 76/73/3 75/74/3 +f 86/71/6 85/72/6 73/73/6 76/74/6 +f 73/75/4 74/76/4 75/77/4 76/78/4 +f 78/75/2 77/76/2 90/79/2 94/80/2 93/81/2 91/82/2 +f 89/83/2 91/82/2 93/81/2 96/84/2 +f 94/80/2 90/79/2 92/85/2 95/86/2 +f 80/77/2 79/78/2 89/83/2 96/84/2 95/86/2 92/85/2 +f 77/87/6 82/88/6 84/89/6 80/90/6 92/91/6 90/92/6 +f 79/87/5 83/88/5 81/89/5 78/90/5 91/91/5 89/92/5 +f 81/78/4 83/75/4 84/76/4 82/77/4 +f 78/87/1 81/88/1 82/89/1 77/90/1 +f 83/88/3 79/87/3 80/90/3 84/89/3 +f 86/77/2 87/78/2 88/75/2 85/76/2 g northInsulation v -0.187500 0.312500 0.187500 v -0.187500 0.687500 0.187500 @@ -328,55 +292,49 @@ v -0.125000 0.625000 0.500000 v -0.125000 0.375000 0.500000 v 0.125000 0.375000 0.500000 v 0.125000 0.625000 0.500000 -vt 0.000058 0.000058 -vt 0.999942 0.000058 -vt 0.999942 0.333353 -vt 0.000058 0.333353 -vt 0.000058 0.333352 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.166667 0.000000 -vt 0.166667 0.174442 -vt 0.166667 0.833330 -vt 0.166667 1.000000 -vt 0.833333 1.000000 -vt 0.833333 0.833355 -vt 0.833333 0.000000 -vt 0.833333 0.174517 -vt 0.833333 0.833318 -vt 0.000058 1.001022 -vt 0.000058 0.656250 -vt 0.999942 0.656250 -vt 0.999942 1.001023 -vt 0.749971 1.001023 -vt 0.250029 1.001022 -vt 0.999942 0.666758 -vt 0.999942 1.000053 -vt 0.000058 1.000053 -vt 0.000058 0.666758 -vt 0.250029 0.666758 -vt 0.749971 0.666758 -vt 1.000000 0.656250 -vt 0.000000 0.656250 +vt 0.687500 0.562500 +vt 0.687500 0.937500 +vt 0.562500 0.937500 +vt 0.562500 0.562500 +vt 0.062500 0.937500 +vt 0.062500 0.562500 +vt 0.437500 0.562500 +vt 0.437500 0.937500 +vt 0.062500 0.437500 +vt 0.062500 0.062500 +vt 0.125000 0.062500 +vt 0.125000 0.125000 +vt 0.125000 0.375000 +vt 0.125000 0.437500 +vt 0.375000 0.437500 +vt 0.375000 0.375000 +vt 0.375000 0.062500 +vt 0.375000 0.125000 +vt 0.437500 0.062500 +vt 0.437500 0.437500 +vt 0.875000 0.937500 +vt 0.750000 0.937500 +vt 0.750000 0.562500 +vt 0.875000 0.562500 +vt 0.875000 0.625000 +vt 0.875000 0.875000 usemtl None s off -f 109/129/1 112/130/1 98/131/1 97/132/1 -f 112/129/4 111/130/4 99/131/4 98/132/4 -f 111/131/3 110/133/3 100/129/3 99/130/3 -f 110/131/2 109/133/2 97/129/2 100/130/2 -f 97/134/6 98/135/6 99/136/6 100/137/6 -f 102/134/5 101/135/5 114/138/5 118/139/5 117/140/5 115/141/5 -f 113/142/5 115/141/5 117/140/5 120/143/5 -f 118/139/5 114/138/5 116/144/5 119/145/5 -f 104/136/5 103/137/5 113/142/5 120/146/5 119/145/5 116/144/5 -f 101/147/2 106/148/2 108/149/2 104/150/2 116/151/2 114/152/2 -f 103/153/4 107/154/4 105/155/4 102/156/4 115/157/4 113/158/4 -f 105/137/6 107/134/6 108/135/6 106/136/6 -f 102/153/1 105/154/1 106/155/1 101/156/1 -f 107/137/3 103/159/3 104/160/3 108/134/3 -f 110/136/5 111/137/5 112/134/5 109/135/5 +f 109/93/1 112/94/1 98/95/1 97/96/1 +f 112/93/4 111/94/4 99/95/4 98/96/4 +f 111/93/3 110/94/3 100/95/3 99/96/3 +f 110/93/2 109/94/2 97/95/2 100/96/2 +f 97/97/6 98/98/6 99/99/6 100/100/6 +f 102/101/5 101/102/5 114/103/5 118/104/5 117/105/5 115/106/5 +f 113/107/5 115/106/5 117/105/5 120/108/5 +f 118/104/5 114/103/5 116/109/5 119/110/5 +f 104/111/5 103/112/5 113/107/5 120/108/5 119/110/5 116/109/5 +f 101/113/2 106/114/2 108/115/2 104/116/2 116/117/2 114/118/2 +f 103/113/4 107/114/4 105/115/4 102/116/4 115/117/4 113/118/4 +f 105/100/6 107/97/6 108/98/6 106/99/6 +f 102/113/1 105/114/1 106/115/1 101/116/1 +f 107/114/3 103/113/3 104/116/3 108/115/3 +f 110/99/5 111/100/5 112/97/5 109/98/5 g upInsulation v -0.187500 0.687500 0.187500 v -0.187500 0.687500 -0.187500 @@ -402,55 +360,45 @@ v -0.125000 1.000000 -0.125000 v -0.125000 1.000000 0.125000 v 0.125000 1.000000 0.125000 v 0.125000 1.000000 -0.125000 -vt 0.000058 0.000058 -vt 0.999942 0.000058 -vt 0.999942 0.333353 -vt 0.000058 0.333353 -vt 0.000058 0.333352 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.166667 0.000000 -vt 0.166667 0.174442 -vt 0.166667 0.833330 -vt 0.166667 1.000000 -vt 0.833333 1.000000 -vt 0.833333 0.833355 -vt 0.833333 0.000000 -vt 0.833333 0.174517 -vt 0.833333 0.833318 -vt 0.000058 1.001022 -vt 0.000058 0.656250 -vt 0.999942 0.656250 -vt 0.999942 1.001023 -vt 0.749971 1.001023 -vt 0.250029 1.001022 -vt 0.999942 0.666758 -vt 0.999942 1.000053 -vt 0.000058 1.000053 -vt 0.000058 0.666758 -vt 0.250029 0.666758 -vt 0.749971 0.666758 -vt 1.000000 0.656250 -vt 0.000000 0.656250 +vt 0.687500 0.562500 +vt 0.687500 0.937500 +vt 0.562500 0.937500 +vt 0.562500 0.562500 +vt 0.062500 0.437500 +vt 0.062500 0.062500 +vt 0.437500 0.062500 +vt 0.437500 0.437500 +vt 0.125000 0.062500 +vt 0.125000 0.125000 +vt 0.125000 0.375000 +vt 0.125000 0.437500 +vt 0.375000 0.437500 +vt 0.375000 0.375000 +vt 0.375000 0.062500 +vt 0.375000 0.125000 +vt 0.875000 0.937500 +vt 0.750000 0.937500 +vt 0.750000 0.562500 +vt 0.875000 0.562500 +vt 0.875000 0.625000 +vt 0.875000 0.875000 usemtl None s off -f 133/161/1 136/162/1 122/163/1 121/164/1 -f 136/161/6 135/162/6 123/163/6 122/164/6 -f 135/163/3 134/165/3 124/161/3 123/162/3 -f 134/163/5 133/165/5 121/161/5 124/162/5 -f 121/166/2 122/167/2 123/168/2 124/169/2 -f 126/166/4 125/167/4 138/170/4 142/171/4 141/172/4 139/173/4 -f 137/174/4 139/173/4 141/172/4 144/175/4 -f 142/171/4 138/170/4 140/176/4 143/177/4 -f 128/168/4 127/169/4 137/174/4 144/178/4 143/177/4 140/176/4 -f 125/179/5 130/180/5 132/181/5 128/182/5 140/183/5 138/184/5 -f 127/185/6 131/186/6 129/187/6 126/188/6 139/189/6 137/190/6 -f 129/169/2 131/166/2 132/167/2 130/168/2 -f 126/185/1 129/186/1 130/187/1 125/188/1 -f 131/169/3 127/191/3 128/192/3 132/166/3 -f 134/168/4 135/169/4 136/166/4 133/167/4 +f 133/119/1 136/120/1 122/121/1 121/122/1 +f 136/119/6 135/120/6 123/121/6 122/122/6 +f 135/119/3 134/120/3 124/121/3 123/122/3 +f 134/119/5 133/120/5 121/121/5 124/122/5 +f 121/123/2 122/124/2 123/125/2 124/126/2 +f 126/123/4 125/124/4 138/127/4 142/128/4 141/129/4 139/130/4 +f 137/131/4 139/130/4 141/129/4 144/132/4 +f 142/128/4 138/127/4 140/133/4 143/134/4 +f 128/125/4 127/126/4 137/131/4 144/132/4 143/134/4 140/133/4 +f 125/135/5 130/136/5 132/137/5 128/138/5 140/139/5 138/140/5 +f 127/135/6 131/136/6 129/137/6 126/138/6 139/139/6 137/140/6 +f 129/126/2 131/123/2 132/124/2 130/125/2 +f 126/135/1 129/136/1 130/137/1 125/138/1 +f 131/136/3 127/135/3 128/138/3 132/137/3 +f 134/125/4 135/126/4 136/123/4 133/124/4 g centerInsulation v -0.187500 0.312500 0.187500 v -0.187500 0.312500 -0.187500 @@ -460,22 +408,18 @@ v -0.187500 0.687500 0.187500 v -0.187500 0.687500 -0.187500 v 0.187500 0.687500 -0.187500 v 0.187500 0.687500 0.187500 -vt 0.000100 0.000100 -vt 0.999900 0.000100 -vt 0.999900 0.999900 -vt 0.000100 0.999900 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 +vt 0.062500 0.562500 +vt 0.437500 0.562500 +vt 0.437500 0.937500 +vt 0.062500 0.937500 usemtl None s off -f 149/193/1 150/194/1 146/195/1 145/196/1 -f 150/193/6 151/194/6 147/195/6 146/196/6 -f 151/197/3 152/198/3 148/199/3 147/200/3 -f 152/195/5 149/196/5 145/193/5 148/194/5 -f 145/196/2 146/193/2 147/194/2 148/195/2 -f 152/194/4 151/195/4 150/196/4 149/193/4 +f 149/141/1 150/142/1 146/143/1 145/144/1 +f 150/141/6 151/142/6 147/143/6 146/144/6 +f 151/141/3 152/142/3 148/143/3 147/144/3 +f 152/143/5 149/144/5 145/141/5 148/142/5 +f 145/144/2 146/141/2 147/142/2 148/143/2 +f 152/142/4 151/143/4 150/144/4 149/141/4 g down v -0.125000 0.000000 0.125000 v 0.125000 0.000000 0.125000 @@ -485,27 +429,27 @@ v -0.125000 0.000000 -0.125000 v 0.125000 0.000000 -0.125000 v 0.125000 0.375000 -0.125000 v -0.125000 0.375000 -0.125000 -vt 0.453125 0.828125 -vt 0.390625 0.828125 -vt 0.390625 0.765625 -vt 0.453125 0.765625 -vt 0.453125 0.671875 -vt 0.515625 0.671875 -vt 0.515625 0.765625 -vt 0.515625 0.828125 -vt 0.578125 0.671875 -vt 0.578125 0.765625 -vt 0.390625 0.671875 -vt 0.328125 0.671875 -vt 0.328125 0.765625 +vt 0.281250 0.687500 +vt 0.156250 0.687500 +vt 0.156250 0.562500 +vt 0.281250 0.562500 +vt 0.281250 0.375000 +vt 0.406250 0.375000 +vt 0.406250 0.562500 +vt 0.406250 0.687500 +vt 0.531250 0.375000 +vt 0.531250 0.562500 +vt 0.156250 0.375000 +vt 0.031250 0.375000 +vt 0.031250 0.562500 usemtl None_Wire s off -f 157/201/2 158/202/2 154/203/2 153/204/2 -f 158/204/3 159/205/3 155/206/3 154/207/3 -f 159/208/4 160/201/4 156/204/4 155/207/4 -f 160/207/1 157/206/1 153/209/1 156/210/1 -f 153/204/5 154/203/5 155/211/5 156/205/5 -f 160/212/6 159/211/6 158/203/6 157/213/6 +f 157/145/2 158/146/2 154/147/2 153/148/2 +f 158/148/3 159/149/3 155/150/3 154/151/3 +f 159/152/4 160/145/4 156/148/4 155/151/4 +f 160/151/1 157/150/1 153/153/1 156/154/1 +f 153/148/5 154/147/5 155/155/5 156/149/5 +f 160/156/6 159/155/6 158/147/6 157/157/6 g up v -0.125000 1.000000 -0.125000 v 0.125000 1.000000 -0.125000 @@ -515,27 +459,27 @@ v -0.125000 1.000000 0.125000 v 0.125000 1.000000 0.125000 v 0.125000 0.625000 0.125000 v -0.125000 0.625000 0.125000 -vt 0.453125 0.828125 -vt 0.390625 0.828125 -vt 0.390625 0.765625 -vt 0.453125 0.765625 -vt 0.453125 0.671875 -vt 0.515625 0.671875 -vt 0.515625 0.765625 -vt 0.515625 0.828125 -vt 0.578125 0.671875 -vt 0.578125 0.765625 -vt 0.390625 0.671875 -vt 0.328125 0.671875 -vt 0.328125 0.765625 +vt 0.281250 0.687500 +vt 0.156250 0.687500 +vt 0.156250 0.562500 +vt 0.281250 0.562500 +vt 0.281250 0.375000 +vt 0.406250 0.375000 +vt 0.406250 0.562500 +vt 0.406250 0.687500 +vt 0.531250 0.375000 +vt 0.531250 0.562500 +vt 0.156250 0.375000 +vt 0.031250 0.375000 +vt 0.031250 0.562500 usemtl None_Wire s off -f 165/214/4 166/215/4 162/216/4 161/217/4 -f 166/217/3 167/218/3 163/219/3 162/220/3 -f 167/221/2 168/214/2 164/217/2 163/220/2 -f 168/220/1 165/219/1 161/222/1 164/223/1 -f 161/217/6 162/216/6 163/224/6 164/218/6 -f 168/225/5 167/224/5 166/216/5 165/226/5 +f 165/158/4 166/159/4 162/160/4 161/161/4 +f 166/161/3 167/162/3 163/163/3 162/164/3 +f 167/165/2 168/158/2 164/161/2 163/164/2 +f 168/164/1 165/163/1 161/166/1 164/167/1 +f 161/161/6 162/160/6 163/168/6 164/162/6 +f 168/169/5 167/168/5 166/160/5 165/170/5 g west v -0.500000 0.375000 0.125000 v -0.500000 0.375000 -0.125000 @@ -545,28 +489,27 @@ v -0.500000 0.625000 0.125000 v -0.500000 0.625000 -0.125000 v -0.125000 0.625000 -0.125000 v -0.125000 0.625000 0.125000 -vt 0.312500 0.734375 -vt 0.250000 0.734375 -vt 0.250000 0.671875 -vt 0.312500 0.671875 -vt 0.156250 0.671875 -vt 0.156250 0.734375 -vt 0.093750 0.734375 -vt 0.093750 0.671875 -vt 0.000000 0.671875 -vt 0.000000 0.734375 -vt 0.218750 0.828125 -vt 0.156250 0.828125 -vt 0.218750 0.734375 -vt 0.093750 0.828125 +vt 0.281250 0.687500 +vt 0.156250 0.687500 +vt 0.156250 0.562500 +vt 0.281250 0.562500 +vt 0.281250 0.375000 +vt 0.406250 0.375000 +vt 0.406250 0.562500 +vt 0.406250 0.687500 +vt 0.531250 0.375000 +vt 0.531250 0.562500 +vt 0.156250 0.375000 +vt 0.031250 0.375000 +vt 0.031250 0.562500 usemtl None_Wire s off -f 173/227/1 174/228/1 170/229/1 169/230/1 -f 174/231/6 175/229/6 171/228/6 170/232/6 -f 175/232/3 176/233/3 172/234/3 171/231/3 -f 176/235/5 173/234/5 169/233/5 172/236/5 -f 169/237/2 170/238/2 171/232/2 172/239/2 -f 176/233/4 175/232/4 174/238/4 173/240/4 +f 173/171/1 174/172/1 170/173/1 169/174/1 +f 174/174/6 175/175/6 171/176/6 170/177/6 +f 175/178/3 176/171/3 172/174/3 171/177/3 +f 176/177/5 173/176/5 169/179/5 172/180/5 +f 169/174/2 170/173/2 171/181/2 172/175/2 +f 176/182/4 175/181/4 174/173/4 173/183/4 g east v 0.500000 0.375000 -0.125000 v 0.500000 0.375000 0.125000 @@ -576,28 +519,27 @@ v 0.500000 0.625000 -0.125000 v 0.500000 0.625000 0.125000 v 0.125000 0.625000 0.125000 v 0.125000 0.625000 -0.125000 -vt 0.312500 0.734375 -vt 0.250000 0.734375 -vt 0.250000 0.671875 -vt 0.312500 0.671875 -vt 0.156250 0.671875 -vt 0.156250 0.734375 -vt 0.093750 0.734375 -vt 0.093750 0.671875 -vt 0.000000 0.671875 -vt 0.000000 0.734375 -vt 0.218750 0.828125 -vt 0.156250 0.828125 -vt 0.218750 0.734375 -vt 0.093750 0.828125 +vt 0.281250 0.687500 +vt 0.156250 0.687500 +vt 0.156250 0.562500 +vt 0.281250 0.562500 +vt 0.281250 0.375000 +vt 0.406250 0.375000 +vt 0.406250 0.562500 +vt 0.406250 0.687500 +vt 0.531250 0.375000 +vt 0.531250 0.562500 +vt 0.156250 0.375000 +vt 0.031250 0.375000 +vt 0.031250 0.562500 usemtl None_Wire s off -f 181/241/3 182/242/3 178/243/3 177/244/3 -f 182/245/5 183/243/5 179/242/5 178/246/5 -f 183/246/1 184/247/1 180/248/1 179/245/1 -f 184/249/6 181/248/6 177/247/6 180/250/6 -f 177/251/2 178/252/2 179/246/2 180/253/2 -f 184/247/4 183/246/4 182/252/4 181/254/4 +f 181/184/3 182/185/3 178/186/3 177/187/3 +f 182/187/5 183/188/5 179/189/5 178/190/5 +f 183/191/1 184/184/1 180/187/1 179/190/1 +f 184/190/6 181/189/6 177/192/6 180/193/6 +f 177/187/2 178/186/2 179/194/2 180/188/2 +f 184/195/4 183/194/4 182/186/4 181/196/4 g north v 0.125000 0.375000 0.500000 v -0.125000 0.375000 0.500000 @@ -607,28 +549,27 @@ v 0.125000 0.625000 0.500000 v -0.125000 0.625000 0.500000 v -0.125000 0.625000 0.125000 v 0.125000 0.625000 0.125000 -vt 0.484375 0.937500 -vt 0.546875 0.937500 -vt 0.546875 0.875000 -vt 0.484375 0.875000 -vt 0.640625 0.937500 -vt 0.640625 0.875000 -vt 0.328125 0.937500 -vt 0.390625 0.937500 -vt 0.390625 0.875000 -vt 0.328125 0.875000 -vt 0.484375 1.000000 -vt 0.578125 1.000000 -vt 0.578125 0.937500 -vt 0.390625 1.000000 +vt 0.281250 0.687500 +vt 0.156250 0.687500 +vt 0.156250 0.562500 +vt 0.281250 0.562500 +vt 0.281250 0.375000 +vt 0.406250 0.375000 +vt 0.406250 0.562500 +vt 0.406250 0.687500 +vt 0.531250 0.375000 +vt 0.531250 0.562500 +vt 0.156250 0.375000 +vt 0.031250 0.375000 +vt 0.031250 0.562500 usemtl None_Wire s off -f 189/255/5 190/256/5 186/257/5 185/258/5 -f 190/256/1 191/259/1 187/260/1 186/257/1 -f 191/261/6 192/262/6 188/263/6 187/264/6 -f 192/262/3 189/255/3 185/258/3 188/263/3 -f 185/255/2 186/265/2 187/266/2 188/267/2 -f 192/255/4 191/265/4 190/268/4 189/262/4 +f 189/197/5 190/198/5 186/199/5 185/200/5 +f 190/200/1 191/201/1 187/202/1 186/203/1 +f 191/204/6 192/197/6 188/200/6 187/203/6 +f 192/203/3 189/202/3 185/205/3 188/206/3 +f 185/200/2 186/199/2 187/207/2 188/201/2 +f 192/208/4 191/207/4 190/199/4 189/209/4 g south v -0.125000 0.375000 -0.500000 v 0.125000 0.375000 -0.500000 @@ -638,28 +579,27 @@ v -0.125000 0.625000 -0.500000 v 0.125000 0.625000 -0.500000 v 0.125000 0.625000 -0.125000 v -0.125000 0.625000 -0.125000 -vt 0.484375 0.937500 -vt 0.546875 0.937500 -vt 0.546875 0.875000 -vt 0.484375 0.875000 -vt 0.640625 0.937500 -vt 0.640625 0.875000 -vt 0.328125 0.937500 -vt 0.390625 0.937500 -vt 0.390625 0.875000 -vt 0.328125 0.875000 -vt 0.484375 1.000000 -vt 0.578125 1.000000 -vt 0.578125 0.937500 -vt 0.390625 1.000000 +vt 0.281250 0.687500 +vt 0.156250 0.687500 +vt 0.156250 0.562500 +vt 0.281250 0.562500 +vt 0.281250 0.375000 +vt 0.406250 0.375000 +vt 0.406250 0.562500 +vt 0.406250 0.687500 +vt 0.531250 0.375000 +vt 0.531250 0.562500 +vt 0.156250 0.375000 +vt 0.031250 0.375000 +vt 0.031250 0.562500 usemtl None_Wire s off -f 197/269/6 198/270/6 194/271/6 193/272/6 -f 198/270/3 199/273/3 195/274/3 194/271/3 -f 199/275/5 200/276/5 196/277/5 195/278/5 -f 200/276/1 197/269/1 193/272/1 196/277/1 -f 193/269/2 194/279/2 195/280/2 196/281/2 -f 200/269/4 199/279/4 198/282/4 197/276/4 +f 197/210/6 198/211/6 194/212/6 193/213/6 +f 198/213/3 199/214/3 195/215/3 194/216/3 +f 199/217/5 200/210/5 196/213/5 195/216/5 +f 200/216/1 197/215/1 193/218/1 196/219/1 +f 193/213/2 194/212/2 195/220/2 196/214/2 +f 200/221/4 199/220/4 198/212/4 197/222/4 g center v -0.125000 0.375000 0.125000 v -0.125000 0.375000 -0.125000 @@ -669,24 +609,24 @@ v -0.125000 0.625000 0.125000 v -0.125000 0.625000 -0.125000 v 0.125000 0.625000 -0.125000 v 0.125000 0.625000 0.125000 -vt 0.187500 1.000000 -vt 0.125000 1.000000 -vt 0.125000 0.937500 -vt 0.187500 0.937500 -vt 0.000000 0.937500 -vt 0.000000 0.875000 -vt 0.062500 0.875000 -vt 0.062500 0.937500 -vt 0.125000 0.875000 -vt 0.187500 0.875000 -vt 0.062500 1.000000 -vt 0.250000 0.875000 -vt 0.250000 0.937500 +vt 0.281250 0.843750 +vt 0.156250 0.843750 +vt 0.156250 0.718750 +vt 0.281250 0.718750 +vt 0.406250 0.843750 +vt 0.406250 0.718750 +vt 0.531250 0.718750 +vt 0.531250 0.843750 +vt 0.031250 0.843750 +vt 0.031250 0.718750 +vt 0.406250 0.968750 +vt 0.281250 0.968750 +vt 0.156250 0.968750 usemtl None_ 1 s off -f 205/283/1 206/284/1 202/285/1 201/286/1 -f 206/287/6 207/288/6 203/289/6 202/290/6 -f 207/286/3 208/285/3 204/291/3 203/292/3 -f 208/290/5 205/289/5 201/291/5 204/285/5 -f 201/284/2 202/293/2 203/290/2 204/285/2 -f 208/292/4 207/294/4 206/295/4 205/286/4 +f 205/223/1 206/224/1 202/225/1 201/226/1 +f 206/227/6 207/228/6 203/229/6 202/230/6 +f 207/224/3 208/231/3 204/232/3 203/225/3 +f 208/223/5 205/226/5 201/228/5 204/227/5 +f 201/233/2 202/234/2 203/223/2 204/227/2 +f 208/224/4 207/223/4 206/234/4 205/235/4 diff --git a/resources/assets/resonantinduction/textures/blocks/models/insulation.png b/resources/assets/resonantinduction/textures/blocks/models/insulation.png index 68b25d7e..2e57472f 100644 Binary files a/resources/assets/resonantinduction/textures/blocks/models/insulation.png and b/resources/assets/resonantinduction/textures/blocks/models/insulation.png differ diff --git a/resources/assets/resonantinduction/textures/blocks/models/insulationtiny.png b/resources/assets/resonantinduction/textures/blocks/models/insulationtiny.png new file mode 100644 index 00000000..ca3dbc44 Binary files /dev/null and b/resources/assets/resonantinduction/textures/blocks/models/insulationtiny.png differ diff --git a/resources/assets/resonantinduction/textures/blocks/models/wire.png b/resources/assets/resonantinduction/textures/blocks/models/wire.png index 4f52a531..1b5fb50a 100644 Binary files a/resources/assets/resonantinduction/textures/blocks/models/wire.png and b/resources/assets/resonantinduction/textures/blocks/models/wire.png differ diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java index 84e7c24c..dcc243ca 100644 --- a/src/resonantinduction/ResonantInduction.java +++ b/src/resonantinduction/ResonantInduction.java @@ -117,6 +117,7 @@ public class ResonantInduction public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), NAME + ".cfg")); public static float FURNACE_WATTAGE = 1; public static boolean SOUND_FXS = true; + public static boolean LO_FI_INSULATION = false; /** Block ID by Jyzarc */ private static final int BLOCK_ID_PREFIX = 3200; @@ -167,6 +168,7 @@ public class ResonantInduction // Config FURNACE_WATTAGE = (float) CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Furnace Wattage Per Tick", FURNACE_WATTAGE).getDouble(FURNACE_WATTAGE); SOUND_FXS = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Tesla Sound FXs", SOUND_FXS).getBoolean(SOUND_FXS); + LO_FI_INSULATION = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Use lo-fi insulation texture", LO_FI_INSULATION).getBoolean(LO_FI_INSULATION); MAX_CONTRACTOR_DISTANCE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Max EM Contractor Path", MAX_CONTRACTOR_DISTANCE).getInt(MAX_CONTRACTOR_DISTANCE); TileEntityEMContractor.ACCELERATION = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Item Acceleration", TileEntityEMContractor.ACCELERATION).getDouble(TileEntityEMContractor.ACCELERATION); diff --git a/src/resonantinduction/render/RenderPartWire.java b/src/resonantinduction/render/RenderPartWire.java index f0f20bbb..86924a73 100644 --- a/src/resonantinduction/render/RenderPartWire.java +++ b/src/resonantinduction/render/RenderPartWire.java @@ -159,7 +159,7 @@ public class RenderPartWire public static void registerIcons(IconRegister iconReg) { wireIcon = iconReg.registerIcon("resonantinduction:models/wire"); - insulationIcon = iconReg.registerIcon("resonantinduction:models/insulation"); + insulationIcon = iconReg.registerIcon("resonantinduction:models/insulation" + (ResonantInduction.LO_FI_INSULATION ? "tiny" : "")); } public void renderStatic(PartWire wire)