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

Timestamp:

05/26/08 04:01:24 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Files:

• ObjectPlacer.cpp (modified) (1 diff)
• ObjectPlacer.h (modified) (1 diff)
• QtGlRenderer.cpp (modified) (4 diffs)

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

@@ -58 +58 @@
 }
 
+
+void ObjectPlacer::PlaceObject(SceneGraphLeaf *leaf, const Vector3 &pt)
+{
+        AxisAlignedBox3 box = leaf->GetBox();
+
+        Vector3 p = box.Center() - pt;;
+
+        // set pivot to ground of object
+        //p.y -= obj->GetOriginalBox().Min().y;
+        Matrix4x4 trafo = TranslationMatrix(p);
+
+        leaf->ApplyTransform(trafo);
 }
+
+}

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/ObjectPlacer.h

@@ -33 +33 @@
         */
         void PlaceObject(const Vector3 &p);
+        /** Adds an object at the indicated position.
+        */
+        void PlaceObject(SceneGraphLeaf *l, const Vector3 &p);
         /** Returns the currently active object.
         */

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

@@ -143 +143 @@
     glLoadIdentity();
     glOrtho(-1, 1, -1, 1, -99, 99);
-    //glTranslatef(-0.5f, -0.5f, 0.0f);
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
@@ -916 +915 @@
                 {
                         Matrix4x4 tm;
+
+                        SceneGraphLeaf *l =
+                          mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
 
                         switch (mTrafoType)
@@ -948 +950 @@
                                 cerr << "not implemented" << endl;
                         }
-
-                        SceneGraphLeaf *l =
-                          mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
+                        
                         l->ApplyTransform(tm);
-                        
+
                         updateGL();
                 }
@@ -1184 +1184 @@
         mCurrentDynamicObjectIdx = -1;
 
+        // export frame buffer during walkthrough
         //mExportFrameBuffer = true;
         mExportFrameBuffer = false;