From 9b9734b15e322fc29d94ebd6df94cda0c1765a2b Mon Sep 17 00:00:00 2001 From: HbmMods Date: Fri, 9 Feb 2018 18:15:11 +0100 Subject: [PATCH] AA shell, model unwraps, star blaster cell, star blaster texture fix --- assets/hbm/models/cwis_base.obj | 38 +- assets/hbm/models/cwis_gun.obj | 454 ++++--- assets/hbm/models/cwis_head.obj | 600 ++++++--- assets/hbm/models/cwis_rotor.obj | 204 ++- assets/hbm/models/turret_spitfire_base.obj | 92 +- assets/hbm/models/turret_spitfire_gun.obj | 1169 ++++++++++++------ assets/hbm/models/turret_spitfire_rotor.obj | 518 +++++--- assets/hbm/textures/items/capacitor.png | Bin 0 -> 188 bytes assets/hbm/textures/items/gun_b92_ammo.png | Bin 0 -> 166 bytes assets/hbm/textures/models/ModelB92.png | Bin 1711 -> 1711 bytes assets/hbm/textures/models/ModelB92Dark.png | Bin 1679 -> 1680 bytes assets/hbm/textures/models/ModelB92SM.png | Bin 1741 -> 1740 bytes com/hbm/blocks/bomb/TurretSpitfire.java | 15 +- com/hbm/entity/projectile/EntityAAShell.java | 115 ++ com/hbm/explosion/ExplosionLarge.java | 11 + com/hbm/items/ModItems.java | 5 +- com/hbm/items/weapon/GunB92Cell.java | 67 + com/hbm/items/weapon/GunBoltAction.java | 2 +- com/hbm/main/ClientProxy.java | 2 + com/hbm/main/MainRegistry.java | 3 + 20 files changed, 2316 insertions(+), 979 deletions(-) create mode 100644 assets/hbm/textures/items/capacitor.png create mode 100644 assets/hbm/textures/items/gun_b92_ammo.png create mode 100644 com/hbm/entity/projectile/EntityAAShell.java create mode 100644 com/hbm/items/weapon/GunB92Cell.java diff --git a/assets/hbm/models/cwis_base.obj b/assets/hbm/models/cwis_base.obj index 58dd640e2..47dc23c11 100644 --- a/assets/hbm/models/cwis_base.obj +++ b/assets/hbm/models/cwis_base.obj @@ -9,6 +9,20 @@ v 1.000000 0.000000 1.000000 v 1.000000 0.250000 1.000000 v 1.000000 0.000000 -1.000000 v 1.000000 0.250000 -1.000000 +vt 0.444444 0.444444 +vt 0.444444 0.500000 +vt 0.000000 0.500000 +vt 0.888889 0.444444 +vt 0.888889 0.500000 +vt 0.444444 1.000000 +vt 0.444444 0.944444 +vt 0.888888 0.944444 +vt 0.000000 1.000000 +vt 0.000000 0.944444 +vt 0.444444 0.000000 +vt 0.000000 0.444444 +vt 0.888888 1.000000 +vt 0.000000 0.000000 vn -1.000000 0.000000 0.000000 vn 0.000000 0.000000 -1.000000 vn 1.000000 0.000000 0.000000 @@ -16,15 +30,15 @@ vn 0.000000 0.000000 1.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 0.000000 s off -f 4//1 3//1 1//1 -f 8//2 7//2 3//2 -f 6//3 5//3 7//3 -f 2//4 1//4 5//4 -f 3//5 7//5 5//5 -f 8//6 4//6 2//6 -f 2//1 4//1 1//1 -f 4//2 8//2 3//2 -f 8//3 6//3 7//3 -f 6//4 2//4 5//4 -f 1//5 3//5 5//5 -f 6//6 8//6 2//6 +f 4/1/1 3/2/1 1/3/1 +f 8/4/2 7/5/2 3/2/2 +f 6/6/3 5/7/3 7/8/3 +f 2/9/4 1/10/4 5/7/4 +f 3/2/5 7/7/5 5/10/5 +f 8/11/6 4/1/6 2/12/6 +f 2/12/1 4/1/1 1/3/1 +f 4/1/2 8/4/2 3/2/2 +f 8/13/3 6/6/3 7/8/3 +f 6/6/4 2/9/4 5/7/4 +f 1/3/5 3/2/5 5/10/5 +f 6/14/6 8/11/6 2/12/6 diff --git a/assets/hbm/models/cwis_gun.obj b/assets/hbm/models/cwis_gun.obj index 291bf3e99..b0a3f9bfc 100644 --- a/assets/hbm/models/cwis_gun.obj +++ b/assets/hbm/models/cwis_gun.obj @@ -97,6 +97,184 @@ v -0.099103 0.028349 2.000000 v -0.055801 0.003349 2.000000 v -0.099103 0.028349 0.550000 v -0.055801 0.003349 0.550000 +vt 0.550118 0.760811 +vt 0.591204 0.760811 +vt 0.591204 0.803757 +vt 0.632291 0.760811 +vt 0.673377 0.760811 +vt 0.673377 0.803757 +vt 0.714463 0.760811 +vt 0.714463 0.803757 +vt 0.385773 0.760811 +vt 0.426859 0.760811 +vt 0.426859 0.803757 +vt 0.467946 0.760811 +vt 0.781571 0.779002 +vt 0.752518 0.708863 +vt 0.822657 0.679811 +vt 0.509032 0.760811 +vt 0.550118 0.803757 +vt 0.509032 0.803757 +vt 0.781571 0.916248 +vt 0.752519 0.846109 +vt 0.822657 0.817057 +vt 0.550118 0.679811 +vt 0.550118 0.722756 +vt 0.509032 0.722756 +vt 0.467946 0.722756 +vt 0.467946 0.679811 +vt 0.426859 0.722756 +vt 0.426859 0.679811 +vt 0.385773 0.722756 +vt 0.385773 0.679811 +vt 0.714463 0.722756 +vt 0.673377 0.722756 +vt 0.673377 0.679811 +vt 0.632291 0.722756 +vt 0.951920 0.118219 +vt 0.881781 0.089166 +vt 0.910834 0.019028 +vt 0.591204 0.722756 +vt 0.632291 0.679811 +vt 0.183373 0.233755 +vt 0.142286 0.233755 +vt 0.142286 0.019028 +vt 0.101200 0.233755 +vt 0.101200 0.019028 +vt 0.060114 0.233755 +vt 0.060114 0.019028 +vt 0.019028 0.233755 +vt 0.019028 0.019028 +vt 0.347718 0.233755 +vt 0.306632 0.233755 +vt 0.306632 0.019028 +vt 0.265545 0.233755 +vt 0.265545 0.019028 +vt 0.414825 0.941003 +vt 0.414825 0.841812 +vt 0.455912 0.841812 +vt 0.224459 0.019028 +vt 0.224459 0.233755 +vt 0.552072 0.941003 +vt 0.552072 0.841812 +vt 0.593158 0.841812 +vt 0.676830 0.019028 +vt 0.698302 0.019028 +vt 0.698303 0.641726 +vt 0.509936 0.019028 +vt 0.531409 0.019028 +vt 0.531408 0.641726 +vt 0.655356 0.641726 +vt 0.633883 0.641726 +vt 0.633884 0.019028 +vt 0.266926 0.293283 +vt 0.266926 0.271810 +vt 0.288398 0.271810 +vt 0.719775 0.019028 +vt 0.719777 0.641726 +vt 0.655357 0.019028 +vt 0.676830 0.641726 +vt 0.574354 0.641726 +vt 0.552882 0.641726 +vt 0.552881 0.019028 +vt 0.266926 0.352811 +vt 0.266926 0.331338 +vt 0.288398 0.331338 +vt 0.574355 0.019028 +vt 0.595827 0.019028 +vt 0.595828 0.641726 +vt 0.061974 0.271810 +vt 0.083446 0.271810 +vt 0.083448 0.894508 +vt 0.757834 0.019028 +vt 0.779306 0.019028 +vt 0.779306 0.641726 +vt 0.040500 0.894508 +vt 0.019028 0.894508 +vt 0.019028 0.271810 +vt 0.288398 0.590923 +vt 0.266926 0.590923 +vt 0.266926 0.569450 +vt 0.104919 0.271810 +vt 0.104921 0.894508 +vt 0.040501 0.271810 +vt 0.061974 0.894508 +vt 0.822252 0.641725 +vt 0.800780 0.641726 +vt 0.800779 0.019028 +vt 0.288398 0.531395 +vt 0.266926 0.531395 +vt 0.266926 0.509922 +vt 0.822253 0.019028 +vt 0.843725 0.019028 +vt 0.843726 0.641726 +vt 0.428934 0.019043 +vt 0.450407 0.019050 +vt 0.450193 0.641748 +vt 0.142978 0.271810 +vt 0.164451 0.271810 +vt 0.164450 0.894508 +vt 0.407245 0.641733 +vt 0.385773 0.641726 +vt 0.385988 0.019028 +vt 0.266926 0.450394 +vt 0.288398 0.450394 +vt 0.288398 0.471867 +vt 0.471879 0.019057 +vt 0.471667 0.641755 +vt 0.407462 0.019035 +vt 0.428719 0.641741 +vt 0.207397 0.894508 +vt 0.185924 0.894508 +vt 0.185923 0.271810 +vt 0.288398 0.390866 +vt 0.288398 0.412339 +vt 0.266926 0.412339 +vt 0.207397 0.271810 +vt 0.228869 0.271810 +vt 0.228870 0.894508 +vt 0.632291 0.803757 +vt 0.385773 0.803757 +vt 0.467946 0.803757 +vt 0.851710 0.708863 +vt 0.851710 0.749949 +vt 0.822657 0.779002 +vt 0.752519 0.749949 +vt 0.781571 0.679811 +vt 0.851710 0.846109 +vt 0.851710 0.887195 +vt 0.822657 0.916248 +vt 0.752518 0.887195 +vt 0.781571 0.817057 +vt 0.509032 0.679811 +vt 0.714463 0.679811 +vt 0.951920 0.019028 +vt 0.980972 0.048080 +vt 0.980972 0.089166 +vt 0.910834 0.118219 +vt 0.881781 0.048080 +vt 0.591204 0.679811 +vt 0.183373 0.019028 +vt 0.347718 0.019028 +vt 0.484964 0.870865 +vt 0.484964 0.911951 +vt 0.455912 0.941003 +vt 0.385773 0.911951 +vt 0.385773 0.870865 +vt 0.622210 0.870864 +vt 0.622210 0.911951 +vt 0.593158 0.941003 +vt 0.523019 0.911951 +vt 0.523019 0.870864 +vt 0.509934 0.641726 +vt 0.288398 0.293283 +vt 0.288398 0.352811 +vt 0.757832 0.641725 +vt 0.288398 0.569450 +vt 0.288398 0.509922 +vt 0.142977 0.894508 +vt 0.266926 0.471867 +vt 0.266926 0.390866 vn 0.382700 0.923900 0.000000 vn 0.923900 0.382700 -0.000000 vn 0.923900 -0.382700 0.000000 @@ -120,141 +298,141 @@ vn -0.500000 -0.866000 0.000000 vn -0.866000 0.500000 -0.000000 vn 0.866000 -0.500000 0.000000 s off -f 2//1 4//1 3//1 -f 3//2 4//2 6//2 -f 6//3 8//3 7//3 -f 8//4 10//4 9//4 -f 10//5 12//5 11//5 -f 11//6 12//6 14//6 -f 14//7 10//7 6//7 -f 16//8 2//8 1//8 -f 14//9 16//9 15//9 -f 7//10 11//10 15//10 -f 17//1 18//1 20//1 -f 20//2 22//2 21//2 -f 22//3 24//3 23//3 -f 24//4 26//4 25//4 -f 26//5 28//5 27//5 -f 27//6 28//6 30//6 -f 30//7 26//7 22//7 -f 32//8 18//8 17//8 -f 29//9 30//9 32//9 -f 34//1 36//1 35//1 -f 36//2 38//2 37//2 -f 38//3 40//3 39//3 -f 40//4 42//4 41//4 -f 42//5 44//5 43//5 -f 44//6 46//6 45//6 -f 46//7 40//7 38//7 -f 47//8 48//8 34//8 -f 46//9 48//9 47//9 -f 39//10 45//10 47//10 -f 52//11 51//11 49//11 -f 60//11 59//11 57//11 -f 54//12 53//12 55//12 -f 50//7 49//7 53//7 -f 51//13 55//13 53//13 -f 56//14 52//14 50//14 -f 62//12 61//12 63//12 -f 58//7 57//7 61//7 -f 59//13 63//13 61//13 -f 64//14 60//14 58//14 -f 68//15 67//15 65//15 -f 76//15 75//15 73//15 -f 70//16 69//16 71//16 -f 66//7 65//7 69//7 -f 67//17 71//17 69//17 -f 72//18 68//18 66//18 -f 78//16 77//16 79//16 -f 74//7 73//7 77//7 -f 75//17 79//17 77//17 -f 80//18 76//18 74//18 -f 84//19 83//19 81//19 -f 92//19 91//19 89//19 -f 86//20 85//20 87//20 -f 82//7 81//7 85//7 -f 83//21 87//21 85//21 -f 88//22 84//22 82//22 -f 94//20 93//20 95//20 -f 94//7 90//7 89//7 -f 91//21 95//21 93//21 -f 96//22 92//22 90//22 -f 1//1 2//1 3//1 -f 5//2 3//2 6//2 -f 5//3 6//3 7//3 -f 7//4 8//4 9//4 -f 9//5 10//5 11//5 -f 13//6 11//6 14//6 -f 6//7 4//7 2//7 -f 2//7 16//7 14//7 -f 14//7 12//7 10//7 -f 10//7 8//7 6//7 -f 6//7 2//7 14//7 -f 15//8 16//8 1//8 -f 13//9 14//9 15//9 -f 15//10 1//10 3//10 -f 3//10 5//10 15//10 -f 7//10 9//10 11//10 -f 11//10 13//10 15//10 -f 15//10 5//10 7//10 -f 19//1 17//1 20//1 -f 19//2 20//2 21//2 -f 21//3 22//3 23//3 -f 23//4 24//4 25//4 -f 25//5 26//5 27//5 -f 29//6 27//6 30//6 -f 22//7 20//7 18//7 -f 18//7 32//7 30//7 -f 30//7 28//7 26//7 -f 26//7 24//7 22//7 -f 22//7 18//7 30//7 -f 31//8 32//8 17//8 -f 31//9 29//9 32//9 -f 33//1 34//1 35//1 -f 35//2 36//2 37//2 -f 37//3 38//3 39//3 -f 39//4 40//4 41//4 -f 41//5 42//5 43//5 -f 43//6 44//6 45//6 -f 38//7 36//7 34//7 -f 34//7 48//7 46//7 -f 46//7 44//7 42//7 -f 42//7 40//7 46//7 -f 38//7 34//7 46//7 -f 33//8 47//8 34//8 -f 45//9 46//9 47//9 -f 47//10 33//10 35//10 -f 35//10 37//10 47//10 -f 39//10 41//10 43//10 -f 43//10 45//10 39//10 -f 47//10 37//10 39//10 -f 50//11 52//11 49//11 -f 58//11 60//11 57//11 -f 56//12 54//12 55//12 -f 54//7 50//7 53//7 -f 49//13 51//13 53//13 -f 54//14 56//14 50//14 -f 64//12 62//12 63//12 -f 62//7 58//7 61//7 -f 57//13 59//13 61//13 -f 62//14 64//14 58//14 -f 66//15 68//15 65//15 -f 74//15 76//15 73//15 -f 72//16 70//16 71//16 -f 70//7 66//7 69//7 -f 65//17 67//17 69//17 -f 70//18 72//18 66//18 -f 80//16 78//16 79//16 -f 78//7 74//7 77//7 -f 73//17 75//17 77//17 -f 78//18 80//18 74//18 -f 82//19 84//19 81//19 -f 90//19 92//19 89//19 -f 88//20 86//20 87//20 -f 86//7 82//7 85//7 -f 81//21 83//21 85//21 -f 86//22 88//22 82//22 -f 96//20 94//20 95//20 -f 93//7 94//7 89//7 -f 89//21 91//21 93//21 -f 94//22 96//22 90//22 +f 2/1/1 4/2/1 3/3/1 +f 3/3/2 4/2/2 6/4/2 +f 6/4/3 8/5/3 7/6/3 +f 8/5/4 10/7/4 9/8/4 +f 10/9/5 12/10/5 11/11/5 +f 11/11/6 12/10/6 14/12/6 +f 14/13/7 10/14/7 6/15/7 +f 16/16/8 2/1/8 1/17/8 +f 14/12/9 16/16/9 15/18/9 +f 7/19/10 11/20/10 15/21/10 +f 17/22/1 18/23/1 20/24/1 +f 20/24/2 22/25/2 21/26/2 +f 22/25/3 24/27/3 23/28/3 +f 24/27/4 26/29/4 25/30/4 +f 26/31/5 28/32/5 27/33/5 +f 27/33/6 28/32/6 30/34/6 +f 30/35/7 26/36/7 22/37/7 +f 32/38/8 18/23/8 17/22/8 +f 29/39/9 30/34/9 32/38/9 +f 34/40/1 36/41/1 35/42/1 +f 36/41/2 38/43/2 37/44/2 +f 38/43/3 40/45/3 39/46/3 +f 40/45/4 42/47/4 41/48/4 +f 42/49/5 44/50/5 43/51/5 +f 44/50/6 46/52/6 45/53/6 +f 46/54/7 40/55/7 38/56/7 +f 47/57/8 48/58/8 34/40/8 +f 46/52/9 48/58/9 47/57/9 +f 39/59/10 45/60/10 47/61/10 +f 52/62/11 51/63/11 49/64/11 +f 60/65/11 59/66/11 57/67/11 +f 54/68/12 53/69/12 55/70/12 +f 50/71/7 49/72/7 53/73/7 +f 51/63/13 55/74/13 53/75/13 +f 56/76/14 52/62/14 50/77/14 +f 62/78/12 61/79/12 63/80/12 +f 58/81/7 57/82/7 61/83/7 +f 59/66/13 63/80/13 61/79/13 +f 64/84/14 60/85/14 58/86/14 +f 68/87/15 67/88/15 65/89/15 +f 76/90/15 75/91/15 73/92/15 +f 70/93/16 69/94/16 71/95/16 +f 66/96/7 65/97/7 69/98/7 +f 67/88/17 71/99/17 69/100/17 +f 72/101/18 68/87/18 66/102/18 +f 78/103/16 77/104/16 79/105/16 +f 74/106/7 73/107/7 77/108/7 +f 75/91/17 79/105/17 77/104/17 +f 80/109/18 76/110/18 74/111/18 +f 84/112/19 83/113/19 81/114/19 +f 92/115/19 91/116/19 89/117/19 +f 86/118/20 85/119/20 87/120/20 +f 82/121/7 81/122/7 85/123/7 +f 83/113/21 87/124/21 85/125/21 +f 88/126/22 84/112/22 82/127/22 +f 94/128/20 93/129/20 95/130/20 +f 94/131/7 90/132/7 89/133/7 +f 91/116/21 95/130/21 93/129/21 +f 96/134/22 92/135/22 90/136/22 +f 1/17/1 2/1/1 3/3/1 +f 5/137/2 3/3/2 6/4/2 +f 5/137/3 6/4/3 7/6/3 +f 7/6/4 8/5/4 9/8/4 +f 9/138/5 10/9/5 11/11/5 +f 13/139/6 11/11/6 14/12/6 +f 6/15/7 4/140/7 2/141/7 +f 2/141/7 16/142/7 14/13/7 +f 14/13/7 12/143/7 10/14/7 +f 10/14/7 8/144/7 6/15/7 +f 6/15/7 2/141/7 14/13/7 +f 15/18/8 16/16/8 1/17/8 +f 13/139/9 14/12/9 15/18/9 +f 15/21/10 1/145/10 3/146/10 +f 3/146/10 5/147/10 15/21/10 +f 7/19/10 9/148/10 11/20/10 +f 11/20/10 13/149/10 15/21/10 +f 15/21/10 5/147/10 7/19/10 +f 19/150/1 17/22/1 20/24/1 +f 19/150/2 20/24/2 21/26/2 +f 21/26/3 22/25/3 23/28/3 +f 23/28/4 24/27/4 25/30/4 +f 25/151/5 26/31/5 27/33/5 +f 29/39/6 27/33/6 30/34/6 +f 22/37/7 20/152/7 18/153/7 +f 18/153/7 32/154/7 30/35/7 +f 30/35/7 28/155/7 26/36/7 +f 26/36/7 24/156/7 22/37/7 +f 22/37/7 18/153/7 30/35/7 +f 31/157/8 32/38/8 17/22/8 +f 31/157/9 29/39/9 32/38/9 +f 33/158/1 34/40/1 35/42/1 +f 35/42/2 36/41/2 37/44/2 +f 37/44/3 38/43/3 39/46/3 +f 39/46/4 40/45/4 41/48/4 +f 41/159/5 42/49/5 43/51/5 +f 43/51/6 44/50/6 45/53/6 +f 38/56/7 36/160/7 34/161/7 +f 34/161/7 48/162/7 46/54/7 +f 46/54/7 44/163/7 42/164/7 +f 42/164/7 40/55/7 46/54/7 +f 38/56/7 34/161/7 46/54/7 +f 33/158/8 47/57/8 34/40/8 +f 45/53/9 46/52/9 47/57/9 +f 47/61/10 33/165/10 35/166/10 +f 35/166/10 37/167/10 47/61/10 +f 39/59/10 41/168/10 43/169/10 +f 43/169/10 45/60/10 39/59/10 +f 47/61/10 37/167/10 39/59/10 +f 50/77/11 52/62/11 49/64/11 +f 58/170/11 60/65/11 57/67/11 +f 56/76/12 54/68/12 55/70/12 +f 54/171/7 50/71/7 53/73/7 +f 49/64/13 51/63/13 53/75/13 +f 54/68/14 56/76/14 50/77/14 +f 64/84/12 62/78/12 63/80/12 +f 62/172/7 58/81/7 61/83/7 +f 57/67/13 59/66/13 61/79/13 +f 62/78/14 64/84/14 58/86/14 +f 66/102/15 68/87/15 65/89/15 +f 74/173/15 76/90/15 73/92/15 +f 72/101/16 70/93/16 71/95/16 +f 70/174/7 66/96/7 69/98/7 +f 65/89/17 67/88/17 69/100/17 +f 70/93/18 72/101/18 66/102/18 +f 80/109/16 78/103/16 79/105/16 +f 78/175/7 74/106/7 77/108/7 +f 73/92/17 75/91/17 77/104/17 +f 78/103/18 80/109/18 74/111/18 +f 82/127/19 84/112/19 81/114/19 +f 90/176/19 92/115/19 89/117/19 +f 88/126/20 86/118/20 87/120/20 +f 86/177/7 82/121/7 85/123/7 +f 81/114/21 83/113/21 85/125/21 +f 86/118/22 88/126/22 82/127/22 +f 96/134/20 94/128/20 95/130/20 +f 93/178/7 94/131/7 89/133/7 +f 89/117/21 91/116/21 93/129/21 +f 94/128/22 96/134/22 90/136/22 diff --git a/assets/hbm/models/cwis_head.obj b/assets/hbm/models/cwis_head.obj index 8fc1d2175..fe093b5d8 100644 --- a/assets/hbm/models/cwis_head.obj +++ b/assets/hbm/models/cwis_head.obj @@ -114,6 +114,218 @@ v 0.300000 -0.500000 -0.250000 v 0.400000 -0.250000 -0.150000 v 0.300000 -0.500000 -0.300000 v 0.400000 -0.250000 -0.400000 +vt 0.192029 0.192029 +vt 0.192029 0.280351 +vt 0.015385 0.280351 +vt 0.368673 0.192029 +vt 0.368673 0.280351 +vt 0.545317 0.192029 +vt 0.545317 0.280351 +vt 0.807971 0.378738 +vt 0.807971 0.290416 +vt 0.984615 0.290416 +vt 0.368673 0.456995 +vt 0.192029 0.015385 +vt 0.680241 0.170636 +vt 0.680241 0.104395 +vt 0.746483 0.104395 +vt 0.801684 0.259645 +vt 0.625040 0.259645 +vt 0.625040 0.015385 +vt 0.801684 0.015385 +vt 0.576088 0.181676 +vt 0.564012 0.487768 +vt 0.564011 0.752734 +vt 0.518292 0.752734 +vt 0.472573 0.752733 +vt 0.472575 0.487768 +vt 0.426855 0.752733 +vt 0.426856 0.487767 +vt 0.381136 0.752733 +vt 0.381137 0.487767 +vt 0.335417 0.752733 +vt 0.278268 0.843295 +vt 0.266839 0.887562 +vt 0.255409 0.843295 +vt 0.247042 0.798349 +vt 0.286636 0.798349 +vt 0.243980 0.752733 +vt 0.323987 0.843296 +vt 0.312557 0.887563 +vt 0.301128 0.843296 +vt 0.292761 0.798349 +vt 0.332355 0.798349 +vt 0.289698 0.752733 +vt 0.369706 0.843296 +vt 0.358276 0.887563 +vt 0.346847 0.843296 +vt 0.403995 0.887563 +vt 0.392565 0.843296 +vt 0.415425 0.843296 +vt 0.449713 0.887563 +vt 0.438284 0.843296 +vt 0.461143 0.843296 +vt 0.484003 0.843296 +vt 0.506862 0.843296 +vt 0.495432 0.887563 +vt 0.529722 0.843296 +vt 0.552581 0.843296 +vt 0.541151 0.887563 +vt 0.049674 0.843295 +vt 0.038244 0.887562 +vt 0.026815 0.843295 +vt 0.095393 0.843295 +vt 0.083963 0.887562 +vt 0.072534 0.843295 +vt 0.141112 0.843295 +vt 0.129682 0.887562 +vt 0.118253 0.843295 +vt 0.163971 0.843295 +vt 0.186831 0.843295 +vt 0.175401 0.887562 +vt 0.232550 0.843295 +vt 0.221120 0.887563 +vt 0.209690 0.843295 +vt 0.201323 0.798349 +vt 0.198261 0.752732 +vt 0.240917 0.798349 +vt 0.195198 0.798348 +vt 0.155604 0.798348 +vt 0.109886 0.798348 +vt 0.106823 0.752732 +vt 0.152542 0.752732 +vt 0.149479 0.798348 +vt 0.064167 0.798348 +vt 0.103760 0.798348 +vt 0.061104 0.752732 +vt 0.018448 0.798348 +vt 0.058041 0.798348 +vt 0.015385 0.752732 +vt 0.521355 0.798350 +vt 0.560948 0.798350 +vt 0.475636 0.798350 +vt 0.515230 0.798350 +vt 0.429917 0.798349 +vt 0.469511 0.798349 +vt 0.423792 0.798349 +vt 0.338480 0.798349 +vt 0.378073 0.798349 +vt 0.384198 0.798349 +vt 0.015386 0.487766 +vt 0.061105 0.487766 +vt 0.289699 0.487767 +vt 0.198262 0.487767 +vt 0.152543 0.487766 +vt 0.746483 0.170636 +vt 0.850636 0.093354 +vt 0.622041 0.762079 +vt 0.622041 0.739219 +vt 0.825182 0.739220 +vt 0.622041 0.716360 +vt 0.825182 0.716360 +vt 0.622041 0.693501 +vt 0.825182 0.693501 +vt 0.622041 0.670641 +vt 0.825182 0.670642 +vt 0.622041 0.647782 +vt 0.825182 0.647782 +vt 0.622041 0.624922 +vt 0.825182 0.624923 +vt 0.622042 0.602063 +vt 0.825182 0.602064 +vt 0.622042 0.579204 +vt 0.825182 0.579204 +vt 0.622042 0.556344 +vt 0.825182 0.556345 +vt 0.622042 0.533485 +vt 0.825182 0.533486 +vt 0.594783 0.691786 +vt 0.594783 0.672356 +vt 0.622042 0.510625 +vt 0.622042 0.487766 +vt 0.825183 0.487767 +vt 0.825182 0.510626 +vt 0.911978 0.846936 +vt 0.838096 0.866733 +vt 0.857892 0.792850 +vt 0.855953 0.514308 +vt 0.882496 0.487766 +vt 0.928469 0.533739 +vt 0.594784 0.508911 +vt 0.594783 0.760364 +vt 0.594783 0.740934 +vt 0.594783 0.714646 +vt 0.594783 0.695215 +vt 0.594784 0.531770 +vt 0.594784 0.512340 +vt 0.594783 0.737505 +vt 0.594784 0.554630 +vt 0.594784 0.535199 +vt 0.594783 0.577489 +vt 0.594784 0.558059 +vt 0.594783 0.600348 +vt 0.594783 0.623208 +vt 0.594783 0.603777 +vt 0.594783 0.646067 +vt 0.594783 0.626637 +vt 0.594783 0.668927 +vt 0.594783 0.649496 +vt 0.576088 0.320315 +vt 0.623651 0.337979 +vt 0.623651 0.346811 +vt 0.747302 0.290416 +vt 0.729637 0.337979 +vt 0.777200 0.364476 +vt 0.729637 0.346811 +vt 0.605986 0.394374 +vt 0.594783 0.822748 +vt 0.642346 0.840413 +vt 0.642346 0.849245 +vt 0.765997 0.792850 +vt 0.748332 0.840413 +vt 0.795895 0.866909 +vt 0.748332 0.849245 +vt 0.624682 0.896808 +vt 0.015385 0.192029 +vt 0.984615 0.378738 +vt 0.192029 0.456995 +vt 0.368673 0.015385 +vt 0.576088 0.093354 +vt 0.518293 0.487768 +vt 0.335418 0.487767 +vt 0.106824 0.487766 +vt 0.243980 0.487767 +vt 0.850636 0.181676 +vt 0.825182 0.762079 +vt 0.880752 0.792850 +vt 0.900549 0.804280 +vt 0.911978 0.824077 +vt 0.900549 0.866733 +vt 0.880752 0.878162 +vt 0.857892 0.878162 +vt 0.826666 0.846936 +vt 0.826666 0.824076 +vt 0.838096 0.804280 +vt 0.918754 0.550566 +vt 0.865668 0.550566 +vt 0.901926 0.560282 +vt 0.882496 0.560281 +vt 0.855953 0.533739 +vt 0.865669 0.497481 +vt 0.901926 0.487766 +vt 0.918754 0.497481 +vt 0.928469 0.514309 +vt 0.594784 0.489480 +vt 0.594783 0.718075 +vt 0.594783 0.580918 +vt 0.576088 0.364476 +vt 0.605986 0.290416 +vt 0.777200 0.320315 +vt 0.747302 0.394374 +vt 0.594783 0.866909 +vt 0.624682 0.792850 +vt 0.795895 0.822748 +vt 0.765997 0.896808 vn -1.000000 0.000000 0.000000 vn 0.000000 0.000000 -1.000000 vn 1.000000 0.000000 0.000000 @@ -205,197 +417,197 @@ vn 0.684600 0.250600 0.684600 vn 0.687300 0.687400 0.234700 vn 0.687300 -0.687400 0.234700 s off -f 4//1 3//1 1//1 -f 8//2 7//2 3//2 -f 6//3 5//3 7//3 -f 2//4 1//4 5//4 -f 3//5 7//5 5//5 -f 8//6 4//6 2//6 -f 10//4 9//4 11//4 -f 6//7 2//7 10//7 -f 1//8 5//8 11//8 -f 9//9 10//9 2//9 -f 15//10 45//10 39//10 -f 39//11 30//11 17//11 -f 17//12 30//12 28//12 -f 18//13 28//13 56//13 -f 19//14 56//14 50//14 -f 49//15 14//15 43//15 -f 49//16 43//16 42//16 -f 48//17 42//17 38//17 -f 55//18 14//18 49//18 -f 48//19 54//19 55//19 -f 44//20 50//20 54//20 -f 61//21 14//21 55//21 -f 14//22 61//22 13//22 -f 14//23 13//23 32//23 -f 32//24 41//24 14//24 -f 41//25 47//25 14//25 -f 53//26 14//26 47//26 -f 59//27 14//27 53//27 -f 35//28 14//28 59//28 -f 35//29 37//29 14//29 -f 43//30 14//30 37//30 -f 43//31 37//31 36//31 -f 29//32 38//32 42//32 -f 36//33 37//33 35//33 -f 29//34 36//34 34//34 -f 35//35 59//35 58//35 -f 57//36 33//36 34//36 -f 53//37 52//37 58//37 -f 52//38 51//38 57//38 -f 47//39 46//39 52//39 -f 46//40 45//40 51//40 -f 41//41 40//41 46//41 -f 40//42 39//42 45//42 -f 32//43 31//43 40//43 -f 31//44 30//44 39//44 -f 32//45 13//45 27//45 -f 28//46 30//46 31//46 -f 27//47 13//47 61//47 -f 54//48 60//48 61//48 -f 50//49 56//49 60//49 -f 28//50 27//50 60//50 -f 45//51 15//51 26//51 -f 57//52 51//52 26//52 -f 50//53 44//53 21//53 -f 21//54 44//54 38//54 -f 38//55 29//55 23//55 -f 29//56 33//56 24//56 -f 24//57 33//57 57//57 -f 12//58 11//58 5//58 -f 63//59 65//59 64//59 -f 65//60 67//60 66//60 -f 67//61 69//61 68//61 -f 69//62 71//62 70//62 -f 71//63 73//63 72//63 -f 73//64 75//64 74//64 -f 75//65 77//65 76//65 -f 77//66 79//66 78//66 -f 79//67 81//67 80//67 -f 81//68 83//68 82//68 -f 69//69 89//69 90//69 -f 85//70 63//70 62//70 -f 83//71 85//71 84//71 -f 68//2 76//2 84//2 -f 94//4 92//4 88//4 -f 63//72 85//72 97//72 -f 63//73 87//73 86//73 -f 67//74 88//74 89//74 -f 83//75 96//75 97//75 -f 67//76 65//76 86//76 -f 81//77 95//77 96//77 -f 79//78 94//78 95//78 -f 79//79 77//79 93//79 -f 75//80 92//80 93//80 -f 73//81 91//81 92//81 -f 71//82 90//82 91//82 -f 101//83 100//83 98//83 -f 105//84 104//84 100//84 -f 103//85 102//85 104//85 -f 99//86 98//86 102//86 -f 100//5 104//5 102//5 -f 109//83 108//83 106//83 -f 113//84 112//84 108//84 -f 111//85 110//85 112//85 -f 107//86 106//86 110//86 -f 108//5 112//5 110//5 -f 2//1 4//1 1//1 -f 4//2 8//2 3//2 -f 8//3 6//3 7//3 -f 6//4 2//4 5//4 -f 1//5 3//5 5//5 -f 6//6 8//6 2//6 -f 12//4 10//4 11//4 -f 12//7 6//7 10//7 -f 9//8 1//8 11//8 -f 1//9 9//9 2//9 -f 16//10 15//10 39//10 -f 16//11 39//11 17//11 -f 18//12 17//12 28//12 -f 19//13 18//13 56//13 -f 20//14 19//14 50//14 -f 48//16 49//16 42//16 -f 44//17 48//17 38//17 -f 49//19 48//19 55//19 -f 48//20 44//20 54//20 -f 42//31 43//31 36//31 -f 36//32 29//32 42//32 -f 34//33 36//33 35//33 -f 33//34 29//34 34//34 -f 34//35 35//35 58//35 -f 58//36 57//36 34//36 -f 59//37 53//37 58//37 -f 58//38 52//38 57//38 -f 53//39 47//39 52//39 -f 52//40 46//40 51//40 -f 47//41 41//41 46//41 -f 46//42 40//42 45//42 -f 41//43 32//43 40//43 -f 40//87 31//87 39//87 -f 31//45 32//45 27//45 -f 27//46 28//46 31//46 -f 60//47 27//47 61//47 -f 55//48 54//48 61//48 -f 54//88 50//88 60//88 -f 56//50 28//50 60//50 -f 51//51 45//51 26//51 -f 25//52 57//52 26//52 -f 20//53 50//53 21//53 -f 22//54 21//54 38//54 -f 22//55 38//55 23//55 -f 23//56 29//56 24//56 -f 25//57 24//57 57//57 -f 6//58 12//58 5//58 -f 62//59 63//59 64//59 -f 64//60 65//60 66//60 -f 66//61 67//61 68//61 -f 68//62 69//62 70//62 -f 70//63 71//63 72//63 -f 72//64 73//64 74//64 -f 74//65 75//65 76//65 -f 76//66 77//66 78//66 -f 78//67 79//67 80//67 -f 80//68 81//68 82//68 -f 71//69 69//69 90//69 -f 84//70 85//70 62//70 -f 82//71 83//71 84//71 -f 84//2 62//2 64//2 -f 64//2 66//2 84//2 -f 68//2 70//2 72//2 -f 72//2 74//2 68//2 -f 76//2 78//2 80//2 -f 80//2 82//2 84//2 -f 84//2 66//2 68//2 -f 68//2 74//2 76//2 -f 76//2 80//2 84//2 -f 88//4 86//4 96//4 -f 87//4 97//4 96//4 -f 96//4 95//4 94//4 -f 94//4 93//4 92//4 -f 92//4 91//4 88//4 -f 90//4 89//4 88//4 -f 86//4 87//4 96//4 -f 96//4 94//4 88//4 -f 91//4 90//4 88//4 -f 87//72 63//72 97//72 -f 65//73 63//73 86//73 -f 69//74 67//74 89//74 -f 85//75 83//75 97//75 -f 88//89 67//89 86//89 -f 83//77 81//77 96//77 -f 81//78 79//78 95//78 -f 94//79 79//79 93//79 -f 77//80 75//80 93//80 -f 75//81 73//81 92//81 -f 73//90 71//90 91//90 -f 99//83 101//83 98//83 -f 101//84 105//84 100//84 -f 105//85 103//85 104//85 -f 103//86 99//86 102//86 -f 98//5 100//5 102//5 -f 107//83 109//83 106//83 -f 109//84 113//84 108//84 -f 113//85 111//85 112//85 -f 111//86 107//86 110//86 -f 106//5 108//5 110//5 +f 4/1/1 3/2/1 1/3/1 +f 8/4/2 7/5/2 3/2/2 +f 6/6/3 5/7/3 7/5/3 +f 2/8/4 1/9/4 5/10/4 +f 3/2/5 7/5/5 5/11/5 +f 8/4/6 4/1/6 2/12/6 +f 10/13/4 9/14/4 11/15/4 +f 6/16/7 2/17/7 10/13/7 +f 1/18/8 5/19/8 11/15/8 +f 9/14/9 10/13/9 2/20/9 +f 15/21/10 45/22/10 39/23/10 +f 39/23/11 30/24/11 17/25/11 +f 17/25/12 30/24/12 28/26/12 +f 18/27/13 28/26/13 56/28/13 +f 19/29/14 56/28/14 50/30/14 +f 49/31/15 14/32/15 43/33/15 +f 49/31/16 43/33/16 42/34/16 +f 48/35/17 42/34/17 38/36/17 +f 55/37/18 14/38/18 49/39/18 +f 48/40/19 54/41/19 55/37/19 +f 44/42/20 50/30/20 54/41/20 +f 61/43/21 14/44/21 55/45/21 +f 14/46/22 61/47/22 13/48/22 +f 14/49/23 13/50/23 32/51/23 +f 32/52/24 41/53/24 14/54/24 +f 41/55/25 47/56/25 14/57/25 +f 53/58/26 14/59/26 47/60/26 +f 59/61/27 14/62/27 53/63/27 +f 35/64/28 14/65/28 59/66/28 +f 35/67/29 37/68/29 14/69/29 +f 43/70/30 14/71/30 37/72/30 +f 43/70/31 37/72/31 36/73/31 +f 29/74/32 38/36/32 42/75/32 +f 36/76/33 37/68/33 35/67/33 +f 29/74/34 36/76/34 34/77/34 +f 35/64/35 59/66/35 58/78/35 +f 57/79/36 33/80/36 34/81/36 +f 53/63/37 52/82/37 58/83/37 +f 52/82/38 51/84/38 57/79/38 +f 47/60/39 46/85/39 52/86/39 +f 46/85/40 45/87/40 51/84/40 +f 41/55/41 40/88/41 46/89/41 +f 40/88/42 39/23/42 45/22/42 +f 32/52/43 31/90/43 40/91/43 +f 31/90/44 30/24/44 39/23/44 +f 32/51/45 13/50/45 27/92/45 +f 28/26/46 30/24/46 31/93/46 +f 27/94/47 13/48/47 61/47/47 +f 54/95/48 60/96/48 61/43/48 +f 50/30/49 56/28/49 60/96/49 +f 28/26/50 27/94/50 60/97/50 +f 45/87/51 15/98/51 26/99/51 +f 57/79/52 51/84/52 26/99/52 +f 50/30/53 44/42/53 21/100/53 +f 21/100/54 44/42/54 38/36/54 +f 38/36/55 29/74/55 23/101/55 +f 29/74/56 33/80/56 24/102/56 +f 24/102/57 33/80/57 57/79/57 +f 12/103/58 11/15/58 5/104/58 +f 63/105/59 65/106/59 64/107/59 +f 65/106/60 67/108/60 66/109/60 +f 67/108/61 69/110/61 68/111/61 +f 69/110/62 71/112/62 70/113/62 +f 71/112/63 73/114/63 72/115/63 +f 73/114/64 75/116/64 74/117/64 +f 75/116/65 77/118/65 76/119/65 +f 77/118/66 79/120/66 78/121/66 +f 79/120/67 81/122/67 80/123/67 +f 81/122/68 83/124/68 82/125/68 +f 69/110/69 89/126/69 90/127/69 +f 85/128/70 63/129/70 62/130/70 +f 83/124/71 85/128/71 84/131/71 +f 68/132/2 76/133/2 84/134/2 +f 94/135/4 92/136/4 88/137/4 +f 63/129/72 85/128/72 97/138/72 +f 63/105/73 87/139/73 86/140/73 +f 67/108/74 88/141/74 89/142/74 +f 83/124/75 96/143/75 97/144/75 +f 67/108/76 65/106/76 86/145/76 +f 81/122/77 95/146/77 96/147/77 +f 79/120/78 94/148/78 95/149/78 +f 79/120/79 77/118/79 93/150/79 +f 75/116/80 92/151/80 93/152/80 +f 73/114/81 91/153/81 92/154/81 +f 71/112/82 90/155/82 91/156/82 +f 101/157/83 100/158/83 98/159/83 +f 105/160/84 104/161/84 100/158/84 +f 103/162/85 102/163/85 104/161/85 +f 99/164/86 98/159/86 102/163/86 +f 100/158/5 104/161/5 102/163/5 +f 109/165/83 108/166/83 106/167/83 +f 113/168/84 112/169/84 108/166/84 +f 111/170/85 110/171/85 112/169/85 +f 107/172/86 106/167/86 110/171/86 +f 108/166/5 112/169/5 110/171/5 +f 2/173/1 4/1/1 1/3/1 +f 4/1/2 8/4/2 3/2/2 +f 8/4/3 6/6/3 7/5/3 +f 6/174/4 2/8/4 5/10/4 +f 1/175/5 3/2/5 5/11/5 +f 6/176/6 8/4/6 2/12/6 +f 12/103/4 10/13/4 11/15/4 +f 12/103/7 6/16/7 10/13/7 +f 9/14/8 1/18/8 11/15/8 +f 1/177/9 9/14/9 2/20/9 +f 16/178/10 15/21/10 39/23/10 +f 16/178/11 39/23/11 17/25/11 +f 18/27/12 17/25/12 28/26/12 +f 19/29/13 18/27/13 56/28/13 +f 20/179/14 19/29/14 50/30/14 +f 48/35/16 49/31/16 42/34/16 +f 44/42/17 48/35/17 38/36/17 +f 49/39/19 48/40/19 55/37/19 +f 48/40/20 44/42/20 54/41/20 +f 42/75/31 43/70/31 36/73/31 +f 36/73/32 29/74/32 42/75/32 +f 34/77/33 36/76/33 35/67/33 +f 33/80/34 29/74/34 34/77/34 +f 34/81/35 35/64/35 58/78/35 +f 58/78/36 57/79/36 34/81/36 +f 59/61/37 53/63/37 58/83/37 +f 58/83/38 52/82/38 57/79/38 +f 53/58/39 47/60/39 52/86/39 +f 52/86/40 46/85/40 51/84/40 +f 47/56/41 41/55/41 46/89/41 +f 46/89/42 40/88/42 45/22/42 +f 41/53/43 32/52/43 40/91/43 +f 40/91/87 31/90/87 39/23/87 +f 31/93/45 32/51/45 27/92/45 +f 27/92/46 28/26/46 31/93/46 +f 60/97/47 27/94/47 61/47/47 +f 55/45/48 54/95/48 61/43/48 +f 54/95/88 50/30/88 60/96/88 +f 56/28/50 28/26/50 60/97/50 +f 51/84/51 45/87/51 26/99/51 +f 25/180/52 57/79/52 26/99/52 +f 20/179/53 50/30/53 21/100/53 +f 22/181/54 21/100/54 38/36/54 +f 22/181/55 38/36/55 23/101/55 +f 23/101/56 29/74/56 24/102/56 +f 25/180/57 24/102/57 57/79/57 +f 6/182/58 12/103/58 5/104/58 +f 62/183/59 63/105/59 64/107/59 +f 64/107/60 65/106/60 66/109/60 +f 66/109/61 67/108/61 68/111/61 +f 68/111/62 69/110/62 70/113/62 +f 70/113/63 71/112/63 72/115/63 +f 72/115/64 73/114/64 74/117/64 +f 74/117/65 75/116/65 76/119/65 +f 76/119/66 77/118/66 78/121/66 +f 78/121/67 79/120/67 80/123/67 +f 80/123/68 81/122/68 82/125/68 +f 71/112/69 69/110/69 90/127/69 +f 84/131/70 85/128/70 62/130/70 +f 82/125/71 83/124/71 84/131/71 +f 84/134/2 62/184/2 64/185/2 +f 64/185/2 66/186/2 84/134/2 +f 68/132/2 70/187/2 72/188/2 +f 72/188/2 74/189/2 68/132/2 +f 76/133/2 78/190/2 80/191/2 +f 80/191/2 82/192/2 84/134/2 +f 84/134/2 66/186/2 68/132/2 +f 68/132/2 74/189/2 76/133/2 +f 76/133/2 80/191/2 84/134/2 +f 88/137/4 86/193/4 96/194/4 +f 87/195/4 97/196/4 96/194/4 +f 96/194/4 95/197/4 94/135/4 +f 94/135/4 93/198/4 92/136/4 +f 92/136/4 91/199/4 88/137/4 +f 90/200/4 89/201/4 88/137/4 +f 86/193/4 87/195/4 96/194/4 +f 96/194/4 94/135/4 88/137/4 +f 91/199/4 90/200/4 88/137/4 +f 87/202/72 63/129/72 97/138/72 +f 65/106/73 63/105/73 86/140/73 +f 69/110/74 67/108/74 89/142/74 +f 85/128/75 83/124/75 97/144/75 +f 88/203/89 67/108/89 86/145/89 +f 83/124/77 81/122/77 96/147/77 +f 81/122/78 79/120/78 95/149/78 +f 94/204/79 79/120/79 93/150/79 +f 77/118/80 75/116/80 93/152/80 +f 75/116/81 73/114/81 92/154/81 +f 73/114/90 71/112/90 91/156/90 +f 99/205/83 101/157/83 98/159/83 +f 101/206/84 105/160/84 100/158/84 +f 105/207/85 103/162/85 104/161/85 +f 103/208/86 99/164/86 102/163/86 +f 98/159/5 100/158/5 102/163/5 +f 107/209/83 109/165/83 106/167/83 +f 109/210/84 113/168/84 108/166/84 +f 113/211/85 111/170/85 112/169/85 +f 111/212/86 107/172/86 110/171/86 +f 106/167/5 108/166/5 110/171/5 diff --git a/assets/hbm/models/cwis_rotor.obj b/assets/hbm/models/cwis_rotor.obj index d5df9d87a..07d783822 100644 --- a/assets/hbm/models/cwis_rotor.obj +++ b/assets/hbm/models/cwis_rotor.obj @@ -41,6 +41,82 @@ v -0.850000 1.875000 -0.325000 v -0.850000 1.875000 0.325000 v -0.500000 1.875000 0.325000 v -0.500000 1.875000 -0.325000 +vt 0.447419 0.884668 +vt 0.375998 0.884668 +vt 0.375998 0.867421 +vt 0.304576 0.884668 +vt 0.304576 0.867421 +vt 0.233155 0.884668 +vt 0.233155 0.867421 +vt 0.161734 0.884668 +vt 0.161734 0.867421 +vt 0.090312 0.884668 +vt 0.090312 0.867421 +vt 0.018891 0.884668 +vt 0.018891 0.867421 +vt 0.485201 0.867421 +vt 0.556623 0.867421 +vt 0.556623 0.884668 +vt 0.628044 0.867421 +vt 0.628044 0.884668 +vt 0.699465 0.867421 +vt 0.699465 0.884668 +vt 0.770886 0.867421 +vt 0.770886 0.884668 +vt 0.054602 0.793928 +vt 0.116454 0.563091 +vt 0.285439 0.732075 +vt 0.842308 0.867421 +vt 0.913729 0.867421 +vt 0.913729 0.884668 +vt 0.842308 0.884668 +vt 0.589769 0.732075 +vt 0.323221 0.660654 +vt 0.420785 0.563091 +vt 0.274146 0.227258 +vt 0.274146 0.316942 +vt 0.225854 0.316942 +vt 0.774146 0.227258 +vt 0.774146 0.316942 +vt 0.725854 0.316942 +vt 0.518891 0.203112 +vt 0.725854 0.227258 +vt 0.725854 0.525308 +vt 0.774146 0.018891 +vt 0.981109 0.341087 +vt 0.018891 0.203112 +vt 0.225854 0.227258 +vt 0.225854 0.525308 +vt 0.274146 0.018891 +vt 0.481109 0.341087 +vt 0.447419 0.867421 +vt 0.485201 0.884668 +vt 0.249728 0.793928 +vt 0.187876 0.829639 +vt 0.116454 0.829638 +vt 0.018891 0.732075 +vt 0.018891 0.660654 +vt 0.054602 0.598801 +vt 0.187876 0.563091 +vt 0.249728 0.598801 +vt 0.285439 0.660654 +vt 0.492206 0.563091 +vt 0.554059 0.598801 +vt 0.589769 0.660654 +vt 0.554059 0.793928 +vt 0.492206 0.829638 +vt 0.420785 0.829638 +vt 0.358932 0.793928 +vt 0.323221 0.732075 +vt 0.358932 0.598801 +vt 0.518891 0.341087 +vt 0.774145 0.525308 +vt 0.725854 0.018891 +vt 0.981109 0.203112 +vt 0.018891 0.341087 +vt 0.274145 0.525308 +vt 0.225854 0.018891 +vt 0.481109 0.203112 vn 0.258800 0.000000 -0.965900 vn 0.707100 0.000000 -0.707100 vn 0.965900 0.000000 -0.258800 @@ -60,67 +136,67 @@ vn 0.000000 0.115900 -0.993300 vn 0.000000 0.115900 0.993300 vn 1.000000 0.000000 0.000000 s off -f 2//1 4//1 3//1 -f 4//2 6//2 5//2 -f 6//3 8//3 7//3 -f 8//4 10//4 9//4 -f 10//5 12//5 11//5 -f 12//6 14//6 13//6 -f 14//7 16//7 15//7 -f 16//8 18//8 17//8 -f 18//9 20//9 19//9 -f 20//10 22//10 21//10 -f 22//11 14//11 6//11 -f 24//12 2//12 1//12 -f 22//13 24//13 23//13 -f 7//14 19//14 23//14 -f 39//11 40//11 37//11 -f 31//11 32//11 29//11 -f 25//15 30//15 29//15 -f 27//16 29//16 32//16 -f 26//17 31//17 30//17 -f 28//18 32//18 31//18 -f 33//15 38//15 37//15 -f 35//16 37//16 40//16 -f 34//17 39//17 38//17 -f 36//18 40//18 39//18 -f 1//1 2//1 3//1 -f 3//2 4//2 5//2 -f 5//3 6//3 7//3 -f 7//4 8//4 9//4 -f 9//5 10//5 11//5 -f 11//6 12//6 13//6 -f 13//7 14//7 15//7 -f 15//8 16//8 17//8 -f 17//9 18//9 19//9 -f 19//10 20//10 21//10 -f 6//11 4//11 2//11 -f 2//11 24//11 22//11 -f 22//11 20//11 18//11 -f 18//11 16//11 14//11 -f 14//11 12//11 10//11 -f 10//11 8//11 6//11 -f 6//11 2//11 22//11 -f 22//11 18//11 14//11 -f 14//11 10//11 6//11 -f 23//12 24//12 1//12 -f 21//13 22//13 23//13 -f 23//14 1//14 3//14 -f 3//14 5//14 7//14 -f 7//14 9//14 11//14 -f 11//14 13//14 15//14 -f 15//14 17//14 19//14 -f 19//14 21//14 23//14 -f 23//14 3//14 7//14 -f 7//14 11//14 15//14 -f 15//14 19//14 7//14 -f 38//11 39//11 37//11 -f 30//11 31//11 29//11 -f 27//15 25//15 29//15 -f 28//16 27//16 32//16 -f 25//17 26//17 30//17 -f 26//18 28//18 31//18 -f 35//15 33//15 37//15 -f 36//16 35//16 40//16 -f 33//17 34//17 38//17 -f 34//18 36//18 39//18 +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 8/6/4 10/8/4 9/9/4 +f 10/8/5 12/10/5 11/11/5 +f 12/10/6 14/12/6 13/13/6 +f 14/14/7 16/15/7 15/16/7 +f 16/15/8 18/17/8 17/18/8 +f 18/17/9 20/19/9 19/20/9 +f 20/19/10 22/21/10 21/22/10 +f 22/23/11 14/24/11 6/25/11 +f 24/26/12 2/27/12 1/28/12 +f 22/21/13 24/26/13 23/29/13 +f 7/30/14 19/31/14 23/32/14 +f 39/33/11 40/34/11 37/35/11 +f 31/36/11 32/37/11 29/38/11 +f 25/39/15 30/40/15 29/38/15 +f 27/41/16 29/38/16 32/37/16 +f 26/42/17 31/36/17 30/40/17 +f 28/43/18 32/37/18 31/36/18 +f 33/44/15 38/45/15 37/35/15 +f 35/46/16 37/35/16 40/34/16 +f 34/47/17 39/33/17 38/45/17 +f 36/48/18 40/34/18 39/33/18 +f 1/49/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 7/7/4 8/6/4 9/9/4 +f 9/9/5 10/8/5 11/11/5 +f 11/11/6 12/10/6 13/13/6 +f 13/50/7 14/14/7 15/16/7 +f 15/16/8 16/15/8 17/18/8 +f 17/18/9 18/17/9 19/20/9 +f 19/20/10 20/19/10 21/22/10 +f 6/25/11 4/51/11 2/52/11 +f 2/52/11 24/53/11 22/23/11 +f 22/23/11 20/54/11 18/55/11 +f 18/55/11 16/56/11 14/24/11 +f 14/24/11 12/57/11 10/58/11 +f 10/58/11 8/59/11 6/25/11 +f 6/25/11 2/52/11 22/23/11 +f 22/23/11 18/55/11 14/24/11 +f 14/24/11 10/58/11 6/25/11 +f 23/29/12 24/26/12 1/28/12 +f 21/22/13 22/21/13 23/29/13 +f 23/32/14 1/60/14 3/61/14 +f 3/61/14 5/62/14 7/30/14 +f 7/30/14 9/63/14 11/64/14 +f 11/64/14 13/65/14 15/66/14 +f 15/66/14 17/67/14 19/31/14 +f 19/31/14 21/68/14 23/32/14 +f 23/32/14 3/61/14 7/30/14 +f 7/30/14 11/64/14 15/66/14 +f 15/66/14 19/31/14 7/30/14 +f 38/45/11 39/33/11 37/35/11 +f 30/40/11 31/36/11 29/38/11 +f 27/69/15 25/39/15 29/38/15 +f 28/70/16 27/41/16 32/37/16 +f 25/71/17 26/42/17 30/40/17 +f 26/72/18 28/43/18 31/36/18 +f 35/73/15 33/44/15 37/35/15 +f 36/74/16 35/46/16 40/34/16 +f 33/75/17 34/47/17 38/45/17 +f 34/76/18 36/48/18 39/33/18 diff --git a/assets/hbm/models/turret_spitfire_base.obj b/assets/hbm/models/turret_spitfire_base.obj index b73bbb176..43f87177e 100644 --- a/assets/hbm/models/turret_spitfire_base.obj +++ b/assets/hbm/models/turret_spitfire_base.obj @@ -17,6 +17,42 @@ v -1.000000 0.000000 -0.000000 v -1.000000 0.125000 -0.000000 v -0.707107 0.000000 -0.707107 v -0.707107 0.125000 -0.707107 +vt 0.735344 0.677457 +vt 0.561566 0.677457 +vt 0.561566 0.649076 +vt 0.387788 0.677457 +vt 0.387788 0.649076 +vt 0.214009 0.677457 +vt 0.214009 0.649076 +vt 0.040231 0.677457 +vt 0.040231 0.649076 +vt 0.040231 0.540232 +vt 0.214009 0.540232 +vt 0.214009 0.568613 +vt 0.387787 0.540232 +vt 0.387787 0.568613 +vt 0.040231 0.163111 +vt 0.459769 0.163111 +vt 0.459769 0.336889 +vt 0.561565 0.540231 +vt 0.735344 0.540231 +vt 0.735344 0.568613 +vt 0.561565 0.568613 +vt 0.836889 0.459769 +vt 0.540231 0.336889 +vt 0.663111 0.040231 +vt 0.735344 0.649076 +vt 0.040231 0.568613 +vt 0.336889 0.459769 +vt 0.163111 0.459769 +vt 0.040231 0.336889 +vt 0.163111 0.040231 +vt 0.336889 0.040231 +vt 0.836889 0.040231 +vt 0.959769 0.163111 +vt 0.959769 0.336889 +vt 0.663111 0.459769 +vt 0.540231 0.163111 vn 0.382700 0.000000 -0.923900 vn 0.923900 0.000000 -0.382700 vn 0.923900 0.000000 0.382700 @@ -28,31 +64,31 @@ vn -0.382700 0.000000 -0.923900 vn -0.923900 0.000000 -0.382700 vn 0.000000 -1.000000 0.000000 s off -f 2//1 4//1 3//1 -f 4//2 6//2 5//2 -f 6//3 8//3 7//3 -f 8//4 10//4 9//4 -f 10//5 12//5 11//5 -f 12//6 14//6 13//6 -f 14//7 8//7 6//7 -f 16//8 2//8 1//8 -f 14//9 16//9 15//9 -f 7//10 11//10 15//10 -f 1//1 2//1 3//1 -f 3//2 4//2 5//2 -f 5//3 6//3 7//3 -f 7//4 8//4 9//4 -f 9//5 10//5 11//5 -f 11//6 12//6 13//6 -f 6//7 4//7 2//7 -f 2//7 16//7 6//7 -f 14//7 12//7 10//7 -f 10//7 8//7 14//7 -f 6//7 16//7 14//7 -f 15//8 16//8 1//8 -f 13//9 14//9 15//9 -f 15//10 1//10 3//10 -f 3//10 5//10 15//10 -f 7//10 9//10 11//10 -f 11//10 13//10 15//10 -f 15//10 5//10 7//10 +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 8/6/4 10/8/4 9/9/4 +f 10/10/5 12/11/5 11/12/5 +f 12/11/6 14/13/6 13/14/6 +f 14/15/7 8/16/7 6/17/7 +f 16/18/8 2/19/8 1/20/8 +f 14/13/9 16/18/9 15/21/9 +f 7/22/10 11/23/10 15/24/10 +f 1/25/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 7/7/4 8/6/4 9/9/4 +f 9/26/5 10/10/5 11/12/5 +f 11/12/6 12/11/6 13/14/6 +f 6/17/7 4/27/7 2/28/7 +f 2/28/7 16/29/7 6/17/7 +f 14/15/7 12/30/7 10/31/7 +f 10/31/7 8/16/7 14/15/7 +f 6/17/7 16/29/7 14/15/7 +f 15/21/8 16/18/8 1/20/8 +f 13/14/9 14/13/9 15/21/9 +f 15/24/10 1/32/10 3/33/10 +f 3/33/10 5/34/10 15/24/10 +f 7/22/10 9/35/10 11/23/10 +f 11/23/10 13/36/10 15/24/10 +f 15/24/10 5/34/10 7/22/10 diff --git a/assets/hbm/models/turret_spitfire_gun.obj b/assets/hbm/models/turret_spitfire_gun.obj index ec166c9d9..c627f8eda 100644 --- a/assets/hbm/models/turret_spitfire_gun.obj +++ b/assets/hbm/models/turret_spitfire_gun.obj @@ -229,6 +229,431 @@ v -0.075000 0.250000 0.375000 v -0.025000 0.500000 0.375000 v -0.075000 0.250000 0.125000 v -0.025000 0.500000 0.125000 +v 0.152188 -0.129410 3.232963 +v 0.152706 0.129409 3.232963 +v 0.151137 -0.000000 3.250000 +v -0.151336 -0.129410 3.232963 +v -0.151015 -0.000000 3.250000 +v -0.148109 0.129409 3.232963 +vt 0.864157 0.514072 +vt 0.837312 0.499844 +vt 0.837312 0.414475 +vt 0.513339 0.238965 +vt 0.513339 0.352789 +vt 0.399514 0.352789 +vt 0.427970 0.381245 +vt 0.427970 0.551981 +vt 0.399514 0.011317 +vt 0.513339 0.011317 +vt 0.352808 0.402233 +vt 0.352802 0.419909 +vt 0.011329 0.419791 +vt 0.352795 0.437585 +vt 0.011323 0.437467 +vt 0.352789 0.455261 +vt 0.011317 0.455143 +vt 0.352862 0.243149 +vt 0.352856 0.260825 +vt 0.011384 0.260708 +vt 0.570119 0.740411 +vt 0.570119 0.706264 +vt 0.740855 0.706264 +vt 0.352850 0.278501 +vt 0.011378 0.278384 +vt 0.535972 0.649352 +vt 0.570119 0.649352 +vt 0.352844 0.296177 +vt 0.011371 0.296060 +vt 0.740855 0.615204 +vt 0.740855 0.649352 +vt 0.352838 0.313853 +vt 0.011365 0.313736 +vt 0.352832 0.331529 +vt 0.011359 0.331411 +vt 0.484883 0.381245 +vt 0.352826 0.349205 +vt 0.011353 0.349087 +vt 0.399514 0.580437 +vt 0.484882 0.551981 +vt 0.352820 0.366881 +vt 0.011347 0.366763 +vt 0.775003 0.706264 +vt 0.352814 0.384557 +vt 0.011335 0.402115 +vt 0.011341 0.384439 +vt 0.513339 0.580437 +vt 0.035409 0.115858 +vt 0.035409 0.089723 +vt 0.376881 0.089722 +vt 0.035409 0.063587 +vt 0.376881 0.063587 +vt 0.035409 0.037452 +vt 0.376881 0.037452 +vt 0.035409 0.011317 +vt 0.376881 0.011317 +vt 0.376881 0.220399 +vt 0.035409 0.220398 +vt 0.035409 0.194263 +vt 0.376881 0.194264 +vt 0.035409 0.168128 +vt 0.011317 0.034185 +vt 0.035409 0.141993 +vt 0.376881 0.115858 +vt 0.376881 0.168128 +vt 0.826448 0.089722 +vt 0.541887 0.089723 +vt 0.541887 0.070122 +vt 0.011317 0.164861 +vt 0.011317 0.145260 +vt 0.011317 0.086456 +vt 0.011317 0.217132 +vt 0.011317 0.197530 +vt 0.011317 0.138726 +vt 0.011317 0.119125 +vt 0.011317 0.112591 +vt 0.011317 0.092989 +vt 0.011317 0.060321 +vt 0.011317 0.190996 +vt 0.011317 0.171395 +vt 0.541887 0.128926 +vt 0.535972 0.126476 +vt 0.535972 0.111775 +vt 0.826448 0.109324 +vt 0.541887 0.109324 +vt 0.826448 0.148527 +vt 0.541887 0.148527 +vt 0.826448 0.030918 +vt 0.541887 0.030919 +vt 0.541887 0.011318 +vt 0.826448 0.070121 +vt 0.541887 0.050521 +vt 0.826448 0.128925 +vt 0.826448 0.168128 +vt 0.541887 0.168128 +vt 0.826448 0.050520 +vt 0.466613 0.689464 +vt 0.466613 0.704165 +vt 0.011317 0.704165 +vt 0.535972 0.165678 +vt 0.535972 0.150977 +vt 0.535972 0.048070 +vt 0.535972 0.033369 +vt 0.535972 0.087273 +vt 0.535972 0.072572 +vt 0.535972 0.106874 +vt 0.535972 0.092173 +vt 0.535972 0.146077 +vt 0.535972 0.131376 +vt 0.535972 0.028469 +vt 0.535972 0.067672 +vt 0.735493 0.549322 +vt 0.750194 0.549322 +vt 0.760590 0.574419 +vt 0.466613 0.718866 +vt 0.011317 0.718866 +vt 0.466613 0.674763 +vt 0.011317 0.689464 +vt 0.466613 0.777670 +vt 0.466613 0.792371 +vt 0.011317 0.792371 +vt 0.466613 0.762969 +vt 0.011317 0.777670 +vt 0.466613 0.733567 +vt 0.466613 0.748268 +vt 0.011317 0.748268 +vt 0.011317 0.733567 +vt 0.011317 0.762969 +vt 0.830909 0.486896 +vt 0.830909 0.457017 +vt 0.737716 0.526689 +vt 0.751944 0.499844 +vt 0.851540 0.387630 +vt 0.751944 0.414475 +vt 0.725098 0.400247 +vt 0.535997 0.519951 +vt 0.672586 0.519998 +vt 0.672561 0.592561 +vt 0.758346 0.457017 +vt 0.758346 0.486896 +vt 0.271028 0.860976 +vt 0.271028 0.840289 +vt 0.384852 0.840289 +vt 0.271028 0.815005 +vt 0.271028 0.881664 +vt 0.384852 0.860976 +vt 0.271028 0.906948 +vt 0.384852 0.881664 +vt 0.702440 0.592571 +vt 0.536032 0.417509 +vt 0.672621 0.417556 +vt 0.672596 0.490119 +vt 0.536043 0.387630 +vt 0.672632 0.387677 +vt 0.536007 0.490072 +vt 0.433767 0.891752 +vt 0.384852 0.906948 +vt 0.501956 0.762425 +vt 0.513339 0.762425 +vt 0.513339 0.853484 +vt 0.501956 0.705513 +vt 0.513339 0.705513 +vt 0.501956 0.659983 +vt 0.501956 0.603071 +vt 0.513339 0.603071 +vt 0.501956 0.853484 +vt 0.513339 0.910396 +vt 0.513339 0.659983 +vt 0.513339 0.944543 +vt 0.501956 0.944543 +vt 0.501956 0.910396 +vt 0.797636 0.706264 +vt 0.797636 0.672116 +vt 0.843166 0.672116 +vt 0.797636 0.615204 +vt 0.849082 0.102376 +vt 0.883229 0.056846 +vt 0.883229 0.102376 +vt 0.883229 0.011317 +vt 0.940141 0.011317 +vt 0.756953 0.781265 +vt 0.756953 0.866633 +vt 0.552069 0.866633 +vt 0.552069 0.781265 +vt 0.540687 0.763044 +vt 0.773050 0.767037 +vt 0.768335 0.884854 +vt 0.535972 0.880861 +vt 0.027414 0.918593 +vt 0.027414 0.833225 +vt 0.232297 0.833225 +vt 0.232297 0.918593 +vt 0.243680 0.936814 +vt 0.011317 0.932821 +vt 0.016031 0.815005 +vt 0.248394 0.818997 +vt 0.956990 0.190761 +vt 0.837170 0.220476 +vt 0.786254 0.190762 +vt 0.837244 0.250190 +vt 0.786254 0.250190 +vt 0.837243 0.272823 +vt 0.837905 0.302537 +vt 0.786254 0.302537 +vt 0.956990 0.332251 +vt 0.786254 0.332251 +vt 0.684679 0.960065 +vt 0.692379 0.952364 +vt 0.714817 0.967103 +vt 0.576570 0.933857 +vt 0.566509 0.938025 +vt 0.551419 0.915822 +vt 0.535972 0.364997 +vt 0.535972 0.343217 +vt 0.763620 0.343217 +vt 0.668344 0.986352 +vt 0.673789 0.960065 +vt 0.562342 0.948085 +vt 0.535972 0.943056 +vt 0.535972 0.321438 +vt 0.763620 0.321438 +vt 0.714817 0.926737 +vt 0.692379 0.941475 +vt 0.684679 0.933775 +vt 0.535972 0.953115 +vt 0.566509 0.958146 +vt 0.535972 0.299659 +vt 0.763620 0.299659 +vt 0.666089 0.952364 +vt 0.576570 0.962313 +vt 0.571541 0.988683 +vt 0.535972 0.277880 +vt 0.763620 0.277879 +vt 0.586631 0.958146 +vt 0.590798 0.948085 +vt 0.617168 0.953115 +vt 0.581599 0.988683 +vt 0.535972 0.256100 +vt 0.763620 0.256100 +vt 0.586631 0.938025 +vt 0.608833 0.922934 +vt 0.535972 0.234321 +vt 0.763620 0.234320 +vt 0.886790 0.387630 +vt 0.943703 0.387630 +vt 0.943703 0.403965 +vt 0.535972 0.212542 +vt 0.535972 0.190762 +vt 0.763620 0.190761 +vt 0.763620 0.212541 +vt 0.718666 0.936030 +vt 0.581599 0.907487 +vt 0.017889 0.652129 +vt 0.011317 0.649407 +vt 0.011317 0.633072 +vt 0.659051 0.982503 +vt 0.666089 0.941475 +vt 0.639801 0.957809 +vt 0.673789 0.933775 +vt 0.643651 0.926737 +vt 0.668344 0.907487 +vt 0.017889 0.565012 +vt 0.017889 0.543232 +vt 0.359362 0.543232 +vt 0.017889 0.521453 +vt 0.011317 0.540510 +vt 0.886790 0.469302 +vt 0.943703 0.469302 +vt 0.943703 0.485637 +vt 0.359362 0.521453 +vt 0.017889 0.499673 +vt 0.011317 0.496951 +vt 0.011317 0.480616 +vt 0.886790 0.403965 +vt 0.943703 0.420299 +vt 0.017889 0.608570 +vt 0.011317 0.605848 +vt 0.011317 0.589513 +vt 0.886790 0.436634 +vt 0.886790 0.420299 +vt 0.017889 0.477894 +vt 0.359363 0.477895 +vt 0.011317 0.518730 +vt 0.011317 0.502396 +vt 0.399514 0.630956 +vt 0.411065 0.603071 +vt 0.438949 0.614621 +vt 0.017889 0.630350 +vt 0.359363 0.630349 +vt 0.886790 0.485637 +vt 0.943703 0.501971 +vt 0.011317 0.627627 +vt 0.011317 0.611293 +vt 0.359362 0.608570 +vt 0.017889 0.586791 +vt 0.359362 0.565012 +vt 0.911329 0.630605 +vt 0.963909 0.630605 +vt 0.963909 0.652384 +vt 0.359362 0.586791 +vt 0.011317 0.584068 +vt 0.011317 0.567734 +vt 0.886790 0.452968 +vt 0.943703 0.452968 +vt 0.011317 0.562289 +vt 0.943703 0.436634 +vt 0.886790 0.501971 +vt 0.943703 0.518306 +vt 0.874918 0.906220 +vt 0.874918 0.848181 +vt 0.931830 0.848181 +vt 0.852595 0.910685 +vt 0.852595 0.852646 +vt 0.795683 0.910685 +vt 0.795683 0.852646 +vt 0.931830 0.906220 +vt 0.954153 0.852646 +vt 0.874918 0.821083 +vt 0.874918 0.763044 +vt 0.931830 0.763044 +vt 0.852595 0.825548 +vt 0.852595 0.767509 +vt 0.795683 0.825548 +vt 0.795683 0.767509 +vt 0.931830 0.821083 +vt 0.954153 0.767509 +vt 0.906385 0.302537 +vt 0.906028 0.272823 +vt 0.956990 0.272823 +vt 0.906267 0.220476 +vt 0.956990 0.220476 +vt 0.956990 0.250190 +vt 0.854850 0.289035 +vt 0.848183 0.272823 +vt 0.871287 0.296180 +vt 0.887044 0.289565 +vt 0.895287 0.272823 +vt 0.895287 0.250190 +vt 0.906028 0.250190 +vt 0.888119 0.233442 +vt 0.871427 0.226756 +vt 0.855080 0.234214 +vt 0.848183 0.250190 +vt 0.864157 0.400247 +vt 0.399514 0.238965 +vt 0.011390 0.243032 +vt 0.740855 0.740411 +vt 0.535972 0.706264 +vt 0.570119 0.615204 +vt 0.775003 0.649352 +vt 0.011317 0.014584 +vt 0.376881 0.141993 +vt 0.011317 0.066854 +vt 0.011317 0.040719 +vt 0.826448 0.011317 +vt 0.535972 0.013768 +vt 0.535972 0.052971 +vt 0.750194 0.584814 +vt 0.735493 0.584814 +vt 0.725098 0.574419 +vt 0.725098 0.559718 +vt 0.760590 0.559718 +vt 0.011317 0.674762 +vt 0.851540 0.526689 +vt 0.737716 0.387630 +vt 0.725098 0.514072 +vt 0.535972 0.592514 +vt 0.384852 0.815005 +vt 0.702465 0.520008 +vt 0.399179 0.866740 +vt 0.419440 0.870919 +vt 0.888695 0.615204 +vt 0.888695 0.672116 +vt 0.940141 0.102376 +vt 0.768335 0.763044 +vt 0.773050 0.880861 +vt 0.540687 0.884854 +vt 0.535972 0.767037 +vt 0.016031 0.936814 +vt 0.011317 0.818997 +vt 0.243680 0.815005 +vt 0.248395 0.932821 +vt 0.786254 0.220476 +vt 0.786254 0.272823 +vt 0.956990 0.302537 +vt 0.699416 0.982503 +vt 0.571541 0.907487 +vt 0.763620 0.364997 +vt 0.690123 0.986352 +vt 0.544307 0.922934 +vt 0.699417 0.911337 +vt 0.544307 0.973236 +vt 0.551419 0.980349 +vt 0.608833 0.973236 +vt 0.601721 0.980349 +vt 0.617168 0.943056 +vt 0.718666 0.957809 +vt 0.601721 0.915822 +vt 0.643651 0.967102 +vt 0.639801 0.936030 +vt 0.659051 0.911337 +vt 0.690123 0.907487 +vt 0.011317 0.524175 +vt 0.359362 0.499674 +vt 0.438949 0.630956 +vt 0.427399 0.642506 +vt 0.411065 0.642506 +vt 0.399514 0.614621 +vt 0.427399 0.603071 +vt 0.359363 0.652128 +vt 0.948508 0.667784 +vt 0.926729 0.667784 +vt 0.911329 0.652384 +vt 0.926729 0.615204 +vt 0.948508 0.615204 +vt 0.011317 0.545955 +vt 0.886790 0.518306 +vt 0.954153 0.910685 +vt 0.954153 0.825548 vn 0.848000 0.000000 -0.530000 vn 0.000000 0.000000 1.000000 vn 0.000000 -1.000000 0.000000 @@ -282,7 +707,7 @@ vn 0.780900 -0.624700 0.000000 vn 0.707100 0.000000 -0.707100 vn 0.000000 -0.382700 0.923900 vn 0.000000 -0.130500 0.991400 -vn -0.000000 0.130500 0.991400 +vn 0.000000 0.130500 0.991400 vn 0.000000 0.382700 0.923900 vn 0.800100 -0.331400 -0.500000 vn -0.331400 -0.800100 0.500000 @@ -303,370 +728,378 @@ vn -0.331400 0.800100 -0.500000 vn -0.980600 0.196100 0.000000 vn 0.980600 -0.196100 0.000000 s off -f 7//1 92//1 91//1 -f 2//2 1//2 5//2 -f 5//3 36//3 35//3 -f 8//4 4//4 2//4 -f 12//5 14//5 13//5 -f 14//6 16//6 15//6 -f 16//7 18//7 17//7 -f 18//8 20//8 19//8 -f 36//9 38//9 39//9 -f 20//10 22//10 21//10 -f 9//2 37//2 38//2 -f 22//11 24//11 23//11 -f 10//12 40//12 37//12 -f 24//13 26//13 25//13 -f 40//3 39//3 38//3 -f 26//14 28//14 27//14 -f 1//3 9//3 36//3 -f 28//15 30//15 29//15 -f 7//3 35//3 10//3 -f 30//16 32//16 31//16 -f 35//17 39//17 40//17 -f 34//18 12//18 11//18 -f 32//19 34//19 33//19 -f 3//3 10//3 9//3 -f 42//20 44//20 43//20 -f 44//21 46//21 45//21 -f 46//22 48//22 47//22 -f 48//23 50//23 49//23 -f 49//24 50//24 52//24 -f 51//25 52//25 54//25 -f 50//26 48//26 60//26 -f 56//27 42//27 41//27 -f 53//28 54//28 56//28 -f 58//20 66//20 65//20 -f 54//29 63//29 64//29 -f 46//30 44//30 57//30 -f 50//31 61//31 62//31 -f 56//32 64//32 58//32 -f 42//33 58//33 57//33 -f 48//34 46//34 59//34 -f 52//35 62//35 63//35 -f 71//2 79//2 80//2 -f 64//27 72//27 66//27 -f 62//25 70//25 71//25 -f 60//23 68//23 69//23 -f 57//21 65//21 67//21 -f 63//28 71//28 72//28 -f 61//24 69//24 70//24 -f 59//22 67//22 68//22 -f 86//21 87//21 79//21 -f 69//2 77//2 78//2 -f 67//2 75//2 76//2 -f 66//2 74//2 73//2 -f 72//2 80//2 74//2 -f 70//2 78//2 79//2 -f 69//2 68//2 76//2 -f 67//2 65//2 73//2 -f 86//2 85//2 83//2 -f 87//22 88//22 80//22 -f 85//20 86//20 78//20 -f 84//27 85//27 77//27 -f 83//28 84//28 76//28 -f 82//24 81//24 73//24 -f 88//23 82//23 74//23 -f 81//25 83//25 75//25 -f 92//17 96//17 95//17 -f 3//36 90//36 92//36 -f 8//37 91//37 89//37 -f 4//38 89//38 90//38 -f 94//3 108//3 110//3 -f 90//17 89//17 93//17 -f 90//17 94//17 96//17 -f 91//17 95//17 93//17 -f 98//39 100//39 99//39 -f 99//40 100//40 102//40 -f 106//41 98//41 97//41 -f 104//42 106//42 105//42 -f 109//17 110//17 108//17 -f 95//4 109//4 107//4 -f 96//9 110//9 109//9 -f 93//12 107//12 108//12 -f 101//17 103//17 105//17 -f 114//12 113//12 111//12 -f 118//17 117//17 113//17 -f 120//43 122//43 121//43 -f 112//2 111//2 115//2 -f 118//9 120//9 119//9 -f 121//2 122//2 116//2 -f 121//3 115//3 119//3 -f 119//3 115//3 111//3 -f 122//4 120//4 116//4 -f 120//4 118//4 114//4 -f 124//12 125//12 126//12 -f 124//44 123//44 2//44 -f 125//45 124//45 4//45 -f 126//46 125//46 3//46 -f 123//47 126//47 1//47 -f 128//9 129//9 130//9 -f 128//48 127//48 8//48 -f 129//49 128//49 6//49 -f 130//50 129//50 5//50 -f 127//51 130//51 7//51 -f 132//52 134//52 133//52 -f 133//53 134//53 142//53 -f 145//54 138//54 137//54 -f 138//55 140//55 139//55 -f 176//56 175//56 155//56 -f 170//57 169//57 162//57 -f 152//20 154//20 153//20 -f 159//58 177//58 176//58 -f 169//59 168//59 164//59 -f 154//21 156//21 155//21 -f 153//60 174//60 173//60 -f 164//61 168//61 167//61 -f 156//22 158//22 157//22 -f 176//17 178//17 174//17 -f 167//62 149//62 152//62 -f 158//23 160//23 159//23 -f 150//63 172//63 156//63 -f 152//64 149//64 150//64 -f 160//24 162//24 161//24 -f 172//65 171//65 158//65 -f 168//2 170//2 149//2 -f 162//25 164//25 163//25 -f 201//20 209//20 208//20 -f 166//27 152//27 151//27 -f 164//28 166//28 165//28 -f 175//66 174//66 153//66 -f 171//67 170//67 160//67 -f 192//2 201//2 202//2 -f 178//68 177//68 159//68 -f 179//69 178//69 161//69 -f 180//70 179//70 163//70 -f 173//71 180//71 165//71 -f 184//20 186//20 185//20 -f 188//2 186//2 181//2 -f 181//25 212//25 211//25 -f 186//21 188//21 187//21 -f 190//2 200//2 201//2 -f 202//21 208//21 207//21 -f 187//22 188//22 190//22 -f 196//2 203//2 204//2 -f 204//22 203//22 207//22 -f 190//23 192//23 191//23 -f 188//2 199//2 200//2 -f 207//2 209//2 211//2 -f 192//24 194//24 193//24 -f 199//28 211//28 210//28 -f 194//2 202//2 203//2 -f 194//25 196//25 195//25 -f 198//27 184//27 183//27 -f 189//17 195//17 197//17 -f 196//28 198//28 197//28 -f 198//2 204//2 182//2 -f 182//24 205//24 212//24 -f 186//2 184//2 182//2 -f 204//23 206//23 205//23 -f 200//27 210//27 209//27 -f 216//72 215//72 213//72 -f 216//17 220//17 219//17 -f 218//73 217//73 219//73 -f 214//2 213//2 217//2 -f 224//72 223//72 221//72 -f 220//4 216//4 214//4 -f 224//17 228//17 227//17 -f 226//73 225//73 227//73 -f 222//2 221//2 225//2 -f 228//4 224//4 222//4 -f 8//1 7//1 91//1 -f 6//2 2//2 5//2 -f 7//3 5//3 35//3 -f 6//4 8//4 2//4 -f 11//5 12//5 13//5 -f 13//6 14//6 15//6 -f 15//7 16//7 17//7 -f 17//8 18//8 19//8 -f 35//9 36//9 39//9 -f 19//10 20//10 21//10 -f 36//2 9//2 38//2 -f 21//11 22//11 23//11 -f 9//12 10//12 37//12 -f 23//13 24//13 25//13 -f 37//3 40//3 38//3 -f 25//14 26//14 27//14 -f 5//3 1//3 36//3 -f 27//15 28//15 29//15 -f 3//3 7//3 10//3 -f 29//16 30//16 31//16 -f 10//17 35//17 40//17 -f 33//18 34//18 11//18 -f 31//19 32//19 33//19 -f 1//3 3//3 9//3 -f 41//20 42//20 43//20 -f 43//21 44//21 45//21 -f 45//22 46//22 47//22 -f 47//23 48//23 49//23 -f 51//24 49//24 52//24 -f 53//25 51//25 54//25 -f 61//26 50//26 60//26 -f 55//27 56//27 41//27 -f 55//28 53//28 56//28 -f 57//20 58//20 65//20 -f 56//29 54//29 64//29 -f 59//30 46//30 57//30 -f 52//31 50//31 62//31 -f 42//32 56//32 58//32 -f 44//33 42//33 57//33 -f 60//34 48//34 59//34 -f 54//35 52//35 63//35 -f 72//2 71//2 80//2 -f 58//27 64//27 66//27 -f 63//25 62//25 71//25 -f 61//23 60//23 69//23 -f 59//21 57//21 67//21 -f 64//28 63//28 72//28 -f 62//24 61//24 70//24 -f 60//22 59//22 68//22 -f 78//21 86//21 79//21 -f 70//2 69//2 78//2 -f 68//2 67//2 76//2 -f 65//2 66//2 73//2 -f 66//2 72//2 74//2 -f 71//2 70//2 79//2 -f 77//2 69//2 76//2 -f 75//2 67//2 73//2 -f 83//2 81//2 82//2 -f 82//2 88//2 83//2 -f 87//2 86//2 83//2 -f 85//2 84//2 83//2 -f 83//2 88//2 87//2 -f 79//22 87//22 80//22 -f 77//20 85//20 78//20 -f 76//27 84//27 77//27 -f 75//28 83//28 76//28 -f 74//24 82//24 73//24 -f 80//23 88//23 74//23 -f 73//25 81//25 75//25 -f 91//17 92//17 95//17 -f 7//36 3//36 92//36 -f 4//37 8//37 89//37 -f 3//38 4//38 90//38 -f 96//3 94//3 110//3 -f 94//17 90//17 93//17 -f 92//17 90//17 96//17 -f 89//17 91//17 93//17 -f 97//39 98//39 99//39 -f 101//40 99//40 102//40 -f 105//41 106//41 97//41 -f 103//42 104//42 105//42 -f 107//17 109//17 108//17 -f 93//4 95//4 107//4 -f 95//9 96//9 109//9 -f 94//12 93//12 108//12 -f 105//17 97//17 99//17 -f 99//17 101//17 105//17 -f 112//12 114//12 111//12 -f 114//17 118//17 113//17 -f 119//43 120//43 121//43 -f 116//2 112//2 115//2 -f 117//9 118//9 119//9 -f 115//2 121//2 116//2 -f 111//3 113//3 119//3 -f 117//3 119//3 113//3 -f 114//4 112//4 120//4 -f 116//4 120//4 112//4 -f 123//12 124//12 126//12 -f 4//44 124//44 2//44 -f 3//45 125//45 4//45 -f 1//46 126//46 3//46 -f 2//47 123//47 1//47 -f 127//9 128//9 130//9 -f 6//48 128//48 8//48 -f 5//49 129//49 6//49 -f 7//50 130//50 5//50 -f 8//51 127//51 7//51 -f 131//52 132//52 133//52 -f 134//53 136//53 148//53 -f 147//53 135//53 133//53 -f 134//53 148//53 141//53 -f 143//53 147//53 133//53 -f 134//53 141//53 142//53 -f 142//53 143//53 133//53 -f 137//54 135//54 147//54 -f 146//54 148//54 138//54 -f 137//54 147//54 144//54 -f 145//54 146//54 138//54 -f 137//54 144//54 145//54 -f 148//54 136//54 138//54 -f 137//55 138//55 139//55 -f 157//56 176//56 155//56 -f 160//57 170//57 162//57 -f 151//20 152//20 153//20 -f 157//58 159//58 176//58 -f 162//59 169//59 164//59 -f 153//21 154//21 155//21 -f 151//60 153//60 173//60 -f 166//61 164//61 167//61 -f 155//22 156//22 157//22 -f 180//17 173//17 174//17 -f 174//17 175//17 176//17 -f 176//17 177//17 178//17 -f 178//17 179//17 180//17 -f 180//17 174//17 178//17 -f 166//62 167//62 152//62 -f 157//23 158//23 159//23 -f 154//63 150//63 156//63 -f 154//64 152//64 150//64 -f 159//24 160//24 161//24 -f 156//65 172//65 158//65 -f 172//2 150//2 149//2 -f 149//2 167//2 168//2 -f 168//2 169//2 170//2 -f 170//2 171//2 172//2 -f 172//2 149//2 170//2 -f 161//25 162//25 163//25 -f 202//20 201//20 208//20 -f 165//27 166//27 151//27 -f 163//28 164//28 165//28 -f 155//66 175//66 153//66 -f 158//67 171//67 160//67 -f 194//2 192//2 202//2 -f 161//68 178//68 159//68 -f 163//69 179//69 161//69 -f 165//70 180//70 163//70 -f 151//71 173//71 165//71 -f 183//20 184//20 185//20 -f 199//2 188//2 181//2 -f 199//25 181//25 211//25 -f 185//21 186//21 187//21 -f 192//2 190//2 201//2 -f 203//21 202//21 207//21 -f 189//22 187//22 190//22 -f 198//2 196//2 204//2 -f 206//22 204//22 207//22 -f 189//23 190//23 191//23 -f 190//2 188//2 200//2 -f 211//2 212//2 207//2 -f 205//2 206//2 207//2 -f 207//2 208//2 209//2 -f 209//2 210//2 211//2 -f 212//2 205//2 207//2 -f 191//24 192//24 193//24 -f 200//28 199//28 210//28 -f 196//2 194//2 203//2 -f 193//25 194//25 195//25 -f 197//27 198//27 183//27 -f 197//17 183//17 185//17 -f 185//17 187//17 197//17 -f 189//17 191//17 193//17 -f 193//17 195//17 189//17 -f 197//17 187//17 189//17 -f 195//28 196//28 197//28 -f 184//2 198//2 182//2 -f 181//24 182//24 212//24 -f 181//2 186//2 182//2 -f 182//23 204//23 205//23 -f 201//27 200//27 209//27 -f 214//72 216//72 213//72 -f 215//17 216//17 219//17 -f 220//73 218//73 219//73 -f 218//2 214//2 217//2 -f 222//72 224//72 221//72 -f 218//4 220//4 214//4 -f 223//17 224//17 227//17 -f 228//73 226//73 227//73 -f 226//2 222//2 225//2 -f 226//4 228//4 222//4 +f 7/1/1 92/2/1 91/3/1 +f 2/4/2 1/5/2 5/6/2 +f 5/6/3 36/7/3 35/8/3 +f 8/9/4 4/10/4 2/4/4 +f 12/11/5 14/12/5 13/13/5 +f 14/12/6 16/14/6 15/15/6 +f 16/14/7 18/16/7 17/17/7 +f 18/18/8 20/19/8 19/20/8 +f 36/21/9 38/22/9 39/23/9 +f 20/19/10 22/24/10 21/25/10 +f 9/26/2 37/27/2 38/22/2 +f 22/24/11 24/28/11 23/29/11 +f 10/30/12 40/31/12 37/27/12 +f 24/28/13 26/32/13 25/33/13 +f 40/31/3 39/23/3 38/22/3 +f 26/32/14 28/34/14 27/35/14 +f 1/5/3 9/36/3 36/7/3 +f 28/34/15 30/37/15 29/38/15 +f 7/39/3 35/8/3 10/40/3 +f 30/37/16 32/41/16 31/42/16 +f 35/43/17 39/23/17 40/31/17 +f 34/44/18 12/11/18 11/45/18 +f 32/41/19 34/44/19 33/46/19 +f 3/47/3 10/40/3 9/36/3 +f 42/48/20 44/49/20 43/50/20 +f 44/49/21 46/51/21 45/52/21 +f 46/51/22 48/53/22 47/54/22 +f 48/53/23 50/55/23 49/56/23 +f 49/57/24 50/58/24 52/59/24 +f 51/60/25 52/59/25 54/61/25 +f 50/55/26 48/53/26 60/62/26 +f 56/63/27 42/48/27 41/64/27 +f 53/65/28 54/61/28 56/63/28 +f 58/66/20 66/67/20 65/68/20 +f 54/61/29 63/69/29 64/70/29 +f 46/51/30 44/49/30 57/71/30 +f 50/58/31 61/72/31 62/73/31 +f 56/63/32 64/74/32 58/75/32 +f 42/48/33 58/76/33 57/77/33 +f 48/53/34 46/51/34 59/78/34 +f 52/59/35 62/79/35 63/80/35 +f 71/81/2 79/82/2 80/83/2 +f 64/84/27 72/85/27 66/67/27 +f 62/86/25 70/87/25 71/81/25 +f 60/88/23 68/89/23 69/90/23 +f 57/91/21 65/68/21 67/92/21 +f 63/93/28 71/81/28 72/85/28 +f 61/94/24 69/95/24 70/87/24 +f 59/96/22 67/92/22 68/89/22 +f 86/97/21 87/98/21 79/99/21 +f 69/95/2 77/100/2 78/101/2 +f 67/92/2 75/102/2 76/103/2 +f 66/67/2 74/104/2 73/105/2 +f 72/85/2 80/106/2 74/107/2 +f 70/87/2 78/108/2 79/109/2 +f 69/90/2 68/89/2 76/110/2 +f 67/92/2 65/68/2 73/111/2 +f 86/112/2 85/113/2 83/114/2 +f 87/98/22 88/115/22 80/116/22 +f 85/117/20 86/97/20 78/118/20 +f 84/119/27 85/120/27 77/121/27 +f 83/122/28 84/119/28 76/123/28 +f 82/124/24 81/125/24 73/126/24 +f 88/115/23 82/124/23 74/127/23 +f 81/125/25 83/122/25 75/128/25 +f 92/2/17 96/129/17 95/130/17 +f 3/131/36 90/132/36 92/2/36 +f 8/133/37 91/3/37 89/134/37 +f 4/135/38 89/134/38 90/132/38 +f 94/136/3 108/137/3 110/138/3 +f 90/132/17 89/134/17 93/139/17 +f 90/132/17 94/140/17 96/129/17 +f 91/3/17 95/130/17 93/139/17 +f 98/141/39 100/142/39 99/143/39 +f 99/143/40 100/142/40 102/144/40 +f 106/145/41 98/141/41 97/146/41 +f 104/147/42 106/145/42 105/148/42 +f 109/149/17 110/138/17 108/137/17 +f 95/150/4 109/151/4 107/152/4 +f 96/153/9 110/154/9 109/151/9 +f 93/155/12 107/152/12 108/137/12 +f 101/156/17 103/157/17 105/148/17 +f 114/158/12 113/159/12 111/160/12 +f 118/161/17 117/162/17 113/159/17 +f 120/163/43 122/164/43 121/165/43 +f 112/166/2 111/160/2 115/167/2 +f 118/161/9 120/163/9 119/168/9 +f 121/169/2 122/170/2 116/171/2 +f 121/172/3 115/173/3 119/174/3 +f 119/174/3 115/173/3 111/175/3 +f 122/176/4 120/177/4 116/178/4 +f 120/177/4 118/179/4 114/180/4 +f 124/181/12 125/182/12 126/183/12 +f 124/181/44 123/184/44 2/185/44 +f 125/182/45 124/181/45 4/186/45 +f 126/183/46 125/182/46 3/187/46 +f 123/184/47 126/183/47 1/188/47 +f 128/189/9 129/190/9 130/191/9 +f 128/189/48 127/192/48 8/193/48 +f 129/190/49 128/189/49 6/194/49 +f 130/191/50 129/190/50 5/195/50 +f 127/192/51 130/191/51 7/196/51 +f 132/197/52 232/198/52 131/199/52 +f 232/198/53 233/200/53 135/201/53 +f 233/202/54 234/203/54 137/204/54 +f 234/203/55 140/205/55 139/206/55 +f 176/207/56 175/208/56 155/209/56 +f 170/210/57 169/211/57 162/212/57 +f 152/213/20 154/214/20 153/215/20 +f 159/216/58 177/217/58 176/207/58 +f 169/211/59 168/218/59 164/219/59 +f 154/214/21 156/220/21 155/221/21 +f 153/222/60 174/223/60 173/224/60 +f 164/225/61 168/218/61 167/226/61 +f 156/220/22 158/227/22 157/228/22 +f 176/207/17 178/229/17 174/223/17 +f 167/226/62 149/230/62 152/231/62 +f 158/227/23 160/232/23 159/233/23 +f 150/234/63 172/235/63 156/236/63 +f 152/237/64 149/230/64 150/234/64 +f 160/232/24 162/238/24 161/239/24 +f 172/235/65 171/240/65 158/241/65 +f 168/218/2 170/210/2 149/230/2 +f 162/238/25 164/242/25 163/243/25 +f 201/244/20 209/245/20 208/246/20 +f 166/247/27 152/248/27 151/249/27 +f 164/242/28 166/247/28 165/250/28 +f 175/208/66 174/223/66 153/251/66 +f 171/240/67 170/210/67 160/252/67 +f 192/253/2 201/254/2 202/255/2 +f 178/229/68 177/217/68 159/256/68 +f 179/257/69 178/229/69 161/258/69 +f 180/259/70 179/257/70 163/260/70 +f 173/224/71 180/259/71 165/261/71 +f 184/262/20 186/263/20 185/264/20 +f 188/265/2 186/263/2 181/266/2 +f 181/267/25 212/268/25 211/269/25 +f 186/263/21 188/265/21 187/270/21 +f 190/271/2 200/272/2 201/273/2 +f 202/274/21 208/246/21 207/275/21 +f 187/270/22 188/265/22 190/271/22 +f 196/276/2 203/277/2 204/278/2 +f 204/279/22 203/280/22 207/275/22 +f 190/271/23 192/281/23 191/282/23 +f 188/265/2 199/283/2 200/284/2 +f 207/285/2 209/286/2 211/287/2 +f 192/253/24 194/288/24 193/289/24 +f 199/290/28 211/269/28 210/291/28 +f 194/288/2 202/292/2 203/293/2 +f 194/288/25 196/276/25 195/294/25 +f 198/295/27 184/262/27 183/296/27 +f 189/297/17 195/298/17 197/299/17 +f 196/276/28 198/295/28 197/300/28 +f 198/295/2 204/301/2 182/302/2 +f 182/303/24 205/304/24 212/268/24 +f 186/263/2 184/262/2 182/305/2 +f 204/279/23 206/306/23 205/304/23 +f 200/307/27 210/291/27 209/308/27 +f 216/309/72 215/310/72 213/311/72 +f 216/309/17 220/312/17 219/313/17 +f 218/314/73 217/315/73 219/313/73 +f 214/316/2 213/311/2 217/317/2 +f 224/318/72 223/319/72 221/320/72 +f 224/318/17 228/321/17 227/322/17 +f 226/323/73 225/324/73 227/322/73 +f 222/325/2 221/320/2 225/326/2 +f 230/327/54 231/328/54 136/329/54 +f 229/330/53 134/331/53 136/332/53 +f 144/333/54 234/203/54 147/334/54 +f 233/202/54 147/334/54 234/203/54 +f 145/335/54 234/203/54 144/333/54 +f 230/327/54 234/203/54 145/335/54 +f 146/336/54 230/327/54 145/335/54 +f 146/336/54 148/337/54 230/327/54 +f 231/328/54 230/327/54 148/337/54 +f 148/338/53 229/330/53 231/339/53 +f 141/340/53 229/330/53 148/338/53 +f 142/341/53 229/330/53 141/340/53 +f 229/330/53 142/341/53 232/198/53 +f 143/342/53 232/198/53 142/341/53 +f 143/342/53 147/343/53 232/198/53 +f 233/200/53 232/198/53 147/343/53 +f 8/344/1 7/1/1 91/3/1 +f 6/345/2 2/4/2 5/6/2 +f 7/39/3 5/6/3 35/8/3 +f 6/345/4 8/9/4 2/4/4 +f 11/45/5 12/11/5 13/13/5 +f 13/13/6 14/12/6 15/15/6 +f 15/15/7 16/14/7 17/17/7 +f 17/346/8 18/18/8 19/20/8 +f 35/347/9 36/21/9 39/23/9 +f 19/20/10 20/19/10 21/25/10 +f 36/348/2 9/26/2 38/22/2 +f 21/25/11 22/24/11 23/29/11 +f 9/349/12 10/30/12 37/27/12 +f 23/29/13 24/28/13 25/33/13 +f 37/27/3 40/31/3 38/22/3 +f 25/33/14 26/32/14 27/35/14 +f 5/6/3 1/5/3 36/7/3 +f 27/35/15 28/34/15 29/38/15 +f 3/47/3 7/39/3 10/40/3 +f 29/38/16 30/37/16 31/42/16 +f 10/350/17 35/43/17 40/31/17 +f 33/46/18 34/44/18 11/45/18 +f 31/42/19 32/41/19 33/46/19 +f 1/5/3 3/47/3 9/36/3 +f 41/64/20 42/48/20 43/50/20 +f 43/50/21 44/49/21 45/52/21 +f 45/52/22 46/51/22 47/54/22 +f 47/54/23 48/53/23 49/56/23 +f 51/60/24 49/57/24 52/59/24 +f 53/65/25 51/60/25 54/61/25 +f 61/351/26 50/55/26 60/62/26 +f 55/352/27 56/63/27 41/64/27 +f 55/352/28 53/65/28 56/63/28 +f 57/91/20 58/66/20 65/68/20 +f 56/63/29 54/61/29 64/70/29 +f 59/353/30 46/51/30 57/71/30 +f 52/59/31 50/58/31 62/73/31 +f 42/48/32 56/63/32 58/75/32 +f 44/49/33 42/48/33 57/77/33 +f 60/354/34 48/53/34 59/78/34 +f 54/61/35 52/59/35 63/80/35 +f 72/85/2 71/81/2 80/83/2 +f 58/66/27 64/84/27 66/67/27 +f 63/93/25 62/86/25 71/81/25 +f 61/355/23 60/88/23 69/90/23 +f 59/96/21 57/91/21 67/92/21 +f 64/84/28 63/93/28 72/85/28 +f 62/86/24 61/94/24 70/87/24 +f 60/88/22 59/96/22 68/89/22 +f 78/118/21 86/97/21 79/99/21 +f 70/87/2 69/95/2 78/101/2 +f 68/89/2 67/92/2 76/103/2 +f 65/68/2 66/67/2 73/105/2 +f 66/67/2 72/85/2 74/107/2 +f 71/81/2 70/87/2 79/109/2 +f 77/356/2 69/90/2 76/110/2 +f 75/357/2 67/92/2 73/111/2 +f 83/114/2 81/358/2 82/359/2 +f 82/359/2 88/360/2 83/114/2 +f 87/361/2 86/112/2 83/114/2 +f 85/113/2 84/362/2 83/114/2 +f 83/114/2 88/360/2 87/361/2 +f 79/99/22 87/98/22 80/116/22 +f 77/363/20 85/117/20 78/118/20 +f 76/123/27 84/119/27 77/121/27 +f 75/128/28 83/122/28 76/123/28 +f 74/127/24 82/124/24 73/126/24 +f 80/116/23 88/115/23 74/127/23 +f 73/126/25 81/125/25 75/128/25 +f 91/3/17 92/2/17 95/130/17 +f 7/364/36 3/131/36 92/2/36 +f 4/365/37 8/133/37 89/134/37 +f 3/366/38 4/135/38 90/132/38 +f 96/367/3 94/136/3 110/138/3 +f 94/140/17 90/132/17 93/139/17 +f 92/2/17 90/132/17 96/129/17 +f 89/134/17 91/3/17 93/139/17 +f 97/146/39 98/141/39 99/143/39 +f 101/368/40 99/143/40 102/144/40 +f 105/148/41 106/145/41 97/146/41 +f 103/157/42 104/147/42 105/148/42 +f 107/369/17 109/149/17 108/137/17 +f 93/155/4 95/150/4 107/152/4 +f 95/150/9 96/153/9 109/151/9 +f 94/136/12 93/155/12 108/137/12 +f 105/148/17 97/370/17 99/371/17 +f 99/371/17 101/156/17 105/148/17 +f 112/166/12 114/158/12 111/160/12 +f 114/158/17 118/161/17 113/159/17 +f 119/168/43 120/163/43 121/165/43 +f 116/171/2 112/166/2 115/167/2 +f 117/162/9 118/161/9 119/168/9 +f 115/167/2 121/169/2 116/171/2 +f 111/175/3 113/372/3 119/174/3 +f 117/373/3 119/174/3 113/372/3 +f 114/180/4 112/374/4 120/177/4 +f 116/178/4 120/177/4 112/374/4 +f 123/184/12 124/181/12 126/183/12 +f 4/375/44 124/181/44 2/185/44 +f 3/376/45 125/182/45 4/186/45 +f 1/377/46 126/183/46 3/187/46 +f 2/378/47 123/184/47 1/188/47 +f 127/192/9 128/189/9 130/191/9 +f 6/379/48 128/189/48 8/193/48 +f 5/380/49 129/190/49 6/194/49 +f 7/381/50 130/191/50 5/195/50 +f 8/382/51 127/192/51 7/196/51 +f 133/383/52 131/199/52 232/198/52 +f 132/197/52 134/331/52 229/330/52 +f 229/330/52 232/198/52 132/197/52 +f 133/383/53 232/198/53 135/201/53 +f 135/384/54 233/202/54 137/204/54 +f 139/206/55 137/204/55 234/203/55 +f 234/203/55 230/327/55 140/205/55 +f 138/385/55 140/205/55 230/327/55 +f 157/386/56 176/207/56 155/209/56 +f 160/387/57 170/210/57 162/212/57 +f 151/388/20 152/213/20 153/215/20 +f 157/389/58 159/216/58 176/207/58 +f 162/390/59 169/211/59 164/219/59 +f 153/215/21 154/214/21 155/221/21 +f 151/391/60 153/222/60 173/224/60 +f 166/392/61 164/225/61 167/226/61 +f 155/221/22 156/220/22 157/228/22 +f 180/259/17 173/224/17 174/223/17 +f 174/223/17 175/208/17 176/207/17 +f 176/207/17 177/217/17 178/229/17 +f 178/229/17 179/257/17 180/259/17 +f 180/259/17 174/223/17 178/229/17 +f 166/393/62 167/226/62 152/231/62 +f 157/228/23 158/227/23 159/233/23 +f 154/394/63 150/234/63 156/236/63 +f 154/395/64 152/237/64 150/234/64 +f 159/233/24 160/232/24 161/239/24 +f 156/396/65 172/235/65 158/241/65 +f 172/235/2 150/234/2 149/230/2 +f 149/230/2 167/226/2 168/218/2 +f 168/218/2 169/211/2 170/210/2 +f 170/210/2 171/240/2 172/235/2 +f 172/235/2 149/230/2 170/210/2 +f 161/239/25 162/238/25 163/243/25 +f 202/274/20 201/244/20 208/246/20 +f 165/250/27 166/247/27 151/249/27 +f 163/243/28 164/242/28 165/250/28 +f 155/397/66 175/208/66 153/251/66 +f 158/398/67 171/240/67 160/252/67 +f 194/288/2 192/253/2 202/255/2 +f 161/399/68 178/229/68 159/256/68 +f 163/400/69 179/257/69 161/258/69 +f 165/401/70 180/259/70 163/260/70 +f 151/402/71 173/224/71 165/261/71 +f 183/296/20 184/262/20 185/264/20 +f 199/403/2 188/265/2 181/266/2 +f 199/290/25 181/267/25 211/269/25 +f 185/264/21 186/263/21 187/270/21 +f 192/281/2 190/271/2 201/273/2 +f 203/280/21 202/274/21 207/275/21 +f 189/404/22 187/270/22 190/271/22 +f 198/295/2 196/276/2 204/278/2 +f 206/306/22 204/279/22 207/275/22 +f 189/404/23 190/271/23 191/282/23 +f 190/271/2 188/265/2 200/284/2 +f 211/287/2 212/405/2 207/285/2 +f 205/406/2 206/407/2 207/285/2 +f 207/285/2 208/408/2 209/286/2 +f 209/286/2 210/409/2 211/287/2 +f 212/405/2 205/406/2 207/285/2 +f 191/410/24 192/253/24 193/289/24 +f 200/307/28 199/290/28 210/291/28 +f 196/276/2 194/288/2 203/293/2 +f 193/289/25 194/288/25 195/294/25 +f 197/300/27 198/295/27 183/296/27 +f 197/299/17 183/411/17 185/412/17 +f 185/412/17 187/413/17 197/299/17 +f 189/297/17 191/414/17 193/415/17 +f 193/415/17 195/298/17 189/297/17 +f 197/299/17 187/413/17 189/297/17 +f 195/294/28 196/276/28 197/300/28 +f 184/262/2 198/295/2 182/302/2 +f 181/267/24 182/303/24 212/268/24 +f 181/416/2 186/263/2 182/305/2 +f 182/303/23 204/279/23 205/304/23 +f 201/417/27 200/307/27 209/308/27 +f 214/316/72 216/309/72 213/311/72 +f 215/310/17 216/309/17 219/313/17 +f 220/312/73 218/314/73 219/313/73 +f 218/418/2 214/316/2 217/317/2 +f 222/325/72 224/318/72 221/320/72 +f 223/319/17 224/318/17 227/322/17 +f 228/321/73 226/323/73 227/322/73 +f 226/419/2 222/325/2 225/326/2 +f 138/385/54 230/327/54 136/329/54 +f 231/339/53 229/330/53 136/332/53 diff --git a/assets/hbm/models/turret_spitfire_rotor.obj b/assets/hbm/models/turret_spitfire_rotor.obj index 8e5c91233..7c315afb0 100644 --- a/assets/hbm/models/turret_spitfire_rotor.obj +++ b/assets/hbm/models/turret_spitfire_rotor.obj @@ -87,7 +87,197 @@ v 0.500000 0.250000 0.437500 v -0.500000 0.250000 0.812500 v -0.500000 0.250000 0.437500 v 0.500000 0.650000 0.625000 -v -0.750000 0.650000 0.625000 +v -0.500000 0.650000 0.625000 +vt 0.934617 0.376312 +vt 0.855934 0.393798 +vt 0.838448 0.315114 +vt 0.691617 0.711333 +vt 0.611014 0.671031 +vt 0.772220 0.711333 +vt 0.305324 0.501217 +vt 0.466530 0.501217 +vt 0.466530 0.531443 +vt 0.565404 0.581820 +vt 0.525102 0.581820 +vt 0.525102 0.501217 +vt 0.426229 0.210643 +vt 0.265022 0.250945 +vt 0.265022 0.009135 +vt 0.305324 0.911922 +vt 0.305324 0.932073 +vt 0.265022 0.932073 +vt 0.466530 0.911922 +vt 0.466530 0.932073 +vt 0.627737 0.911922 +vt 0.627737 0.932073 +vt 0.788943 0.911922 +vt 0.788943 0.932073 +vt 0.829244 0.911922 +vt 0.829244 0.932073 +vt 0.587435 0.049437 +vt 0.587435 0.210643 +vt 0.466530 0.732951 +vt 0.305324 0.732951 +vt 0.305324 0.571745 +vt 0.246664 0.300452 +vt 0.207569 0.300496 +vt 0.207445 0.189919 +vt 0.525102 0.776413 +vt 0.525102 0.695810 +vt 0.565404 0.695810 +vt 0.772220 0.872540 +vt 0.691617 0.791936 +vt 0.535749 0.368957 +vt 0.421759 0.482947 +vt 0.421759 0.368957 +vt 0.246752 0.378642 +vt 0.207657 0.378686 +vt 0.364763 0.425952 +vt 0.279271 0.397454 +vt 0.364763 0.311961 +vt 0.207264 0.028727 +vt 0.246359 0.028683 +vt 0.265022 0.383205 +vt 0.956474 0.288886 +vt 0.952103 0.454996 +vt 0.246337 0.009135 +vt 0.009135 0.009135 +vt 0.204732 0.501489 +vt 0.164431 0.501489 +vt 0.164431 0.420886 +vt 0.050884 0.319118 +vt 0.009135 0.319118 +vt 0.009135 0.201036 +vt 0.164431 0.696082 +vt 0.164431 0.615479 +vt 0.204732 0.615479 +vt 0.794735 0.489967 +vt 0.807213 0.170341 +vt 0.646007 0.170342 +vt 0.726610 0.089738 +vt 0.050884 0.402616 +vt 0.009135 0.402616 +vt 0.646007 0.089738 +vt 0.605705 0.009135 +vt 0.009135 0.830061 +vt 0.170342 0.830061 +vt 0.170342 0.860287 +vt 0.009135 0.028902 +vt 0.050884 0.028902 +vt 0.794735 0.304185 +vt 0.952103 0.269215 +vt 0.305324 0.531443 +vt 0.239123 0.799636 +vt 0.239123 0.862761 +vt 0.223003 0.862761 +vt 0.239123 0.736511 +vt 0.223003 0.799636 +vt 0.239123 0.673386 +vt 0.223003 0.736511 +vt 0.223003 0.673386 +vt 0.223003 0.610261 +vt 0.239123 0.547136 +vt 0.239123 0.610260 +vt 0.239123 0.484011 +vt 0.223003 0.547136 +vt 0.223003 0.484011 +vt 0.223003 0.420886 +vt 0.990865 0.323923 +vt 0.974744 0.323923 +vt 0.974744 0.269215 +vt 0.990865 0.378632 +vt 0.974744 0.378632 +vt 0.990865 0.433340 +vt 0.974744 0.433340 +vt 0.990865 0.488048 +vt 0.974744 0.488048 +vt 0.990865 0.542757 +vt 0.974744 0.542757 +vt 0.990865 0.597465 +vt 0.974744 0.597465 +vt 0.990865 0.652173 +vt 0.974744 0.652173 +vt 0.990865 0.706882 +vt 0.974744 0.706882 +vt 0.164431 0.714352 +vt 0.180551 0.714352 +vt 0.180551 0.746594 +vt 0.079960 0.773363 +vt 0.102758 0.750564 +vt 0.146161 0.783869 +vt 0.069453 0.707161 +vt 0.048517 0.656617 +vt 0.041531 0.723282 +vt 0.009135 0.602377 +vt 0.041376 0.602377 +vt 0.017375 0.539792 +vt 0.048517 0.548137 +vt 0.069453 0.497593 +vt 0.102757 0.454190 +vt 0.041531 0.481472 +vt 0.079959 0.431392 +vt 0.146160 0.420886 +vt 0.731644 0.606959 +vt 0.688206 0.652761 +vt 0.667908 0.627712 +vt 0.705555 0.588016 +vt 0.731644 0.539929 +vt 0.761748 0.551474 +vt 0.744399 0.486729 +vt 0.774793 0.426986 +vt 0.776465 0.490089 +vt 0.756846 0.366466 +vt 0.742950 0.432039 +vt 0.727396 0.379589 +vt 0.698796 0.332951 +vt 0.723846 0.312653 +vt 0.659101 0.295305 +vt 0.611014 0.269215 +vt 0.678044 0.269215 +vt 0.265022 0.822437 +vt 0.426229 0.822437 +vt 0.426229 0.893652 +vt 0.696384 0.009135 +vt 0.611014 0.761710 +vt 0.611014 0.701258 +vt 0.426229 0.751221 +vt 0.565404 0.501217 +vt 0.426229 0.009135 +vt 0.426229 0.049437 +vt 0.426229 0.250945 +vt 0.265022 0.911922 +vt 0.466530 0.571745 +vt 0.246540 0.189875 +vt 0.565404 0.776413 +vt 0.852824 0.791936 +vt 0.852824 0.872540 +vt 0.592744 0.425952 +vt 0.535749 0.482947 +vt 0.379012 0.269215 +vt 0.393261 0.283464 +vt 0.204732 0.420886 +vt 0.050884 0.201036 +vt 0.204732 0.696082 +vt 0.890904 0.551165 +vt 0.812220 0.568650 +vt 0.807213 0.250945 +vt 0.726610 0.250945 +vt 0.009135 0.860287 +vt 0.799106 0.323856 +vt 0.506832 0.571745 +vt 0.265022 0.571745 +vt 0.265022 0.531443 +vt 0.506832 0.531443 +vt 0.239123 0.420886 +vt 0.990865 0.269215 +vt 0.164431 0.746594 +vt 0.130040 0.811791 +vt 0.017375 0.664962 +vt 0.265022 0.893652 +vt 0.635931 0.009135 +vt 0.726610 0.009135 +vt 0.611014 0.791936 +vt 0.265022 0.751221 vn -1.000000 0.000000 0.000000 vn 0.000000 1.000000 0.000000 vn 0.000000 0.000000 -1.000000 @@ -114,169 +304,165 @@ vn 0.000000 -0.382700 0.923900 vn 0.000000 -0.608800 0.793400 vn 0.000000 0.424400 -0.905500 vn 0.000000 0.424400 0.905500 -vn -0.442300 0.884700 0.147400 s off -f 45//1 3//1 1//1 -f 23//1 6//1 24//1 -f 85//2 83//2 29//2 -f 25//3 28//3 31//3 -f 13//4 5//4 1//4 -f 10//3 9//3 3//3 -f 12//1 11//1 9//1 -f 16//3 15//3 11//3 -f 14//5 13//5 15//5 -f 14//3 8//3 7//3 -f 11//4 15//4 13//4 -f 16//2 12//2 10//2 -f 20//6 17//6 24//6 -f 22//3 21//3 18//3 -f 18//1 25//1 24//1 -f 21//5 27//5 28//5 -f 25//7 18//7 21//7 -f 22//2 19//2 17//2 -f 26//5 27//5 30//5 -f 31//5 28//5 26//5 -f 24//8 6//8 30//8 -f 31//5 30//5 5//5 -f 39//1 32//1 40//1 -f 39//1 41//1 45//1 -f 41//3 44//3 47//3 -f 36//6 33//6 40//6 -f 38//3 37//3 34//3 -f 34//1 41//1 40//1 -f 37//5 43//5 44//5 -f 41//7 34//7 37//7 -f 38//2 35//2 33//2 -f 42//5 43//5 46//5 -f 46//2 6//2 82//2 -f 40//8 32//8 46//8 -f 5//9 6//9 46//9 -f 10//2 4//2 47//2 -f 57//10 56//10 51//10 -f 58//11 57//11 50//11 -f 59//12 58//12 49//12 -f 59//13 48//13 63//13 -f 53//14 52//14 63//14 -f 54//15 53//15 62//15 -f 54//16 61//16 60//16 -f 69//17 78//17 77//17 -f 70//18 79//18 78//18 -f 71//19 80//19 79//19 -f 72//20 81//20 80//20 -f 64//21 73//21 81//21 -f 65//22 74//22 73//22 -f 66//23 75//23 74//23 -f 67//24 76//24 75//24 -f 76//6 67//6 51//6 -f 57//1 75//1 76//1 -f 74//1 75//1 57//1 -f 73//1 74//1 58//1 -f 52//1 81//1 73//1 -f 53//1 80//1 81//1 -f 79//1 80//1 53//1 -f 78//1 79//1 54//1 -f 78//1 55//1 77//1 -f 50//5 51//5 67//5 -f 50//5 66//5 65//5 -f 49//5 65//5 64//5 -f 63//5 48//5 64//5 -f 62//5 63//5 72//5 -f 62//5 71//5 70//5 -f 61//5 70//5 69//5 -f 69//5 68//5 60//5 -f 85//25 87//25 86//25 -f 85//5 44//5 42//5 -f 83//1 82//1 23//1 -f 84//26 82//26 86//26 -f 1//1 2//1 45//1 -f 45//9 32//9 4//9 -f 4//1 3//1 45//1 -f 47//2 85//2 29//2 -f 29//3 25//3 31//3 -f 1//4 3//4 9//4 -f 9//4 13//4 1//4 -f 7//4 5//4 13//4 -f 4//3 10//3 3//3 -f 10//1 12//1 9//1 -f 12//3 16//3 11//3 -f 16//5 14//5 15//5 -f 13//3 14//3 7//3 -f 9//4 11//4 13//4 -f 14//2 16//2 10//2 -f 27//6 20//6 24//6 -f 19//3 22//3 18//3 -f 24//1 17//1 18//1 -f 19//1 18//1 17//1 -f 25//1 23//1 24//1 -f 26//5 28//5 27//5 -f 21//5 22//5 20//5 -f 20//5 27//5 21//5 -f 28//7 25//7 21//7 -f 20//2 22//2 17//2 -f 30//5 31//5 26//5 -f 27//8 24//8 30//8 -f 5//5 7//5 31//5 -f 8//5 31//5 7//5 -f 32//1 39//1 45//1 -f 45//3 41//3 47//3 -f 43//6 36//6 40//6 -f 35//3 38//3 34//3 -f 40//1 33//1 34//1 -f 35//1 34//1 33//1 -f 41//1 39//1 40//1 -f 42//5 44//5 43//5 -f 37//5 38//5 36//5 -f 36//5 43//5 37//5 -f 44//7 41//7 37//7 -f 36//2 38//2 33//2 -f 84//2 46//2 82//2 -f 43//8 40//8 46//8 -f 1//9 5//9 46//9 -f 45//5 2//5 1//5 -f 46//4 32//4 45//4 -f 30//9 6//9 5//9 -f 46//27 45//27 1//27 -f 29//2 31//2 8//2 -f 8//2 14//2 29//2 -f 4//9 32//9 45//9 -f 14//2 10//2 47//2 -f 47//2 29//2 14//2 -f 4//2 45//2 47//2 -f 50//10 57//10 51//10 -f 49//11 58//11 50//11 -f 48//12 59//12 49//12 -f 52//13 59//13 63//13 -f 62//14 53//14 63//14 -f 61//15 54//15 62//15 -f 55//16 54//16 60//16 -f 68//17 69//17 77//17 -f 69//18 70//18 78//18 -f 70//19 71//19 79//19 -f 71//20 72//20 80//20 -f 72//21 64//21 81//21 -f 64//22 65//22 73//22 -f 65//23 66//23 74//23 -f 66//24 67//24 75//24 -f 56//6 76//6 51//6 -f 56//1 57//1 76//1 -f 58//1 74//1 57//1 -f 59//1 73//1 58//1 -f 59//1 52//1 73//1 -f 52//1 53//1 81//1 -f 54//1 79//1 53//1 -f 55//1 78//1 54//1 -f 66//5 50//5 67//5 -f 49//5 50//5 65//5 -f 48//5 49//5 64//5 -f 72//5 63//5 64//5 -f 71//5 62//5 72//5 -f 61//5 62//5 70//5 -f 60//5 61//5 69//5 -f 83//25 85//25 86//25 -f 42//5 46//5 84//5 -f 84//5 85//5 42//5 -f 47//5 44//5 85//5 -f 23//1 25//1 83//1 -f 29//1 83//1 25//1 -f 82//1 6//1 23//1 -f 87//26 84//26 86//26 +f 39/1/1 41/2/1 45/3/1 +f 23/4/1 6/5/1 24/6/1 +f 85/7/2 83/8/2 29/9/2 +f 25/10/3 28/11/3 31/12/3 +f 13/13/4 5/14/4 1/15/4 +f 10/16/3 9/17/3 3/18/3 +f 12/19/1 11/20/1 9/17/1 +f 16/21/3 15/22/3 11/20/3 +f 14/23/5 13/24/5 15/22/5 +f 14/23/3 8/25/3 7/26/3 +f 11/27/4 15/28/4 13/13/4 +f 16/29/2 12/30/2 10/31/2 +f 20/32/6 17/33/6 24/34/6 +f 22/35/3 21/36/3 18/37/3 +f 18/38/1 25/39/1 24/6/1 +f 21/40/5 27/41/5 28/42/5 +f 25/10/7 18/37/7 21/36/7 +f 22/43/2 19/44/2 17/33/2 +f 26/45/5 27/41/5 30/46/5 +f 31/47/5 28/42/5 26/45/5 +f 24/34/8 6/48/8 30/49/8 +f 31/47/5 30/46/5 5/50/5 +f 39/1/1 32/51/1 40/52/1 +f 5/53/9 6/48/9 1/54/9 +f 41/55/3 44/56/3 47/57/3 +f 36/58/6 33/59/6 40/60/6 +f 38/61/3 37/62/3 34/63/3 +f 34/64/1 41/2/1 40/52/1 +f 37/65/5 43/66/5 44/67/5 +f 41/55/7 34/63/7 37/62/7 +f 38/68/2 35/69/2 33/59/2 +f 42/70/5 43/66/5 46/71/5 +f 46/72/2 6/73/2 82/74/2 +f 40/60/8 32/75/8 46/76/8 +f 45/3/1 3/77/1 1/78/1 +f 47/79/2 29/9/2 10/31/2 +f 57/80/10 56/81/10 51/82/10 +f 58/83/11 57/80/11 50/84/11 +f 59/85/12 58/83/12 49/86/12 +f 59/85/13 48/87/13 63/88/13 +f 53/89/14 52/90/14 63/88/14 +f 54/91/15 53/89/15 62/92/15 +f 54/91/16 61/93/16 60/94/16 +f 69/95/17 78/96/17 77/97/17 +f 70/98/18 79/99/18 78/96/18 +f 71/100/19 80/101/19 79/99/19 +f 72/102/20 81/103/20 80/101/20 +f 64/104/21 73/105/21 81/103/21 +f 65/106/22 74/107/22 73/105/22 +f 66/108/23 75/109/23 74/107/23 +f 67/110/24 76/111/24 75/109/24 +f 76/112/6 67/113/6 51/114/6 +f 57/115/1 75/116/1 76/117/1 +f 74/118/1 75/116/1 57/115/1 +f 73/119/1 74/118/1 58/120/1 +f 52/121/1 81/122/1 73/119/1 +f 53/123/1 80/124/1 81/122/1 +f 79/125/1 80/124/1 53/123/1 +f 78/126/1 79/125/1 54/127/1 +f 78/126/1 55/128/1 77/129/1 +f 50/130/5 51/131/5 67/132/5 +f 50/130/5 66/133/5 65/134/5 +f 49/135/5 65/134/5 64/136/5 +f 63/137/5 48/138/5 64/136/5 +f 62/139/5 63/137/5 72/140/5 +f 62/139/5 71/141/5 70/142/5 +f 61/143/5 70/142/5 69/144/5 +f 69/144/5 68/145/5 60/146/5 +f 87/147/25 86/148/25 83/149/25 +f 85/150/5 44/67/5 42/70/5 +f 83/151/1 82/152/1 23/4/1 +f 82/153/26 86/148/26 87/147/26 +f 32/51/1 39/1/1 45/3/1 +f 47/79/2 85/7/2 29/9/2 +f 29/154/3 25/10/3 31/12/3 +f 1/15/4 3/155/4 9/156/4 +f 9/156/4 13/13/4 1/15/4 +f 7/157/4 5/14/4 13/13/4 +f 4/158/3 10/16/3 3/18/3 +f 10/16/1 12/19/1 9/17/1 +f 12/19/3 16/21/3 11/20/3 +f 16/21/5 14/23/5 15/22/5 +f 13/24/3 14/23/3 7/26/3 +f 9/156/4 11/27/4 13/13/4 +f 14/159/2 16/29/2 10/31/2 +f 27/160/6 20/32/6 24/34/6 +f 19/161/3 22/35/3 18/37/3 +f 24/6/1 17/162/1 18/38/1 +f 19/163/1 18/38/1 17/162/1 +f 25/39/1 23/4/1 24/6/1 +f 26/45/5 28/42/5 27/41/5 +f 21/40/5 22/164/5 20/165/5 +f 20/165/5 27/41/5 21/40/5 +f 28/11/7 25/10/7 21/36/7 +f 20/32/2 22/43/2 17/33/2 +f 30/46/5 31/47/5 26/45/5 +f 27/160/8 24/34/8 30/49/8 +f 5/50/5 7/166/5 31/47/5 +f 8/167/5 31/47/5 7/166/5 +f 32/75/9 1/54/9 46/76/9 +f 5/53/9 30/49/9 6/48/9 +f 6/48/9 46/76/9 1/54/9 +f 45/168/3 41/55/3 47/57/3 +f 43/169/6 36/58/6 40/60/6 +f 35/170/3 38/61/3 34/63/3 +f 40/52/1 33/171/1 34/64/1 +f 35/172/1 34/64/1 33/171/1 +f 41/2/1 39/1/1 40/52/1 +f 42/70/5 44/67/5 43/66/5 +f 37/65/5 38/173/5 36/174/5 +f 36/174/5 43/66/5 37/65/5 +f 44/56/7 41/55/7 37/62/7 +f 36/58/2 38/68/2 33/59/2 +f 84/175/2 46/72/2 82/74/2 +f 43/169/8 40/60/8 46/76/8 +f 1/78/1 32/51/1 45/3/1 +f 45/3/1 4/176/1 3/77/1 +f 8/177/2 14/159/2 29/9/2 +f 10/31/2 4/178/2 45/179/2 +f 45/179/2 47/79/2 10/31/2 +f 29/9/2 31/180/2 8/177/2 +f 14/159/2 10/31/2 29/9/2 +f 50/84/10 57/80/10 51/82/10 +f 49/86/11 58/83/11 50/84/11 +f 48/87/12 59/85/12 49/86/12 +f 52/90/13 59/85/13 63/88/13 +f 62/92/14 53/89/14 63/88/14 +f 61/93/15 54/91/15 62/92/15 +f 55/181/16 54/91/16 60/94/16 +f 68/182/17 69/95/17 77/97/17 +f 69/95/18 70/98/18 78/96/18 +f 70/98/19 71/100/19 79/99/19 +f 71/100/20 72/102/20 80/101/20 +f 72/102/21 64/104/21 81/103/21 +f 64/104/22 65/106/22 73/105/22 +f 65/106/23 66/108/23 74/107/23 +f 66/108/24 67/110/24 75/109/24 +f 56/183/6 76/112/6 51/114/6 +f 56/184/1 57/115/1 76/117/1 +f 58/120/1 74/118/1 57/115/1 +f 59/185/1 73/119/1 58/120/1 +f 59/185/1 52/121/1 73/119/1 +f 52/121/1 53/123/1 81/122/1 +f 54/127/1 79/125/1 53/123/1 +f 55/128/1 78/126/1 54/127/1 +f 66/133/5 50/130/5 67/132/5 +f 49/135/5 50/130/5 65/134/5 +f 48/138/5 49/135/5 64/136/5 +f 72/140/5 63/137/5 64/136/5 +f 71/141/5 62/139/5 72/140/5 +f 61/143/5 62/139/5 70/142/5 +f 60/146/5 61/143/5 69/144/5 +f 85/186/25 87/147/25 83/149/25 +f 42/70/5 46/71/5 84/187/5 +f 84/187/5 85/150/5 42/70/5 +f 47/188/5 44/67/5 85/150/5 +f 23/4/1 25/39/1 83/151/1 +f 29/189/1 83/151/1 25/39/1 +f 82/152/1 6/5/1 23/4/1 +f 84/190/26 82/153/26 87/147/26 +l 2 32 diff --git a/assets/hbm/textures/items/capacitor.png b/assets/hbm/textures/items/capacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..d301355f17af22fcfe90ae589de83310eecff074 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfLuC?CS@BRzU}7rD28FPB&Q1N|8x(p)xZ63um+s{d|l~{ zCs&(A+PyVuZhzPk3e9$Vu;0*3X#ld70;F@RFGt iz09j;PDpH)XJELSVIyZ5{jU^gJ%gvKpUXO@geCyCPeZ!^ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_b92_ammo.png b/assets/hbm/textures/items/gun_b92_ammo.png new file mode 100644 index 0000000000000000000000000000000000000000..f0412460c8d0ee101c7c9038acb56c702f6f7534 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vffdv>Utn^XC<{^_Y$p7;0mChaJG&UE--bN7Z-sY<6S z7qjsgF&8Xj4i5hRp9cui&*vp30Kt#%@Adt*S}-mQv9MrZ5Z)!b^fk{eKcGbnp00i_ I>zopr0H1g|0RR91 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/ModelB92.png b/assets/hbm/textures/models/ModelB92.png index eeefc567eb3abe9771aeb35cd840fe5ef61ca79e..86dbc299458dd79c8d29b2c5a0c05561e44892b3 100644 GIT binary patch delta 1653 zcmV-*28#Kw4X+K5O@F{my10lNH70P?HIfe&jsrDG5eMwTcCUc@B!yF?Ns2&(LHH~+ z1{;Ae0XJ%#CZveLCb$Xy0g;@J+uNNK@>{>1o!Ote-Iav(!Lc)MX5a42zQ37yXMv&9 z=}5*@sFpXgMMq8=Q_L4UvBw_t$pOG&)P;{n2O zACDe=V(fo{DUq1jqaXoI!@Yd@vTW*MTU%T4!1?3?`iUcY*2Gi!{{1-%0DRwAmF`-wJQ=X8Em%R1hs`-(hQ?H`6=Y8+We%@P@*s>FU{!#XnJu7iEp zFL2m!Re~z^s(+Z8#F<~!GEkq+Pm2_jUauzsAc`W`wv8x?5QZTf$BFCwN>KX|f*=5Z zxQ%qwah$l$uLQLpfjm@Is9isO-9a{+zF@}>I?Iii=qes;5ZJ15a4tnM1Nwksb8!HJrFX zl`yRe5P!H!JIb)QYfxhVUM?~LCYMx(2bHH$#WHZYTT)#hFYBy6UHPDND8fUfH3efJ zM6tm%nB*(c+My}fe4tef`nVw_0cE$8sz%e#wz`gc)IDR#_ zBc!p7;QGEV`3p?r3O&zDcmnbQKsvrySy{v8=4}AU{X&|UDhy-$&I=0w9$Y`48dLx3 zIe$4L>}r<7d9F(xH~>6-`g@{2DTYB5i@thQ`|NA_xTXb4S!8W(acpkh#)S(Vym|8v z78jReDVX&6pMUo}mXw{Fi*n(Vz%YpLb`av%FF%%C-*w280213O!{e2eH9ULP$LZ4_ z;ra6|tgNh6_6+`Y`4`VZDHW*VCFzS_ynpy9!Z5_Wd*4jOkAn={tgznw4$4_bZD7y= zM_!Tv^#u+l#$>d}z>P+u+OtD;ZZ66hVaF;!E-*_45^k_eJl@ofP2EUki0~bvX`rUw zP5kKX8{01MFn*ITpq3-hdsez?As&subz{<4geR~1x7M}nht?%?Jc)Jr>#x3$qhO4me*VRn)J?q9Rjp~iLQR%5#sM@jMN}XUp6A77Aw+^_tJRX6 z$E_RJB=+~Zv-(Ya?KZ8*)j%l7q-=k)n zPKsJ1L7nca5}<1@LYoAnCabHfk|wS8P#8$s6w-NeqpBDAvC^ZOz zn8qcEc=7wxejMCmG;RdBn=@slcDr4fmrzO2h2Ey^xW@l5kvCBk!076B= delta 1653 zcmV-*28#Kw4X+K5O@Ba5y10lMH70P?HIfe&jxCcS4%mh5-U0VX3a3bu6oDKD;j`2j zYz#&O)VOh)kRk?~peFbSL~=TAZ+BA2Z~b<5W`FMX))LkS$IiT&eY-RJ{$}Q#1%^(i zBOS-V=H{ja0GBTPC&%LfT=x{l;{m9ws}p#CqEk7J12~R@et*Aj!2sWvl6a5D14PjQ z9zOiU*#87mA~mx|K?0hFd-38$+0?_fx3`ml^T`GD6G!yCiKp_tdkYo-_`WZrC@MY4 zF0VvUlxn1hQ8|hZQf<7>>HMmeb-YdYm3gk(KZ>HvIP#F0B{D*FiT&oLb!5a{2m5`$ z!25=)5>&BQ#edW!&ityDf!XQ&w8$_CfSJLNd+j#np6d- zTqH@oUeDrRTx~0yfV!c+Fn_r?jsXCU<3I=jP8UL?CV!jy1wkPBhdk?MiwW1rusu!RZ{PekzE+?jF-K%JK&EUs*>ZxF*K4ngF#=-4jq1S~ti= zEKlcE`fxZ*=`xjHy?TY6ot@0H+U>SnSXcnioR?6Mu>pDFQiM*YljxsGQjQu<+@MOB zRs{&$rGFh|Sll(JF#s=@nE;bZs=|ZH)2LzZ#F6>06z6l^}wItG2*kdc6@TS|4K>1W$qUmEXST3X6Pk4-|W^CSs*OI1#%wtvxRq;2QW(cf1Xe1a1+uqQZcJifjx z4?>A~Vc{T@7=|(CgpGM&;msfdZ#xKM%)f2x{P?#87>wX?vH^3#1`sD#;BbI*!p5AC z#x{cM`@ZBaFpVqpJTK)5$O{13_+n$@CbqV20Z8u`(!|tZ7~8jBSO9SU>iNu=`j^ki zIe%f-vm7pRUFyIA;OW!fQ}szP4C6%f)vMa)K-0%HEl{c=Z)=NVYwH$PRyuh7`X4MW zuP0J4>GMDT?s+09kFPJwrBedKFvgofgkQh>SaN;WAy)!OZ0ih+SEboQKQ?1|4t| zB^gj(;BaD0MvDyGXf&F6cF5!F%W_WGi3*Sl%u|7s8>|wKH??CkYh*G+_zuxDP*ZOx zJ*H|3OBEdId)fvRX}POAN}{7G^5eQay0R*u4s@0apLan{jG?eVflnSvzl>?~6n}WP z4CWKIx3>oXSX^98>3*lvkx>+-5~iwvhrR?}CmW#BP5nwAjuvg6s&(B-5RjFKs(2UV z*l6E=VcoxaUJjY4|Mu6v`0V^V0AQ%7fUcj*!`0)kCpb)edyM|&bCTBqVCAfrk^rKs zb?RsF2>`PC?EAhn9dhV&pZd>gGJn_C*OPSvogozE8Ss9p1Qv$ER4;41j@#}|>6cwy zU6o-NLI?r60>G0ePjY$amezG-i11abDWOW`t>ZcK43Yi)eLQ&ZpmwRKOVU30)8P+( z0xUIT<;hBfM~@z9#jVw9Wuiz^-&r6C0!dkDld421323!ik`Gp`o6v5zWq)3MTJ(B7 zYuY8c3m|3Hd0nOJP}H~XLD!8&Yyj;R*Nq?ur0V*r!VSYP$>t=K`SL1M9ww};_WsOm-j`14sJ1-wnQ5qz~tyy(6n zaEY-=*VW%7gRF9&=Xvlv4?>94mCB}H5w9W%1JVYv5hKWXkQX5Jpl zp>atfUi?0_9|!jsjT=Gk=1f_s-ELPFB~%i0p|@!}uJJ!i6ipNbFg%da(emiiq7fr# zf_e@?W%X>rM6UxbP@kJAgS@}AOv`hUoaFxjM&o*J#Z$rz00000NkvXXu0mjf$DAei diff --git a/assets/hbm/textures/models/ModelB92Dark.png b/assets/hbm/textures/models/ModelB92Dark.png index 13521e2bfd992bbfe74f0163a2d5305c50df5d6b..e41f8582cf0ceb2b451615853c746fb55f7db9d8 100644 GIT binary patch delta 1647 zcmV-#29WuW4Ui3xG=E1)L_t(|ob6k^YaB-u|Lxw+a*7+tIH_VR@E;HtQFDz6Ty>3( zgM;HhO;X4LyRh9W;66#=fTJQQ0yzZ6htwDh0wDr!+&E205ra)InBWgMf^^(^cT&i2 z^>%h^K)Lpcfp`lLSxYjg1Wp z0J`0-^nE|GkR4v}eIII_XuPbet31@Ux^}uYN#Bt4T-tY;5R=l{+L{c40Jd!-2!c?; zx;lZkCpwky-G94xY}8!`JH5&O8;(k#Q3i@t`?73)R>YX}`+W&S)mk+JRo$t*&OAKN zi*;Dnp)^4dC_)v5((SX`?Mk5d4>y4Z5C8^)fn}l*&U}DMD9QxrKA8X|S<{*TmD4n7 zFc?^T#MOJL0w@~l2lI~$f&c(etJNTc0H+HfBEqJ2{eOO6a^b6;GIgHrsqLL!uO~M* zH!T3@^?H(CmJ|v2mDAIbAKq!*Gp2WBxQ9?z`2PCOW8aka$Xn!V6Ic_)$gDPQG6Cm)A zcAR1H(0`!j0KA+<0H% zUCBRSmQd)rZX^;=6aeD+MZ3L@t*tu%qU(hum?9iw>+TB+03P1B6zkLQ+C^Cxb}`f8 zw13d0b{qhnKK(6HpB7^;2vuLbs%;K5Z5-1CB`=bewm7!7?%?v}4&J`~8;gs}p%zU0 z{x80L9%{<&twp);k-*ps@NVD7FJFBsxxMR9^(F8+`2dw}YL|I)G;Q%zt?PDzfVf8F#Zi)DqjmR% z_3*|eIcBQ<>!1JN^GkC8fU#l%x^@mvS5Ly4;5dx!0fyHuN?r$m%OATD4IsK&r*;+> z01&t5ZnrBTj>RFxFNn72?{IN?*OVaZ^ z2q8dM0C@7`Ng@y3)VhchB7D|rI#8wZ*6}R;gve+#!lOrz3fGFFH0{*y4xf4fSZd13 z4=WLNc6PMt)@(LoS){3L8R+->l1`ybYZ93>pxJCn-dVM7LaWu1N%bNy>wgs80TA)( zyspx9NNZb0r;9`-K7dw>%YYjC^1|^vFFegj$TIROR30WY8V$*L)10BvXh;Bf{P=Nb z%WJD&%8B6gYUO~ZhwgRH~}avl@~$UNwI&WE%_&1h0R&kJc>lZY38 zPHo4*BSz&;kcTKq-002ovPDHLkV1n-68J++D delta 1646 zcmV-!29f!Y4UY|wG=D}(L_t(|ob6l9OC(1W|8-ASqw%84CZ{Y4{sGxTym*nooaUko z3=DHj4z93!SodyV?@10DFdmXaAcG()dRY(zk$@L3n@h+cf=du2=q^amVS2kO2lutF ztE>8Brl+IP9}Hdfy83lj)%&WdHx?M`^}4K7Dp*@vvjAXzet%y2zK=?!0^j#RWnG=X z+Y_D2$H&L0R4Q0sU$=0F>w(Bj+(rp-W@ct&Sufk%+zdO;2N%!}9MO{op2{mLD;5AW z8V%|De&#`Tc*Xa9sCA<8vaYW3P}}O->DnZHL(+3;-(^B$y_Y%wMMM2y{&7JN001hL3WN~gbRk4!u&G_E)qj$F@YPP4I#2i1_D-|el&h<& z763GxO-V0H@&x?K>1n|a@3ih2(>t>A2K2M6qY)ev<3SBTFK#u@0OW<%4eBB~ozAQD zPN$t?RK#pRlDMRyUayDxXOfibhC4T?68cpE0(WWG z85Va9YJUvC%UK4%-;E=E}B&6{k!D%!a zl7B!yuF!Seh$kQ~0L0^qxw$25Y&-`L-7lnpDZ((;Uc9jY;MJ4ySfAD(J&;4fE@nBL z=6|}>jsw8!*S|&Ty`tja3+u!0vYdq21_m8)_?}^mAz_CqKrS#z1tM-RPdr}Mj?JJE%Mjr^MEyWby`l7&yeTYs zaH;Q68<3{uj_xRlj;hFy>-Olfs({+jK`wl*f}8*yVSxglBxL>=)8;8~wG8G1c7Jqq z1OONv9gXOIyiF1YRc_pwdn4G9QknZJw%i-AND-mx#Q$3UX}JUc9kh zJsFoBChEWb`42uH9|iz)6cy05b9lIV6ZQl

