summaryrefslogtreecommitdiff
path: root/servers/physics
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-04-24 11:16:20 +0200
committerGitHub <noreply@github.com>2017-04-24 11:16:20 +0200
commit5ae1e172da08a63b14635f5d06e32385901525e2 (patch)
tree9a9bd7f4dd90eada323f504b551e7630802fa494 /servers/physics
parent90ef1fd03d43d51f09b730dee107c0e407cf0703 (diff)
parent9a37ff1e34fe445a9168a7d91ae1df7d9928eb25 (diff)
Merge pull request #8277 from tagcup/math_checks
Added various functions basic math classes. Also enabled math checks …
Diffstat (limited to 'servers/physics')
-rw-r--r--servers/physics/body_sw.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics/body_sw.cpp b/servers/physics/body_sw.cpp
index 9def425f28..715f93c1c1 100644
--- a/servers/physics/body_sw.cpp
+++ b/servers/physics/body_sw.cpp
@@ -495,7 +495,7 @@ void BodySW::integrate_forces(real_t p_step) {
Vector3 axis;
real_t angle;
- rot.get_axis_and_angle(axis, angle);
+ rot.get_axis_angle(axis, angle);
axis.normalize();
angular_velocity = axis.normalized() * (angle / p_step);
@@ -638,7 +638,7 @@ void BodySW::simulate_motion(const Transform& p_xform,real_t p_step) {
Vector3 axis;
real_t angle;
- rot.get_axis_and_angle(axis,angle);
+ rot.get_axis_angle(axis,angle);
axis.normalize();
angular_velocity=axis.normalized() * (angle/p_step);
linear_velocity = (p_xform.origin - get_transform().origin)/p_step;