diff options
| author |  Hauke Heibel <hauke.heibel@gmail.com> | 2010-08-17 20:03:50 +0200 |
|---|---|---|
| committer | Hauke Heibel <hauke.heibel@gmail.com> | 2010-08-17 20:03:50 +0200 |
| commit | 85fdcdf0554918a485112ed078417379f691d01b (patch) | |
| tree | d567a6be5691c67cc6341cc560366abc292f6232 /demos/opengl/quaternion_demo.cpp | |
| parent | 87aafc9169cd549213c8a950bbeabada109b00ef (diff) | |
Fixed Geometry module failures.
Removed default parameter from Transform.
Removed the TransformXX typedefs.
Removed references to TransformXX from unit tests and docs.
Assigning Transforms to a sub-group is now forbidden at compile time.
Products should now properly support the Isometry flag.
Fixed alignment checks in MapBase.
Diffstat (limited to 'demos/opengl/quaternion_demo.cpp')
| -rw-r--r-- | demos/opengl/quaternion_demo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/opengl/quaternion_demo.cpp b/demos/opengl/quaternion_demo.cpp index c03a89cd5..9d496f922 100644 --- a/demos/opengl/quaternion_demo.cpp +++ b/demos/opengl/quaternion_demo.cpp @@ -92,7 +92,7 @@ class FancySpheres Vector3f ax1 = ax0.unitOrthogonal(); Quaternionf q; q.setFromTwoVectors(Vector3f::UnitZ(), ax0); - Transform3f t = Translation3f(c) * q * Scaling(mRadii[i]+radius); + Affine3f t = Translation3f(c) * q * Scaling(mRadii[i]+radius); for (int j=0; j<5; ++j) { Vector3f newC = c + ( (AngleAxisf(angles[j*2+1], ax0) @@ -113,7 +113,7 @@ class FancySpheres glEnable(GL_NORMALIZE); for (int i=0; i<end; ++i) { - Transform3f t = Translation3f(mCenters[i]) * Scaling(mRadii[i]); + Affine3f t = Translation3f(mCenters[i]) * Scaling(mRadii[i]); gpu.pushMatrix(GL_MODELVIEW); gpu.multMatrix(t.matrix(),GL_MODELVIEW); mIcoSphere.draw(2); |