Gec{^)_^bpV+B*o{a4(bYP&v-ki2 zaeZzy8q##gq0@b8Kd8Z+ot+KW4S#fokd|k_+o=+m8VXZAtMR&NyE~abc4}%$dY%U% z1n3F?`}_NeJakLzA~Hnys@0TGrSjJC9C(Jv+1VMkwzdkFilQX#)}IdF`T?-ikd-GZ z5w^Ftwc=K-R%215sqG-pYPBR~q4lZ~nIxcEtxDcmwQfSKR+CBfe$j5Xt$%)(=njC0 zRp)h;u0vYeqB~tQO0fa7TU<0+t(H_>UtTz#=Y`pvge)_!Lgit?^z^jkylKraJv}V} zU~g|P)a8ZwFJ;$zj~{>f*_hN#ywp`~*8K`&96$q;MFrB}x^7q&LPU60t5wN)JbU_B za=tv3qbFS;cbzKM{B3CM#erdeYBn*fe$Wn|T=Rsb8)PtVqd`L>vC}-94ypYBviFonn z)OH-)W0YDd z{8n#gXZGiAcP(LkaO}*Rw{Lf5-{1V41%_6uB^}4X{rmSV0Dri1=XbfW@dVS;Q`p#e zf~~Dr7$2X|)(M=S=v2OU?;ALdgN20!3kE!X{7OE3`fntEbMqf8Eq!O?Kf;iRjqE|t zfV$zHKYw1<^{}O-rKsb4Z~^_m5j}0-iT}cd&ny6Fx7#uZg4~1b@=6c{u||3rw?|Ir zbpq!nIxp*Fn}6;jdfIbU{vZev{YXP%l*kF4Ir9m~8BI@5Y3l^ePjo7uJv(t=)LjSr zeZRo_hN}|jD+5!CiY4m=-cEFtrz)Et76~EUZdU?87>2NI8(|nC2m&~c6V>^Zpz;xX z-v@xGjcn9$oT$#P1eK3K5vnXyZlCRTTLR_3xC!(D0e@hAe%>Bzfx?^*!R>2xGLjFJg8vEXzL6Q2r_ue-*v2Mz~BTAlMfgXHh?g?0(%`C z5q~yDgfzAh+;+Py`3npa3O&z@MFNTfKr+9Wo4bL<#hU=)>xDEhWjMy>trr#mJiKx$ z(Wiw=C*_E+%b5;mg)X(@!2W(B)dxk-43hQ~EcP>LdLX^UfV@g`26ZeeTd z6(%QVBP|&8`JeyrJkpfaYm;*9BY~bD;(yIffIDA)D!IMukg5Tswq>Trb8|QF?AZdw z$0zXo`4Z;lZj|;6{&o2mPeUOSDB~sRi%(BaAqWCIc<}8|@;J!BjSB1CZ?Bw&!~zCw zaAX}aAYNc^U`$Sn99+NOul#h#>a|HZBJ9WnC>>~@#8VuZ?#%72!hywsUqO1FM-#|2dH!tU+&G(ti@BcuG+C=B*dj!z-s`kE!}^fBlEEr+-EP06oP7bbKyPR}aIQU@wa8Ar>y3l)MfAr$6>$ z8bEZlPJ9+003d14?RHz5HaT>*PyAI4=IrcjG;g3igsgK0oKMxj%v6}_d7al`Tiwb1 zvggj7lfLgm2m!hRz@tZxQf26-)@7U!;j>oLfhtwDPG;pNM7FoLvAn!ox_?%brD-4h z?(hdc0G67v^217mm6a8(x-}Y&L>6h{tpeR{SJEl8K}{l;1~eKC$vdmoO=vcoGOb<) zhMl6j0AgO9*HyX>S-e$rx=hsK18B9l3aFv4C|uw7qtl#(JYQagD#L`CnHkAt)0|;u zW<~h3xxpaew=lUyX;lNtQaRHLX{uhb4`901ZqY6Uc(+c~Myi5tG?y zG$faC{pw}O1XqBhJK-{O0%~KdvqsSkBK7Wg}fVZhWg3mTd z7TuQxt}!;*y80WWlSS_HJP)4dK?o7MQrYy&l9i=lK-@vr;sm)2iUMRFbU&9vTB2sD zzVAmgu1O?|->33%@Q6{n6XapebSkye>By`Dl>}YtZCZ}2{SOma14Ri8Ph@noH2Scp z#R;0A?n6*n-J3Ac%O!vdlow|5Anh+L!^#}wO!EJfPne8>T{g4;00000^h13`f24ezl>_R3GVu-;eI1nStAcAz4Rr}C{^-@tJktgWqCFyP6P*Yer3e=dY3+M-q=xGB_{1-2NW&uF6*_1&L5<=STwgiAM3}M?g!Z1V-1aKTDs`D#BW0`1#6Ca=w$}$0JCljC~ zt6vkKa+W4_IvtCDakVXT0Lq5?!u;jJFa!WNjsqbCI9&)48*Jihx7(5rzS=2M=c!HQ zcU!HNTwPtY0HD=sNqQJ16KZ0?=^Q3L6(nDGkLekCWdr)JtfLWJli*eML!)kO&v2_KNAE?H#Y2Od1MqU50WgK6A~L8vh$$9<%fpfy0(n{I_36qxr9&PWDy=FQ z6CuhC20=exk>(Cn!R8$;qtnL?2@NQ^q*OMlet)*jRjz9FI|?xR09sw8nb^+Gj#0?u z@GLTgH3G$Hx=dW0la_JZVDORF%`It=H>m+c|Xf!%BlsaDocf1c!|W zOH*>smlzcm_I!!1A7Vt<7!?-Y?grp(dwz(~_ic@z|F!^w6Fg2nU_{se!srU@cW^}5 z7=IDc*hX-h&8FlpFi0r$JTDdrC<*|{{9@C=s;^#Eo;?kZYnq@GMcUF9$NKtpoIBUR_V#N` zO)W%P(C_m<|KUZXDG!#W78jRGdj|iy{EMfdkO`FWlJv!AW~LDY0q)%Sb|85iL}9t6H%cHWDX9_zKY=P=Al! z(D9g}M_7tr-`?XsAj`^K-BuE9RZ$$*t=#Z%y5 z8q5dm)vH$kfU&W$nC&+j4H*PM?7&nJ@YI*U>*NDex`{9M=4jU9san_V1OZ8nD2jt5 z$433eOY82Hv$D%n{kOmV!|d5n0DnMNF##Q)%hT24uqN1zVta_SOJ^jn1HieDy_g0N zU9A(J#RmXL+Hlk8IRnn8YG7t6O!d6Z>$t7%Vu-w z=~#nK(Om#Bug>c#U56~*vO8TiD)9ldT3j~T?Y2}yUs1Te??is4Rqt z$*k3ClFPVu^|Iu0g%G%Q^|Ji_$DfQHqRCm-NfjM36Cqs(^M37qmnH!hC@;+9LE2wh29?>*ndJWg+q;&3Yf5MP00000NkvXXu0mjf D!sa|e diff --git a/com/hbm/blocks/bomb/TurretSpitfire.java b/com/hbm/blocks/bomb/TurretSpitfire.java index bc9f52cba..2ecc234e4 100644 --- a/com/hbm/blocks/bomb/TurretSpitfire.java +++ b/com/hbm/blocks/bomb/TurretSpitfire.java @@ -2,6 +2,7 @@ package com.hbm.blocks.bomb; import com.hbm.entity.particle.EntityDSmokeFX; import com.hbm.entity.particle.EntityGasFlameFX; +import com.hbm.entity.projectile.EntityAAShell; import com.hbm.entity.projectile.EntityBullet; import com.hbm.tileentity.bomb.TileEntityTurretSpitfire; import com.hbm.tileentity.bomb.TileEntityTurretTau; @@ -32,7 +33,7 @@ public class TurretSpitfire extends TurretBase { if(pitch > 30) pitch = 30; - if(i != 0 && i % 10 == 0) { + if(i != 0 && i % 35 == 0) { Vec3 vector = Vec3.createVectorHelper( -Math.sin(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI), -Math.sin(pitch / 180.0F * (float) Math.PI), @@ -41,16 +42,16 @@ public class TurretSpitfire extends TurretBase { vector.normalize(); if(!world.isRemote) { - EntityBullet bullet = new EntityBullet(world); + EntityAAShell bullet = new EntityAAShell(world); bullet.posX = x + vector.xCoord * 2.75 + 0.5; bullet.posY = y + vector.yCoord * 2.75 + 1.5; bullet.posZ = z + vector.zCoord * 2.75 + 0.5; - bullet.motionX = vector.xCoord * 3; - bullet.motionY = vector.yCoord * 3; - bullet.motionZ = vector.zCoord * 3; - - bullet.setDamage(65 + rand.nextInt(55)); + bullet.motionX = vector.xCoord; + bullet.motionY = vector.yCoord; + bullet.motionZ = vector.zCoord; + + bullet.speedOverride = 3; world.spawnEntityInWorld(bullet); diff --git a/com/hbm/entity/projectile/EntityAAShell.java b/com/hbm/entity/projectile/EntityAAShell.java new file mode 100644 index 000000000..adb18784e --- /dev/null +++ b/com/hbm/entity/projectile/EntityAAShell.java @@ -0,0 +1,115 @@ +package com.hbm.entity.projectile; + +import java.util.List; + +import com.hbm.explosion.ExplosionLarge; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class EntityAAShell extends Entity { + + public int speedOverride = 1; + public int fuse = 5; + public int dFuse = 30; + + public EntityAAShell(World p_i1582_1_) { + super(p_i1582_1_); + rotation(); + } + + @Override + protected void entityInit() { + } + + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { + } + + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { + } + + @Override + public void onUpdate() { + if(fuse > 0) + fuse --; + + if(dFuse > 0) { + dFuse --; + } else { + explode(); + return; + } + + this.lastTickPosX = this.prevPosX = this.posX; + this.lastTickPosY = this.prevPosY = this.posY; + this.lastTickPosZ = this.prevPosZ = this.posZ; + + + for(int i = 0; i < 5; i++) { + + this.posX += this.motionX; + this.posY += this.motionY; + this.posZ += this.motionZ; + + rotation(); + + if(fuse == 0) { + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox(this.posX - 5, this.posY - 5, this.posZ - 5, this.posX + 5, this.posY + 5, this.posZ + 5)); + for(Entity e : list) { + float size = e.width * e.width * e.height; + if(size >= 0.5) { + explode(); + return; + } + + } + } + + if(worldObj.getBlock((int)posX, (int)posY, (int)posZ).getMaterial() != Material.air) { + explode(); + return; + } + } + } + + protected void rotation() { + float f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + + for (this.rotationPitch = (float)(Math.atan2(this.motionY, f2) * 180.0D / Math.PI) - 90; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + { + ; + } + + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) + { + this.prevRotationPitch += 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw < -180.0F) + { + this.prevRotationYaw -= 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) + { + this.prevRotationYaw += 360.0F; + } + } + + private void explode() { + worldObj.createExplosion(null, posX, posY, posZ, 20, true); + ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 35); + if(rand.nextInt(15) == 0) + ExplosionLarge.spawnShrapnels(worldObj, posX, posY, posZ, 5 + rand.nextInt(11)); + else if(rand.nextInt(15) == 0) + ExplosionLarge.spawnShrapnelShower(worldObj, posX, posY, posZ, motionX * 2, motionY * 2, motionZ * 2, 5 + rand.nextInt(11), 0.15); + this.setDead(); + } +} diff --git a/com/hbm/explosion/ExplosionLarge.java b/com/hbm/explosion/ExplosionLarge.java index 79db3ab57..027901b72 100644 --- a/com/hbm/explosion/ExplosionLarge.java +++ b/com/hbm/explosion/ExplosionLarge.java @@ -34,6 +34,17 @@ public class ExplosionLarge { } } + public static void spawnParticlesRadial(World world, double x, double y, double z, int count) { + + for(int i = 0; i < count; i++) { + EntityDSmokeFX fx = new EntityDSmokeFX(world, x, y, z, 0.0, 0.0, 0.0); + fx.motionY = rand.nextGaussian() * (1 + (count / 50)); + fx.motionX = rand.nextGaussian() * (1 + (count / 50)); + fx.motionZ = rand.nextGaussian() * (1 + (count / 50)); + world.spawnEntityInWorld(fx); + } + } + public static void spawnShock(World world, double x, double y, double z, int count, double strength) { Vec3 vec = Vec3.createVectorHelper(strength, 0, 0); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index c71bdc6f7..e196c3146 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -693,6 +693,7 @@ public class ModItems { public static Item gun_bolt_action_green; public static Item gun_bolt_action_ammo; public static Item gun_b92; + public static Item gun_b92_ammo; public static Item gun_xvl1456; public static Item gun_xvl1456_ammo; public static Item gun_osipr; @@ -1774,8 +1775,9 @@ public class ModItems { gun_lever_action_dark = new GunLeverAction().setUnlocalizedName("gun_lever_action_dark").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_lever_action_dark"); gun_bolt_action_ammo = new Item().setUnlocalizedName("gun_bolt_action_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_bolt_action_ammo"); gun_bolt_action = new GunBoltAction().setUnlocalizedName("gun_bolt_action").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_bolt_action"); - gun_b92 = new GunB92().setUnlocalizedName("gun_b92").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_b92"); gun_bolt_action_green = new GunBoltAction().setUnlocalizedName("gun_bolt_action_green").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_bolt_action_green"); + gun_b92_ammo = new GunB92Cell().setUnlocalizedName("gun_b92_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_b92_ammo"); + gun_b92 = new GunB92().setUnlocalizedName("gun_b92").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_b92"); gun_xvl1456_ammo = new Item().setUnlocalizedName("gun_xvl1456_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_xvl1456_ammo"); gun_xvl1456 = new GunXVL1456().setUnlocalizedName("gun_xvl1456").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_xvl1456"); gun_osipr_ammo = new Item().setUnlocalizedName("gun_osipr_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_osipr_ammo"); @@ -3035,6 +3037,7 @@ public class ModItems { GameRegistry.registerItem(gun_revolver_nightmare_ammo, gun_revolver_nightmare_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_nightmare2_ammo, gun_revolver_nightmare2_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_pip_ammo, gun_revolver_pip_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_b92_ammo, gun_b92_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_mirv_ammo, gun_mirv_ammo.getUnlocalizedName()); diff --git a/com/hbm/items/weapon/GunB92Cell.java b/com/hbm/items/weapon/GunB92Cell.java new file mode 100644 index 000000000..be409a50e --- /dev/null +++ b/com/hbm/items/weapon/GunB92Cell.java @@ -0,0 +1,67 @@ +package com.hbm.items.weapon; + +import java.util.List; + +import com.hbm.items.ModItems; +import com.hbm.main.MainRegistry; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +public class GunB92Cell extends Item { + + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { + if(entity instanceof EntityPlayer && getPower(stack) < 25) { + EntityPlayer player = (EntityPlayer) entity; + + for(int j = 0; j < player.inventory.mainInventory.length; j++) { + if(player.inventory.mainInventory[j] != null && player.inventory.mainInventory[j].getItem() == ModItems.gun_b92) { + int p = getPower(player.inventory.mainInventory[j]); + if(p > 0) { + setPower(player.inventory.mainInventory[j], p - 1); + setPower(stack, getPower(stack) + 1); + return; + } + } + } + } + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { + + list.add("Draws energy from the B92, allowing you to"); + list.add("reload it an additional 25 times."); + list.add("The cell will permanently hold it's charge,"); + list.add("it is not meant to be used as a battery enhancement"); + list.add("for the B92, but rather as a bomb."); + list.add(""); + list.add("Charges: " + getPower(itemstack) + " / 25"); + } + + private static int getPower(ItemStack stack) { + if (stack.stackTagCompound == null) { + stack.stackTagCompound = new NBTTagCompound(); + return 0; + } + + return stack.stackTagCompound.getInteger("energy"); + + } + + private static void setPower(ItemStack stack, int i) { + if (stack.stackTagCompound == null) { + stack.stackTagCompound = new NBTTagCompound(); + } + + stack.stackTagCompound.setInteger("energy", i); + + } + +} diff --git a/com/hbm/items/weapon/GunBoltAction.java b/com/hbm/items/weapon/GunBoltAction.java index 96a7fe445..2a32964c4 100644 --- a/com/hbm/items/weapon/GunBoltAction.java +++ b/com/hbm/items/weapon/GunBoltAction.java @@ -75,7 +75,7 @@ public class GunBoltAction extends Item { p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 5.0F, 0.75F); if (flag) { } else { - p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_lever_action_ammo); + p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_bolt_action_ammo); } if (!p_77615_2_.isRemote) { diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index 1690166e8..9628cf3bf 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -259,6 +259,8 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityBoxcar.class, new RenderBoxcar()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileTaint.class, new RenderMissileTaint()); + RenderingRegistry.registerEntityRenderingHandler(EntityAAShell.class, new RenderMirv()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileEndo.class, new RenderMissileThermo()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileExo.class, new RenderMissileThermo()); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 40a8a4d6f..5317e8c04 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -120,6 +120,7 @@ import com.hbm.entity.particle.EntityOilSpillFX; import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.entity.particle.EntityTSmokeFX; +import com.hbm.entity.projectile.EntityAAShell; import com.hbm.entity.projectile.EntityBaleflare; import com.hbm.entity.projectile.EntityBoxcar; import com.hbm.entity.projectile.EntityBullet; @@ -663,6 +664,7 @@ public class MainRegistry EntityRegistry.registerModEntity(EntityNukeExplosionMK4.class, "entity_nuke_mk4", 89, this, 1000, 1, true); EntityRegistry.registerModEntity(EntityCloudFleijaRainbow.class, "entity_cloud_rainbow", 90, this, 1000, 1, true); EntityRegistry.registerModEntity(EntityExplosiveBeam.class, "entity_beam_bomb", 91, this, 1000, 1, true); + EntityRegistry.registerModEntity(EntityAAShell.class, "entity_aa_shell", 92, this, 1000, 1, true); EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00); EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0x000020, 0x2D2D72); @@ -1146,6 +1148,7 @@ public class MainRegistry FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_lightoil), new ItemStack(ModItems.canister_empty), FluidType.LIGHTOIL, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_kerosene), new ItemStack(ModItems.canister_empty), FluidType.KEROSENE, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_biofuel), new ItemStack(ModItems.canister_empty), FluidType.BIOFUEL, 1000)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_NITAN), new ItemStack(ModItems.canister_empty), FluidType.NITAN, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), FluidType.GAS, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), FluidType.PETROLEUM, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), FluidType.BIOGAS, 1000));