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

Merge branch 'vehicledamage' of github.com:acemod/ACE3 into vehicledamage

Browse Source 
Conflicts:
	extensions/common/simulation/object.cpp
This commit is contained in:
jaynus 2015-05-15 20:36:04 -07:00
commit c91dcc8cc6
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,7 @@ ace::simulation::lod_animation_info::lod_animation_info(
if (p3d->info->autocenter) {
ace::vector3<float> center_off = p3d->info->cog_offset;//p3d->info->center_of_gravity + p3d->info->offset_2 + p3d->info->cog_offset;
this->axis_position = p3d_animate_bone->axis_position + center_off;
this->axis_direction = p3d_animate_bone->axis_direction.normalize();
this->axis_direction = p3d_animate_bone->axis_direction;
}
else {
this->axis_position = p3d_animate_bone->axis_position;
@ -224,7 +224,7 @@ animation_transform ace::simulation::animation::animate(const float phase, const
case 0: {
scale = (scale / (max_value - min_value)) * (angle1 - angle0);
animation_matrix = glm::translate(glm::mat4(1.0f), axis_position);
animation_matrix *= glm::rotate(glm::mat4(1.0f), -scale, axis_direction);
animation_matrix *= glm::rotate(glm::mat4(1.0f), scale, axis_direction);
animation_matrix *= glm::translate(glm::mat4(1.0f), -axis_position);
break;
}
@ -236,15 +236,16 @@ animation_transform ace::simulation::animation::animate(const float phase, const
animation_matrix = glm::translate(glm::mat4(1.0f), axis_position);
animation_matrix *= glm::rotate(glm::mat4(1.0f), -scale, rotation_axis);
animation_matrix *= glm::translate(glm::mat4(1.0f),-axis_position);
animation_matrix *= glm::translate(glm::mat4(1.0f), -axis_position);
break;
}
//rotationY
case 2: {
scale = (scale / (max_value - min_value)) * (angle1 - angle0);
glm::vec3 rotation_axis = glm::vec3(0.0f, 1.0f, 0.0f);
animation_matrix = glm::translate(glm::mat4(1.0f), axis_position);
animation_matrix *= glm::rotate(glm::mat4(1.0f), scale, rotation_axis); // should this be positive?
animation_matrix *= glm::rotate(glm::mat4(1.0f), -scale, rotation_axis);
animation_matrix *= glm::translate(glm::mat4(1.0f), -axis_position);
break;
}
@ -268,7 +269,6 @@ animation_transform ace::simulation::animation::animate(const float phase, const
}
//translationX
case 5: {
scale = (scale / (max_value - min_value)) * (offset1 - offset0);
animation_matrix = glm::translate(animation_matrix, glm::vec3(
scale,
0.0f,
@ -278,7 +278,6 @@ animation_transform ace::simulation::animation::animate(const float phase, const
}
//translationY
case 6: {
scale = (scale / (max_value - min_value)) * (offset1 - offset0);
animation_matrix = glm::translate(animation_matrix, glm::vec3(
0.0f,
scale,
@ -288,7 +287,6 @@ animation_transform ace::simulation::animation::animate(const float phase, const
}
//translationZ
case 7: {
scale = (scale / (max_value - min_value)) * (offset1 - offset0);
animation_matrix = glm::translate(animation_matrix, glm::vec3(
0.0f,
0.0f,
@ -320,17 +318,19 @@ float ace::simulation::animation::get_scale(float phase)
switch (source_address)
{
case 1: // LOOP
scale = fmod(phase - min_value, (max_value - min_value)) + min_value;
// when over limit, mirror
if (phase > max_value) phase = max_value - (phase - max_value);
case 1:
scale = fmod(phase - min_value, max_value - min_value) + min_value;
scale = std::min(std::max(scale, min_phase), max_phase);
break;
case 2: // MIRROR
scale = fmod(phase - min_value, (max_value - min_value) * 2) + min_value;
if (scale > max_value) scale = max_value - (scale - max_value);
case 2:
//@TODO: possibly a better way to do this?!
if (min_phase < 0.0f && phase < 0) {
scale = std::fmod((std::fabs(phase) - std::fabs(min_value)), ((max_value - min_value) * 2)) + min_value;
}
else {
scale = std::fmod((phase - min_value), ((max_value - min_value) * 2)) + min_value;
};
if (scale>max_value) scale = max_value - (scale - max_value);
scale = std::min(std::max(scale, min_phase), max_phase);
break;
default:

4
extensions/tests/AT_01.txt
View File

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