Changeset 433 for projectionDesigner/trunk/projdesigner/src/Channel.cpp

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

File:

• projectionDesigner/trunk/projdesigner/src/Channel.cpp (modified) (1 diff)

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