From 063ec9c0d16200145bf64c74cd420ae2d608b504 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 17 Jun 2015 11:48:10 -0500 Subject: [PATCH] Updated openGL demo app now that the Matrix3D class works the other (correct!) way around. --- examples/Demo/Source/Demos/OpenGLDemo.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/Demo/Source/Demos/OpenGLDemo.cpp b/examples/Demo/Source/Demos/OpenGLDemo.cpp index 9462596563..def635e747 100644 --- a/examples/Demo/Source/Demos/OpenGLDemo.cpp +++ b/examples/Demo/Source/Demos/OpenGLDemo.cpp @@ -701,13 +701,12 @@ struct OpenGLDemoClasses Matrix3D getViewMatrix() const { - Matrix3D viewMatrix (Vector3D (0.0f, 1.0f, -10.0f)); - - viewMatrix *= draggableOrientation.getRotationMatrix(); + Matrix3D viewMatrix = draggableOrientation.getRotationMatrix() + * Vector3D (0.0f, 1.0f, -10.0f); Matrix3D rotationMatrix = viewMatrix.rotated (Vector3D (rotation, rotation, -0.3f)); - return viewMatrix * rotationMatrix; + return rotationMatrix * viewMatrix; } void setTexture (DemoTexture* t)