Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

What the... Not sure what was going on here with the reverse passing...

Browse Source
This commit is contained in:
Nou 2015-05-15 23:16:50 -07:00
parent 18b77cd003
commit df30588d74
6 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
extensions/common/simulation/object.cpp
View File

@ -4,15 +4,16 @@
#include "glm\gtc\matrix_transform.hpp" #include "glm\gtc\matrix_transform.hpp"
ace::simulation::vertex::vertex(vertex_table & _table, ace::vector3<float> _vertex, uint32_t _id) : table(_table), vertex_id(_id) ace::simulation::vertex::vertex(vertex_table & _table, ace::vector3<float> _vertex, uint32_t _id, bool reversed) : table(_table), vertex_id(_id)
{ {
this->original_vertex = _vertex; this->original_vertex = _vertex;
this->animated_vertex = _vertex; this->animated_vertex = _vertex;
//this->original_vertex.z(this->original_vertex.z()*-1); if(reversed) {
//this->animated_vertex.z(this->animated_vertex.z()*-1); this->original_vertex.z(this->original_vertex.z()*-1);
//this->original_vertex.x(this->original_vertex.x()*-1); this->animated_vertex.z(this->animated_vertex.z()*-1);
//this->animated_vertex.x(this->animated_vertex.x()*-1); this->original_vertex.x(this->original_vertex.x()*-1);
this->animated_vertex.x(this->animated_vertex.x()*-1);
}
} }
ace::simulation::vertex::~vertex() ace::simulation::vertex::~vertex()
@ -75,7 +76,7 @@ void ace::simulation::named_selection::animate(const glm::mat4 &matrix)
ace::simulation::vertex_table::vertex_table(const ace::p3d::vertex_table_p p3d_vertex_table, const ace::p3d::lod_p p3d_lod, const ace::p3d::model_p p3d) : animated(false) ace::simulation::vertex_table::vertex_table(const ace::p3d::vertex_table_p p3d_vertex_table, const ace::p3d::lod_p p3d_lod, const ace::p3d::model_p p3d, bool reversed) : animated(false)
{ {
this->vertices.resize(p3d_vertex_table->points.size); this->vertices.resize(p3d_vertex_table->points.size);
ace::vector3<float> center_off2 = p3d_lod->min_pos+p3d_lod->max_pos-p3d_lod->autocenter_pos; ace::vector3<float> center_off2 = p3d_lod->min_pos+p3d_lod->max_pos-p3d_lod->autocenter_pos;
@ -83,10 +84,10 @@ ace::simulation::vertex_table::vertex_table(const ace::p3d::vertex_table_p p3d_v
for (uint32_t i = 0; i <= p3d_vertex_table->points.size - 1; ++i) { for (uint32_t i = 0; i <= p3d_vertex_table->points.size - 1; ++i) {
if (p3d->info->autocenter) { if (p3d->info->autocenter) {
ace::vector3<float> new_vertex = p3d_vertex_table->points[i] + center_off; ace::vector3<float> new_vertex = p3d_vertex_table->points[i] + center_off;
this->vertices[i] = std::make_shared<vertex>(*this, new_vertex, i); this->vertices[i] = std::make_shared<vertex>(*this, new_vertex, i, reversed);
} }
else { else {
this->vertices[i] = std::make_shared<vertex>(*this, p3d_vertex_table->points[i], i); this->vertices[i] = std::make_shared<vertex>(*this, p3d_vertex_table->points[i], i, reversed);
} }
} }
} }
@ -95,10 +96,10 @@ ace::simulation::vertex_table::~vertex_table()
{ {
} }
ace::simulation::lod::lod(const ace::p3d::lod_p p3d_lod, const ace::p3d::model_p p3d) ace::simulation::lod::lod(const ace::p3d::lod_p p3d_lod, const ace::p3d::model_p p3d, bool reversed)
{ {
this->id = p3d_lod->id; this->id = p3d_lod->id;
this->vertices = vertex_table(p3d_lod->vertices, p3d_lod, p3d); this->vertices = vertex_table(p3d_lod->vertices, p3d_lod, p3d, reversed);
this->autocenter_pos = p3d->info->cog_offset;//p3d->info->center_of_gravity + p3d->info->offset_2 + p3d->info->cog_offset; this->autocenter_pos = p3d->info->cog_offset;//p3d->info->center_of_gravity + p3d->info->offset_2 + p3d->info->cog_offset;
for (ace::p3d::face_p p3d_face : p3d_lod->faces) { for (ace::p3d::face_p p3d_face : p3d_lod->faces) {
@ -390,7 +391,7 @@ ace::simulation::object::object()
ace::simulation::object::object(const ace::p3d::model_p model, bool reverse_ = false) : reversed(reverse_) ace::simulation::object::object(const ace::p3d::model_p model, bool reverse_ = false) : reversed(reverse_)
{ {
for (ace::p3d::lod_p p3d_lod : model->lods) { for (ace::p3d::lod_p p3d_lod : model->lods) {
lod_p new_lod = std::make_shared<lod>(p3d_lod, model); lod_p new_lod = std::make_shared<lod>(p3d_lod, model, reversed);
this->lods.push_back(new_lod); this->lods.push_back(new_lod);
this->lods[p3d_lod->id]->type = model->info->resolutions[p3d_lod->id]; this->lods[p3d_lod->id]->type = model->info->resolutions[p3d_lod->id];
} }

8
extensions/common/simulation/object.hpp
View File

@ -31,7 +31,7 @@ namespace ace {
class vertex_table { class vertex_table {
public: public:
vertex_table() {}; vertex_table() {};
vertex_table(const ace::p3d::vertex_table_p, const ace::p3d::lod_p, const ace::p3d::model_p); vertex_table(const ace::p3d::vertex_table_p, const ace::p3d::lod_p, const ace::p3d::model_p, bool);
~vertex_table(); ~vertex_table();
vertex_p operator[] (const int index) { return vertices[index]; } vertex_p operator[] (const int index) { return vertices[index]; }
std::vector<vertex_p> vertices; std::vector<vertex_p> vertices;
@ -65,7 +65,7 @@ namespace ace {
class vertex { class vertex {
public: public:
vertex(vertex_table &, ace::vector3<float>, uint32_t); vertex(vertex_table &, ace::vector3<float>, uint32_t, bool);
~vertex(); ~vertex();
ace::vector3<float> operator * (const float &v) { return animated_vertex * v; } ace::vector3<float> operator * (const float &v) { return animated_vertex * v; }
@ -108,7 +108,7 @@ namespace ace {
class lod { class lod {
public: public:
lod() {}; lod() {};
lod(const ace::p3d::lod_p, const ace::p3d::model_p); lod(const ace::p3d::lod_p, const ace::p3d::model_p, bool);
~lod(); ~lod();
uint32_t id; uint32_t id;
uint32_t type; uint32_t type;
@ -202,7 +202,7 @@ namespace ace {
class object { class object {
public: public:
object(); object();
object(const ace::p3d::model_p, bool reversed); object(const ace::p3d::model_p, bool);
~object(); ~object();
bool reversed; bool reversed;

2
extensions/tests/AT_01.txt
View File

@ -2,5 +2,5 @@
init: init:
debug_render: debug_render:
register_vehicle:\x\nou\addons\anim_test\anim_test.p3d,0,4050.18;3802.55;5.075 register_vehicle:\x\nou\addons\anim_test\anim_test.p3d,0,4050.18;3802.55;5.075
set_animation_state:0, turret, 0.0, rotation_drum, 0.0, barrel_recoil, -6, barrel_hide, 0 set_animation_state:0, turret, 1.0, rotation_drum, 0.5, barrel_recoil, -4, barrel_hide, 0
#set_animation_state:0, turret, 0.500 #set_animation_state:0, turret, 0.500

2
extensions/vd/base_vehicle.hpp
View File

@ -20,7 +20,7 @@ namespace ace {
class base_vehicle { class base_vehicle {
public: public:
base_vehicle(uint32_t, ace::simulation::object_p, ace::vector3<float>); base_vehicle(uint32_t, ace::simulation::object_p, bool, ace::vector3<float>);
~base_vehicle(); ~base_vehicle();
bool simulate(); bool simulate();

10
extensions/vd/controller.cpp
View File

@ -111,7 +111,7 @@ namespace ace {
if (ace::model_collection::get().load_model(model_str)) { if (ace::model_collection::get().load_model(model_str)) {
std::shared_ptr<ace::simulation::object> _object = std::make_shared<ace::simulation::object>(model_collection::get().models[model_str].model, (static_cast<int>(_args[2]) != 0 ? true : false)); std::shared_ptr<ace::simulation::object> _object = std::make_shared<ace::simulation::object>(model_collection::get().models[model_str].model, (static_cast<int>(_args[2]) != 0 ? true : false));
vehicle_p _vehicle = std::make_shared<vehicle>(static_cast<uint32_t>(_args[1]), _object, _args[2]); vehicle_p _vehicle = std::make_shared<vehicle>(static_cast<uint32_t>(_args[1]), _object, false, _args[2]);
vehicles[static_cast<uint32_t>(_args[1])] = _vehicle; vehicles[static_cast<uint32_t>(_args[1])] = _vehicle;
// For results on a valid vehicle registration, we return its animation names for that given vehicle // For results on a valid vehicle registration, we return its animation names for that given vehicle
@ -263,9 +263,9 @@ namespace ace {
#endif #endif
#ifdef _DEBUG #ifdef _DEBUG
bool controller::_test_raycast(const arguments &_args, std::string & result) { bool controller::_test_raycast(const arguments &_args, std::string & result) {
ace::simulation::object * _object = new ace::simulation::object(model_collection::get().models[0].model); ace::simulation::object * _object = new ace::simulation::object(model_collection::get().models[0].model, false);
std::shared_ptr<ace::simulation::object> _object_ptr(_object); std::shared_ptr<ace::simulation::object> _object_ptr(_object);
ace::vehicledamage::vehicle _vehicle(12345, _object_ptr, ace::vector3<float>(0,0,0)); ace::vehicledamage::vehicle _vehicle(12345, _object_ptr, false, ace::vector3<float>(0,0,0));
btVector3 from(1000.0f, 1000.0f, 1000.0f), to(-1000.0f, -1000.0f, -1000.0f); btVector3 from(1000.0f, 1000.0f, 1000.0f), to(-1000.0f, -1000.0f, -1000.0f);
@ -294,9 +294,9 @@ namespace ace {
return true; return true;
} }
bool controller::_test_selection(const arguments &_args, std::string & result) { bool controller::_test_selection(const arguments &_args, std::string & result) {
ace::simulation::object * _object = new ace::simulation::object(model_collection::get().models[0].model); ace::simulation::object * _object = new ace::simulation::object(model_collection::get().models[0].model, false);
std::shared_ptr<ace::simulation::object> _object_ptr(_object); std::shared_ptr<ace::simulation::object> _object_ptr(_object);
ace::vehicledamage::vehicle _vehicle(12345, _object_ptr, ace::vector3<float>(0, 0, 0)); ace::vehicledamage::vehicle _vehicle(12345, _object_ptr, false, ace::vector3<float>(0, 0, 0));
std::vector<ace::vector3<float>> _vertices = _vehicle.selection_by_name_vertices(-1, _args[0]); std::vector<ace::vector3<float>> _vertices = _vehicle.selection_by_name_vertices(-1, _args[0]);

2
extensions/vd/vehicle.hpp
View File

@ -9,7 +9,7 @@ namespace ace {
namespace vehicledamage { namespace vehicledamage {
class vehicle : public base_vehicle { class vehicle : public base_vehicle {
public: public:
vehicle(uint32_t id, ace::simulation::object_p object_, ace::vector3<float> position_) : base_vehicle(id, object_, position_) {} vehicle(uint32_t id, ace::simulation::object_p object_, bool reversed_, ace::vector3<float> position_) : base_vehicle(id, object_, reversed_, position_) {}
bool hit(gamehit *); bool hit(gamehit *);