Changeset 2638 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Timestamp:

01/24/08 11:41:38 (16 years ago)

Author:

bittner

Message:

siggraph submission

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -600 +600 @@
         glStencilOp(GL_KEEP, GL_KEEP, GL_INCR); 
 
-        mUseForcedColors = true;
-
-        glColor3f(0.0f, 0.8f, 0.2f);
+        //mUseForcedColors = true;
+
+        //      glColor3f(0.0f, 0.8f, 0.2f);
+        //      glColor3f(0.5f, 0.5f, 0.5f);
+
+        glColor3f(0.6f, 0.6f, 0.6f);
 
         // Render PVS
@@ -617 +620 @@
 
         SetupCamera();
+
+        mUseForcedColors = true;
 
         glColor3f(1.0f, 0.0f, 0.0f);
@@ -705 +710 @@
                         case 0:
                                 {
+                                  if (e->modifiers() & Qt::ShiftModifier) {
+                                        const Vector3 transl(0, diffy, 0);
+                                        tm = TranslationMatrix(transl);
+                                  
+                                  } else {
                                         const Vector3 transl(diffx, 0, diffy);
-                                        
                                         tm = TranslationMatrix(transl);
+                                  }
                                 }
                                 break;
@@ -720 +730 @@
                         case 2:
                                 {
-                                        tm = RotationXMatrix(diffx) * RotationYMatrix(diffy);
+                                  //                                    tm = RotationXMatrix(diffx) * RotationYMatrix(diffy);
+                                  tm = RotationYMatrix(diffx);
                                 }
                                 break;
@@ -791 +802 @@
         RenderInfo();
         mFrame ++;
+        //      cout<<"vp="<<mViewPoint<<" vd="<<mViewDirection<<endl;
 }
 
@@ -1094 +1106 @@
 void QtGlRendererWidget::LoadObject()
 {
-        string filename("../data/teapot.bn");
+  //    string filename("../data/teapot.bn");
+  // string filename("../data/teapot.bn");
+  string filename("../data/cube.obj");
         
         cout << "Loading model << " << filename << endl;
@@ -1254 +1268 @@
         renderText(20, 40, s);
 #endif
-        
+#if 0
         QFont font40; font40.setPointSize(30);
         s.sprintf("PVS: %04d", mPvsSize);
         renderText(20, 40, s, font40);
-
+#endif
+        
 /*      QFont font40; font40.setPointSize(30);
         s.sprintf("New triangles: %04d", 100);