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

Timestamp:

05/17/08 01:15:07 (16 years ago)

Author:

mattausch

Message:

fixed bugs: pixel measurement for pgv now working, fixed renderpvs crash

File:

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

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

@@ -581 +581 @@
         glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
 
-#if 0// DYNAMIC_OBJECTS_HACK
+#if DYNAMIC_OBJECTS_HACK
         // handle dynamic objects
         DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicObjects.end();
@@ -819 +819 @@
   if (e->modifiers() & Qt::AltModifier) 
         if (mCurrentDynamicObjectIdx >= 0) {
-          //      preprocessor->ScheduleUpdateDynamicObjects();
+          // preprocessor->ScheduleUpdateDynamicObjects();
         }
 }
@@ -829 +829 @@
         float TURN_SENSITIVITY = 0.1f;
         float TILT_SENSITIVITY = 32.0 ;
-        float TURN_ANGLE= M_PI  /36.0 ;
+        float TURN_ANGLE= M_PI / 36.0 ;
 
         int x = e->pos().x();
@@ -843 +843 @@
                 mViewPoint.y += (y-mousePoint.y)*MOVE_SENSITIVITY / 2.0;
                 mViewPoint.x += (x-mousePoint.x)*MOVE_SENSITIVITY / 2.0;
-        } 
+        }
 #if DYNAMIC_OBJECTS_HACK
         else if (e->modifiers() & Qt::AltModifier)
@@ -883 +883 @@
                         }
 
-#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();
                 }