Changeset 433

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

Location:

projectionDesigner/trunk/projdesigner

Files:

• include/interfaces.h (modified) (1 diff)
• main.cpp (modified) (1 diff)
• src/Channel.cpp (modified) (1 diff)
• src/Warp.cpp (modified) (1 diff)
• src/gui/QDesignViewWidget.cpp (modified) (2 diffs)
• src/gui/QGLViewerWidget.cpp (modified) (3 diffs)

projectionDesigner/trunk/projdesigner/include/interfaces.h

@@ -5 +5 @@
 #include <QWidget>
 #include <QtXml>
+#include <QtOpenGL/QGLWidget>   // added! [ben 27Sep13]
+
 //#include <QGLViewer/frame.h>
 

projectionDesigner/trunk/projdesigner/main.cpp

@@ -29 +29 @@
     for (int i=1; i<argc; ++i)
     {
-        if (_stricmp(argv[i], "-c") == 0 || _stricmp(argv[i], "-client") == 0)
+        if (stricmp(argv[i], "-c") == 0 || stricmp(argv[i], "-client") == 0)
             bServer = false;
-        else if (_stricmp(argv[i], "-address") == 0 && i+1 < argc)
+        else if (stricmp(argv[i], "-address") == 0 && i+1 < argc)
             address = argv[i+1];
-        else if ((_stricmp(argv[i], "-port") == 0 || _stricmp(argv[i], "-portno") == 0) && i+1 < argc)
+        else if ((stricmp(argv[i], "-port") == 0 || stricmp(argv[i], "-portno") == 0) && i+1 < argc)
                 {
             portNo = atoi(argv[i+1]);

projectionDesigner/trunk/projdesigner/src/Channel.cpp

@@ -144 +144 @@
     glLoadIdentity();
 
-    glMultMatrixf(invert(m_view.getTransformMatrix().getMatrix()).getData());
-
-    glMultMatrixf(invert(m_pModel->getScene()->getCameraMatrix()).getData());
+
+    // HACK. These 2 lines have problems. gcc can't figure out a matching type for invert()
+    // Split up lines and assign explicit Matrix type. Replace with 4 below. [ben 27Sep13]
+    //
+    // glMultMatrixf(invert(m_view.getTransformMatrix().getMatrix()).getData());
+    //
+    // glMultMatrixf(invert(m_pModel->getScene()->getCameraMatrix()).getData());
+
+    gmtl::Matrix<float, 4u, 4u> a = m_view.getTransformMatrix().getMatrix();
+    glMultMatrixf(invert(a).getData());
+
+    gmtl::Matrix<float, 4u, 4u> b = m_pModel->getScene()->getCameraMatrix();
+    glMultMatrixf(invert(b).getData());
+
+
 
     m_pModel->getScene()->draw();

projectionDesigner/trunk/projdesigner/src/Warp.cpp

@@ -1 +1 @@
 #include <math.h>
+
+#include <GL/glu.h>     // Added! for gluUnProject() calls. [ben 27Sep13]
 
 #include "Warp.h"

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();