Changeset 2621 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

Timestamp:

01/21/08 20:38:41 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -423 +423 @@
                 RenderIntersectable(*dit);
 #else
-                RenderDynamicObject(*dit);
+                _RenderDynamicObject(*dit);
 #endif
         }
@@ -679 +679 @@
                 {
                         Matrix4x4 tm;
-                        TransformedMeshInstance *tmi;
-#if USE_TRANSFORMED_MESH_INSTANCE_HACK
 
                         switch (mTrafoType)
@@ -687 +685 @@
                                 {
                                         const Vector3 transl(diffx, 0, diffy);
-                                        tmi = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
+                                        
                                         tm = TranslationMatrix(transl);
                                 }
@@ -696 +694 @@
                                         if (scalef < 0.9) scalef = 0.9f;
                                         else if (scalef > 1.1f) scalef = 1.1f;
-                                        tmi = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
                                         tm = ScaleMatrix(scalef, scalef, scalef);
                                 }
@@ -702 +699 @@
                         case 2:
                                 {
-                                        tmi = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
                                         tm = RotationXMatrix(diffx) * RotationYMatrix(diffy);
                                 }
@@ -710 +706 @@
                         }
 
+#if USE_TRANSFORMED_MESH_INSTANCE_HACK
+                        TransformedMeshInstance *tmi = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
                         tmi->ApplyWorldTransform(tm);
+#else
+                        SceneGraphLeaf *l = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
+                        l->ApplyTransform(tm);
 #endif
                         updateGL();
@@ -1457 +1458 @@
         ComputeMaxValues(viewcells, maxPvs, maxPiercingRays, maxRelativeRays, maxRcCost);
         // matt: temp hack
-        //maxRcCost = 200.0f;
+        maxRcCost = 200.0f;
         //cout << "maxRcCost: " << maxRcCost << endl;
         int i;
@@ -2119 +2120 @@
         vbox->layout()->addWidget(button);
         connect(button, SIGNAL(clicked()), SIGNAL(StoreStatistics()));
+#endif
+
+#if DYNAMIC_OBJECTS_HACK
 
         button = new QPushButton("Load object", vbox);
@@ -2124 +2128 @@
         connect(button, SIGNAL(clicked()), SIGNAL(LoadObject()));
 #endif
+
         /*cb = new QCheckBox("Stats", vbox);
         vbox->layout()->addWidget(cb);