aboutsummaryrefslogtreecommitdiffhomepage
path: root/demos
diff options
context:
space:
mode:
authorGravatar Abhijit Kundu <abhijit.kundu@gatech.edu>2014-03-26 22:02:48 -0400
committerGravatar Abhijit Kundu <abhijit.kundu@gatech.edu>2014-03-26 22:02:48 -0400
commitba3457cab2349dd03585435571ff1a8f90cf7403 (patch)
treef2912fc4301f146444e9906b524075d09ae127f6 /demos
parentf0a4c9d5abe94703d8b4e5ec49cba20df014d0ca (diff)
Fixed compilation error due to obsolete internal::abs and internal::sqrt function calls
Diffstat (limited to 'demos')
-rw-r--r--demos/opengl/quaternion_demo.cpp2
-rw-r--r--demos/opengl/trackball.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/opengl/quaternion_demo.cpp b/demos/opengl/quaternion_demo.cpp
index 04165619b..dd323a4c9 100644
--- a/demos/opengl/quaternion_demo.cpp
+++ b/demos/opengl/quaternion_demo.cpp
@@ -234,7 +234,7 @@ void RenderingWidget::drawScene()
gpu.drawVector(Vector3f::Zero(), length*Vector3f::UnitZ(), Color(0,0,1,1));
// draw the fractal object
- float sqrt3 = internal::sqrt(3.);
+ float sqrt3 = std::sqrt(3.);
glLightfv(GL_LIGHT0, GL_AMBIENT, Vector4f(0.5,0.5,0.5,1).data());
glLightfv(GL_LIGHT0, GL_DIFFUSE, Vector4f(0.5,1,0.5,1).data());
glLightfv(GL_LIGHT0, GL_SPECULAR, Vector4f(1,1,1,1).data());
diff --git a/demos/opengl/trackball.cpp b/demos/opengl/trackball.cpp
index 77ac790c8..7c2da8e96 100644
--- a/demos/opengl/trackball.cpp
+++ b/demos/opengl/trackball.cpp
@@ -23,7 +23,7 @@ void Trackball::track(const Vector2i& point2D)
{
Vector3f axis = mLastPoint3D.cross(newPoint3D).normalized();
float cos_angle = mLastPoint3D.dot(newPoint3D);
- if ( internal::abs(cos_angle) < 1.0 )
+ if ( std::abs(cos_angle) < 1.0 )
{
float angle = 2. * acos(cos_angle);
if (mMode==Around)