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

Timestamp:

05/21/08 18:44:16 (16 years ago)

Author:

mattausch

Message:

worked on moving objects

Location:

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

Files:

• ObjectPlacer.cpp (modified) (3 diffs)
• ObjectPlacer.h (modified) (2 diffs)
• QtGlRenderer.cpp (modified) (8 diffs)
• QtGlRenderer.h (modified) (4 diffs)

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

@@ -1 +1 @@
 #include "ObjectPlacer.h"
+#include "Matrix4x4.h"
+#include "SceneGraph.h"
 
-namespace GtpVisibilityPreprocessor {
+
+
+namespace GtpVisibilityPreprocessor 
+{
 
 // ---------------------------------------------------------------------------
 //  ObjectPlacer implementation
 // ---------------------------------------------------------------------------
-#if 0
+
 ObjectPlacer::ObjectPlacer()
-        :mCurrentLibaryObject(0), mPlacedNodes(new BranchGroup), mLibraryViz(new BranchGroup)
+: mCurrentObject(0)
 {
-        mLibraryViz->addChild(new BranchGroup);
-
-        BranchGroup *bg = new BranchGroup;
-        bg->addChild(new Box);
-        SetLibrary(bg);
 }
 
 
-void ObjectPlacer::SetLibrary(BranchGroup *library)
+void ObjectPlacer::AddObject(SceneGraphLeaf *obj)
 {
-        mLibrary = new BranchGroup;
-        if (!library)
-        {
-                mLibrary->addChild(new Box);
-        }
-        else
-        {
-                for (int i = 0; i < library->numChildren(); i ++)
-                {       
-                        Node *n = library->getChild(i);
-                        SharedGroup *s = new SharedGroup;
-                        s->addChild(n);
-                        
-                        Link *l = new Link;
-                        l->setSharedGroup(s);
-                        mLibrary->addChild(l);
-                }
-        }
-        
-        UpdateLibraryViz();
-}
-
-void ObjectPlacer::UpdateLibraryViz()
-{
-        Link *l = new Link;
-        l->setSharedGroup(((Link *)mLibrary->getChild(mCurrentLibaryObject))->getSharedGroup());
-
-        mLibraryViz->setChild(l, 0);
+        mDynamicObjects.push_back(obj);
 }
 
@@ -53 +26 @@
 void ObjectPlacer::NextObject()
 {
-        if (mLibrary)
-                mCurrentLibaryObject = (mCurrentLibaryObject + 1) % (mLibrary->numChildren());
-        UpdateLibraryViz();
+        mCurrentObject = (mCurrentObject + 1) % (int)mDynamicObjects.size();
 }
+
 
 void ObjectPlacer::PreviousObject()
 {
-        if (mLibrary)
-                mCurrentLibaryObject = (mCurrentLibaryObject - 1) % (mLibrary->numChildren());
-        UpdateLibraryViz();
-}
-
-void ObjectPlacer::AddObject(const Point3f &p)
-{
-        //BranchGroup *o = new BranchGroup;
-        TransformGroup *tg = new TransformGroup;
-        Transform3D t;
-        t.setTranslation(p - Origin3f);
-        tg->setTransform(t);
-        //o->addChild(tg);
-
-        Link *l = new Link;
-        l->setSharedGroup(((Link *)(mLibrary->getChild(mCurrentLibaryObject)))->getSharedGroup());
-        tg->addChild(l);
-
-        mPlacedNodes->addChild(tg);
-}
-
-void ObjectPlacer::RemoveLastObject()
-{
-        if (mPlacedNodes->numChildren() > 0)
-                mPlacedNodes->removeChild(mPlacedNodes->numChildren()-1);
-}
-
-void ObjectPlacer::SaveObjects(const String &filename)
-{
-        WriteActionIV wa(filename, "");
-
-        wa.Apply(mPlacedNodes);
-}
-
-BranchGroup *ObjectPlacer::GetLibraryVisualization()
-{
-        return mLibraryViz;
-}
-
-BranchGroup *ObjectPlacer::GetPlacedNodeVisualization()
-{
-        return mPlacedNodes;
-}
-
-void ObjectPlacer::Clear()
-{
-        mPlacedNodes->removeAllChildren();      
+        mCurrentObject = (mCurrentObject - 1) % (int)mDynamicObjects.size();
 }
 
 
-void TestApp::Placer(const String &parm)
+SceneGraphLeaf *ObjectPlacer::GetCurrentObject() 
+{ 
+        if (mCurrentObject >= mDynamicObjects.size())
+                return NULL;
+
+        return mDynamicObjects[mCurrentObject];
+}
+
+
+void ObjectPlacer::PlaceObject(const Vector3 &pt)
+{
+        Vector3 p = pt;
+
+        SceneGraphLeaf *obj = mDynamicObjects[mCurrentObject];
+
+        // set pivot to ground of object
+        p.y -= obj->GetOriginalBox().Min().y;
+        Matrix4x4 trafo = TranslationMatrix(p);
+
+        obj->LoadTransform(trafo);
+}
+
+
+/*void TestApp::Placer(const String &parm)
 {
         if (parm.Empty())
@@ -191 +140 @@
         } else
                 OUT1("Unknown placer command");
+}
+*/
 
 }
-
-#endif
-
-}

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

@@ -1 +1 @@
  #ifndef OBJECTPLACER_H
 #define OBJECTPLACER_H
