From fc1d8841053c36c9310dd5ddfe9a5a0bfbf6f6f2 Mon Sep 17 00:00:00 2001 From: jaynus Date: Sun, 10 May 2015 19:44:31 -0700 Subject: [PATCH] Reworked with test p3d. --- extensions/common/p3d/animation.cpp | 14 +++++--------- extensions/tests/longrod_dxtk_test.txt | 1 + extensions/tests/p3d_parser.cpp | 1 + extensions/tests/test.p3d | Bin 0 -> 7190 bytes 4 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 extensions/tests/test.p3d diff --git a/extensions/common/p3d/animation.cpp b/extensions/common/p3d/animation.cpp index 9d135053e1..1c97399a1e 100644 --- a/extensions/common/p3d/animation.cpp +++ b/extensions/common/p3d/animation.cpp @@ -20,17 +20,11 @@ namespace ace { stream_.read((char *)&min_phase, sizeof(float)); stream_.read((char *)&max_phase, sizeof(float)); - //stream_.read((char *)&junk, sizeof(uint32_t)); - //stream_.read((char *)&junk2, sizeof(uint32_t)); + stream_.read((char *)&junk, sizeof(uint32_t)); + stream_.read((char *)&junk2, sizeof(uint32_t)); stream_.read((char *)&source_address, sizeof(uint32_t)); - float buffer[4]; - stream_.read((char *)buffer, sizeof(float) * 4); - return; - - // THIS IS ALL WRONG - // ARMA3 HAS FIXED 4-FLOAT TRANSFORMS - + // This always adds up to 2*4 more bytes unless its direct apparently switch (type) { // rotations case 0: @@ -61,9 +55,11 @@ namespace ace { case 9: // fucking hides... stream_.read((char *)&hide_value, sizeof(float)); stream_.read((char *)&offset1, sizeof(float)); // this is junk throw it in offset1 for hides + break; default: stream_.read((char *)&offset0, sizeof(float)); stream_.read((char *)&offset1, sizeof(float)); + break; } diff --git a/extensions/tests/longrod_dxtk_test.txt b/extensions/tests/longrod_dxtk_test.txt index 92f95a7d4a..19a38f5b65 100644 --- a/extensions/tests/longrod_dxtk_test.txt +++ b/extensions/tests/longrod_dxtk_test.txt @@ -1,5 +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 diff --git a/extensions/tests/p3d_parser.cpp b/extensions/tests/p3d_parser.cpp index d0da6acfa0..4b761e61c6 100644 --- a/extensions/tests/p3d_parser.cpp +++ b/extensions/tests/p3d_parser.cpp @@ -21,6 +21,7 @@ int main(int argc, char **argv) { printf("Usage: %s [file.p3d]", argv[0]); return -1; } + ace::p3d::model_p _model = _parser.load(argv[1]); ace::simulation::object _object(_model); diff --git a/extensions/tests/test.p3d b/extensions/tests/test.p3d new file mode 100644 index 0000000000000000000000000000000000000000..c0dea83658a3303724276f67c4ad27b9bed41625 GIT binary patch literal 7190 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 T15;l$m>ONMn5yr@#W3}MG{f5x literal 0 HcmV?d00001