diff --git a/extensions/tests/longrod_dxtk_test.txt b/extensions/tests/longrod_dxtk_test.txt index 000cedd807..af9e692880 100644 --- a/extensions/tests/longrod_dxtk_test.txt +++ b/extensions/tests/longrod_dxtk_test.txt @@ -1,8 +1,6 @@ init: debug_render: -#register_vehicle:\A3\soft_f\MRAP_01\MRAP_01_gmg_F.p3d,2,4050.18;3802.55;5.075 -register_vehicle:\A3\Armor_F_EPB\MBT_03\MBT_03_cannon_F.p3d,2,4050.18;3802.55;5.075 -#hit:2,\A3\Armor_F_EPB\MBT_03\MBT_03_cannon_F.p3d,[],2,Sh_120mm_APFSDS,650,27,19100,50,10,708.602;235.609;-85.6468,-2.1748;0.139648;-1.35955,0.942743;0.31346;-0.113925,-1;6.1914e-007;0.000794772,-2.17383;0.139404;-1.32366,708.602;235.609;-85.6468 -#register_vehicle:\a3\structures_f\mil\BagFence\BagFence_Long_F.p3d,0,4050.18;3802.55;5.075 -#hit:0,A3\Structures_F\Mil\BagFence\BagFence_Long_F.p3d,[],0,B_65x39_Caseless,1295,264,11300,0,0,-16.5091;729.003;-177.406,0.2854;-0.239258;0.0619297,-0.0219989;0.971421;-0.236342,0.00232643;-0.999479;0.0321913 +register_vehicle:\A3\Armor_F_EPB\MBT_03\MBT_03_cannon_F.p3d,0,4050.18;3802.55;5.075 +#set_animation_state:damageHide,0,Wheel_kolL1,4.45242e-005,Wheel_koloL1,4.45242e-005,Wheel_podkoloL1,0.516474,Wheel_kolP1,4.45066e-005,Wheel_koloP1,4.45066e-005,Wheel_podkoloP1,0.517239,Wheel_kolL2,4.45242e-005,Wheel_kolP2,4.45066e-005,Wheel_koloL2,4.45242e-005,Wheel_koloL3,4.45242e-005,Wheel_koloL4,4.45242e-005,Wheel_koloL5,4.45242e-005,Wheel_koloL6,4.45242e-005,Wheel_koloL7,4.45242e-005,Wheel_koloP2,4.45066e-005,Wheel_koloP3,4.45066e-005,Wheel_koloP4,4.45066e-005,Wheel_koloP5,4.45066e-005,Wheel_koloP6,4.45066e-005,Wheel_koloP7,4.45066e-005,Wheel_podkoloL2,0.502695,Wheel_podkoloL3,0.496173,Wheel_podkoloL4,0.504816,Wheel_podkoloL5,0.488489,Wheel_podkoloL6,0.477184,Wheel_podkoloP2,0.508792,Wheel_podkoloP3,0.50227,Wheel_podkoloP4,0.495971,Wheel_podkoloP5,0.491531,Wheel_podkoloP6,0.498859,podkoloL1_hide_damage,0,podkoloL2_hide_damage,0,podkoloL3_hide_damage,0,podkoloL4_hide_damage,0,podkoloL5_hide_damage,0,podkoloL6_hide_damage,0,podkoloL7_hide_damage,0,podkoloL8_hide_damage,0,podkoloP1_hide_damage,0,podkoloP2_hide_damage,0,podkoloP3_hide_damage,0,podkoloP4_hide_damage,0,podkoloP5_hide_damage,0,podkoloP6_hide_damage,0,podkoloP7_hide_damage,0,podkoloP8_hide_damage,0,damageVez,0,MainTurret,0,MainGun,0.174533,Recoil,0,ObsTurret,0,ObsGun,0,MainGunOptics,0.174533,Wheel_podkoloP7,0.488629,Wheel_podkoloL7,0.475399,HatchDriver,0,HatchCommander,0,HatchGunner,0,damageVezVelitele,0,poklop_commander_damage,0,poklop_gunner_damage,0,poklop_driver_damage,0,zaslehROT_HMG,0,zaslehROT_coax,1.669,cannon_muzzle_flash,0,zaslehROT_cannon,0,HideHull,0.374406,HideTurret,0.729166,LockMuzzle,0, +set_animation_state:damageHide,0,Wheel_kolL1,4.45242e-005,Wheel_koloL1,4.45242e-005,Wheel_podkoloL1,0.518667,Wheel_kolP1,4.45066e-005,Wheel_koloP1,4.45066e-005,Wheel_podkoloP1,0.51903,Wheel_kolL2,4.45242e-005,Wheel_kolP2,4.45066e-005,Wheel_koloL2,4.45242e-005,Wheel_koloL3,4.45242e-005,Wheel_koloL4,4.45242e-005,Wheel_koloL5,4.45242e-005,Wheel_koloL6,4.45242e-005,Wheel_koloL7,4.45242e-005,Wheel_koloP2,4.45066e-005,Wheel_koloP3,4.45066e-005,Wheel_koloP4,4.45066e-005,Wheel_koloP5,4.45066e-005,Wheel_koloP6,4.45066e-005,Wheel_koloP7,4.45066e-005,Wheel_podkoloL2,0.505578,Wheel_podkoloL3,0.499702,Wheel_podkoloL4,0.509021,Wheel_podkoloL5,0.493307,Wheel_podkoloL6,0.48267,Wheel_podkoloP2,0.511259,Wheel_podkoloP3,0.505382,Wheel_podkoloP4,0.499742,Wheel_podkoloP5,0.495988,Wheel_podkoloP6,0.50392,podkoloL1_hide_damage,0,podkoloL2_hide_damage,0,podkoloL3_hide_damage,0,podkoloL4_hide_damage,0,podkoloL5_hide_damage,0,podkoloL6_hide_damage,0,podkoloL7_hide_damage,0,podkoloL8_hide_damage,0,podkoloP1_hide_damage,0,podkoloP2_hide_damage,0,podkoloP3_hide_damage,0,podkoloP4_hide_damage,0,podkoloP5_hide_damage,0,podkoloP6_hide_damage,0,podkoloP7_hide_damage,0,podkoloP8_hide_damage,0,damageVez,0,MainTurret,-0.0683285,MainGun,0.170289,Recoil,0.299856,ObsTurret,0,ObsGun,0,MainGunOptics,0.170289,Wheel_podkoloP7,0.494357,Wheel_podkoloL7,0.481555,HatchDriver,0,HatchCommander,0,HatchGunner,0,damageVezVelitele,0,poklop_commander_damage,0,poklop_gunner_damage,0,poklop_driver_damage,0,zaslehROT_HMG,0,zaslehROT_coax,75.207,cannon_muzzle_flash,0.299856,zaslehROT_cannon,512,HideHull,0.534082,HideTurret,0.83349,LockMuzzle,0, fetch_result:1 \ No newline at end of file diff --git a/extensions/vd/debug/penetration_display.cpp b/extensions/vd/debug/penetration_display.cpp index 1a2b9dd5c5..10ca59419c 100644 --- a/extensions/vd/debug/penetration_display.cpp +++ b/extensions/vd/debug/penetration_display.cpp @@ -159,6 +159,30 @@ namespace ace { // Debug animation the shit _active_vehicle->simulate(); + for (auto & selection : obj.lods[lod]->selections) { + for (auto & face : selection.second->faces) { + ace::vector3 vertices[3]; + vertices[0] = { face->vertices[0]->x(), face->vertices[0]->y(), face->vertices[0]->z() }; + vertices[1] = { face->vertices[1]->x(), face->vertices[1]->y(), face->vertices[1]->z() }; + vertices[2] = { face->vertices[2]->x(), face->vertices[2]->y(), face->vertices[2]->z() }; + + XMVECTORF32 v[3] = { + { vertices[0].x(), vertices[0].y(), vertices[0].z() }, + { vertices[1].x(), vertices[1].y(), vertices[1].z() }, + { vertices[2].x(), vertices[2].y(), vertices[2].z() } + }; + + VertexPositionColor v1(v[0], color); + VertexPositionColor v2(v[1], color); + VertexPositionColor v3(v[2], color); + + batch.DrawLine(v1, v2); + batch.DrawLine(v2, v3); + batch.DrawLine(v3, v1); + } + } + + /* for (auto & face : obj.lods[lod]->faces) { ace::vector3 vertices[3]; vertices[0] = { face->vertices[0]->x(), face->vertices[0]->y(), face->vertices[0]->z() }; @@ -180,7 +204,7 @@ namespace ace { batch.DrawLine(v2, v3); batch.DrawLine(v3, v1); //batch.DrawTriangle(v1, v2, v3); - } + }*/ batch.End(); }