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

Removed: Scale flipping, these should work now but they dont.

Browse Source
This commit is contained in:
jaynus 2015-05-11 15:23:19 -07:00
parent 133bd0e817
commit 0a81f03447
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ animation_transform ace::simulation::animation::animate(const float phase, const
case 1: { case 1: {
scale = (scale / (max_value - min_value)) * (angle1 - angle0); scale = (scale / (max_value - min_value)) * (angle1 - angle0);
glm::vec3 rotation_axis = glm::vec3(1.0f, 0.0f, 0.0f); glm::vec3 rotation_axis = glm::vec3(1.0f, 0.0f, 0.0f);
animation_matrix = glm::rotate(animation_matrix, -scale, rotation_axis); animation_matrix = glm::rotate(animation_matrix, scale, rotation_axis);
rotation_offset = this->lod_info[lod_id]->axis_position; rotation_offset = this->lod_info[lod_id]->axis_position;
break; break;
} }
@ -246,7 +246,7 @@ animation_transform ace::simulation::animation::animate(const float phase, const
case 2: { case 2: {
scale = (scale / (max_value - min_value)) * (angle1 - angle0); scale = (scale / (max_value - min_value)) * (angle1 - angle0);
glm::vec3 rotation_axis = glm::vec3(0.0f, 1.0f, 0.0f); glm::vec3 rotation_axis = glm::vec3(0.0f, 1.0f, 0.0f);
animation_matrix = glm::rotate(animation_matrix, -scale, rotation_axis); animation_matrix = glm::rotate(animation_matrix, scale, rotation_axis);
rotation_offset = this->lod_info[lod_id]->axis_position; rotation_offset = this->lod_info[lod_id]->axis_position;
break; break;
} }
@ -254,7 +254,7 @@ animation_transform ace::simulation::animation::animate(const float phase, const
case 3: { case 3: {
scale = (scale / (max_value - min_value)) * (angle1 - angle0); scale = (scale / (max_value - min_value)) * (angle1 - angle0);
glm::vec3 rotation_axis = glm::vec3(0.0f, 0.0f, 1.0f); glm::vec3 rotation_axis = glm::vec3(0.0f, 0.0f, 1.0f);
animation_matrix = glm::rotate(animation_matrix, -scale, rotation_axis); animation_matrix = glm::rotate(animation_matrix, scale, rotation_axis);
rotation_offset = this->lod_info[lod_id]->axis_position; rotation_offset = this->lod_info[lod_id]->axis_position;
break; break;
} }