+
+#include "Containers.h"
 
 namespace GtpVisibilityPreprocessor {
 
 class Vector3;
+class Preprocessor;
 
 
@@ -12 +15 @@
 {
 public:
+        /** Default constructor taking a pointer to the currently used preprocessor.
+        */
+//      ObjectPlacer(Preprocessor *prep);
         ObjectPlacer();
 
-        /// sets library objects
-        //void SetLibrary(BranchGroup *library);
-        /// selects the next library object
+        /** Sets library objects.
+        */
+        void AddObject(SceneGraphLeaf *object);
+
+        /** Selects the next library object.
+        */
         void NextObject();
-        /// selects the previous library object
+        /** Selects the previous library object.
+        */
         void PreviousObject();
-        /// adds an object at the indicated position
-        void AddObject(const Vector3 &p);
-        /// remove the last added object
-        void RemoveLastObject();
+        /** Adds an object at the indicated position.
+        */
+        void PlaceObject(const Vector3 &p);
 
-        /// Clear all objects
-        void Clear();
+        SceneGraphLeaf *GetCurrentObject();
 
-        /// Save the objects
-        /*void SaveObjects(const std::string &filename);
-
-        /// Get a node to visualize from the library
-        BranchGroup *GetLibraryVisualization();
-
-        /// Get the nodes that have already been placed
-        BranchGroup *GetPlacedNodeVisualization();
-
-*/      
         virtual ~ObjectPlacer() {}
 
+        DynamicObjectsContainer &GetDynamicObjects() { return mDynamicObjects; }
+
+
 protected:
-        /*SceneBasePtr<BranchGroup> mLibrary;
-        SceneBasePtr<BranchGroup> mPlacedNodes;
-        SceneBasePtr<BranchGroup> mLibraryViz;
-        int mCurrentLibaryObject;
 
-        /// Get a link to an object in the library
-        void UpdateLibraryViz();
-*/
+        //Preprocessor *mPreprocessor;
+
+        DynamicObjectsContainer mDynamicObjects;
+                
+        int mCurrentObject;
+
 };
 

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

@@ -18 +18 @@
 #include "LogWriter.h"
 #include "RayCaster.h"
+#include "ObjectPlacer.h"
 
 
@@ -271 +272 @@
         if (pixelCount > pixelThres) 
         {
-                cout << "frame " << mFrame << " vc id: " << viewcell->GetId() << " pvs: " << pvsSize << " pc: " << pixelCount << " vp: " << mViewPoint << endl;
+                cout << "f " << mFrame << " id " << viewcell->GetId() << " pvs " << pvsSize << " e " << pixelCount << " vp " << mViewPoint << " vd " << mViewDirection << endl;
         
                 if (mSnapErrorFrames) 
@@ -510 +511 @@
                 _RenderDynamicObject(*dit);
         }
+
+        if (mPendingDynamicObject)
+                _RenderDynamicObject(mPendingDynamicObject);
 #endif
 }
@@ -736 +740 @@
         mousePoint.y = y;
 
-}
+        if (e->button() == Qt::RightButton)
+        {
+                if (mPlacer->GetCurrentObject())
+                {
+                        Vector3 pt = Unproject(x, y);
+                        cout << "unproject: " << pt << endl;
+
+                        mPlacer->PlaceObject(pt);
+                        mPendingDynamicObject = mPlacer->GetCurrentObject();
+                }
+        }
+}
+
 
 void QtGlRendererWidget::mouseReleaseEvent(QMouseEvent *e)
@@ -1047 +1063 @@
 
         mRenderError = 0.0f;
+
         mShowRays = false;
-
         mReplayMode = false;
+
+        mPlacer = new ObjectPlacer();
+
+        mPendingDynamicObject = NULL;
 
         SetSceneCut(1000);
@@ -1183 +1203 @@
         ++ mCurrentDynamicObjectIdx;
 
-        if (mViewCellsManager->GetPreprocessor()->LoadDynamicGeometry(filename)) {
-          
-          cout << "Loading finished" << endl;
-        } else
-          cerr << "Loading failed" << endl;
+        SceneGraphLeaf *leaf = 
+                mViewCellsManager->GetPreprocessor()->LoadDynamicGeometry(filename);
+
+        if (leaf)
+        {
+                mPlacer->AddObject(leaf);
+                cout << "Loading finished" << endl;
+        }
+        else
+                cerr << "Loading failed" << endl;
         
     updateGL();
 }
+
 
 void
@@ -2524 +2550 @@
 {
         // swap y coordinate
-        //y = GetHeight() - y;
+        y = GetHeight() - y;
 
         // HACK: should come from camera!
@@ -2534 +2560 @@
         const int viewport[4] = {0,0, GetWidth(), GetHeight()};
 
+        RenderScene();
+
         float z;
         glReadPixels(x, y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
-
-        RenderScene();
-
+        
         GLdouble rx, ry, rz;
         gluUnProject(x, y, z, modelview, projection, viewport, &rx, &ry, &rz);

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

@@ -39 +39 @@
 class OcclusionQuery;
 class TransformedMeshInstance;
+class ObjectPlacer;
 
 
@@ -221 +222 @@
         float mTransferFunction;
 
-
         Vector3 mDummyViewPoint;
 
@@ -242 +242 @@
         int mReplayTimerId;
 
+        ObjectPlacer *mPlacer;
+
 #if DYNAMIC_OBJECTS_HACK
+        
+        SceneGraphLeaf *mPendingDynamicObject;
+
         DynamicObjectsContainer mDynamicObjects;
 #endif
@@ -254 +259 @@
 
         QtGlRendererWidget() {};
+
+        ~QtGlRendererWidget() { delete mPlacer; }
 
         void SetThread(QtPreprocessorThread *t)