Changeset 433 for projectionDesigner/trunk/projdesigner/src/gui

Timestamp:

Oct 16, 2013, 8:02:40 PM (11 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

projectionDesigner/trunk/projdesigner/src/gui

Files:

• QDesignViewWidget.cpp (modified) (2 diffs)
• QGLViewerWidget.cpp (modified) (3 diffs)

projectionDesigner/trunk/projdesigner/src/gui/QDesignViewWidget.cpp

@@ -71 +71 @@
     {
         glPushMatrix();
-        glMultMatrixf(invert(m_pModel->getScene()->getCameraMatrix()).getData());
+
+        //
+        // Sigh: Too clever. Split this line in two. [ben 27Sep13]
+        // glMultMatrixf(invert(m_pModel->getScene()->getCameraMatrix()).getData());
+        //
+        gmtl::Matrix<float, 4u, 4u> a = m_pModel->getScene()->getCameraMatrix();
+        glMultMatrixf(invert(a).getData());
+
+
         m_pModel->getScene()->draw();
         glPopMatrix();
@@ -181 +189 @@
             setView(Vec3f(), Quatf(), 0.0f);
             break;
+        //
+        // Handle Missing Cases. Not sure. Maybe do nothing, or do FRONT mode?
+        // [ben 27Sep13]
+        //
+        case DESIGN_VIEWMODE_PERSPECTIVE:
+        case DESIGN_VIEWMODE_CENTER:
+        default:
+            // setView(Vec3f(), Quatf(), 0.0f);
+            break;;
         }
         setPerspective(false);

projectionDesigner/trunk/projdesigner/src/gui/QGLViewerWidget.cpp

@@ -1 +1 @@
 #include <float.h>
 #include <QMouseEvent>
+
+#include <GL/glu.h>     // Added! for gluPerspective() call. [ben 27Sep13]
 
 #include "gui/QGLViewerWidget.h"
@@ -213 +215 @@
     glEnable(GL_LIGHT0);
     Vec3f pos = Vec3f(1.0f, 1.0f, 1.0f);
-    if (!_isnan(m_rot[0]))
+    if (!isnan(m_rot[0]))
         pos = m_rot * pos;
     GLfloat lposition[] = { pos[0], pos[1], pos[2], 0.0f };
@@ -379 +381 @@
             make<Quatf>(AxisAnglef(-m_animY*delta, Vec3f(1.0f, 0.0f, 0.0f)));
         Quatf rot = m_rot * deltaRot;
-        if (!_isnan(rot[0]))
+        if (!isnan(rot[0]))
             setView(m_center, rot, m_distance);
         m_lastTime = QTime::currentTime();