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

Timestamp:

05/23/08 17:47:22 (16 years ago)

Author:

mattausch

Message:

implemented dynamic object placement / removal

Location:

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

Files:

• ObjectPlacer.cpp (modified) (6 diffs)
• ObjectPlacer.h (modified) (3 diffs)
• QtGlRenderer.cpp (modified) (16 diffs)
• QtGlRenderer.h (modified) (2 diffs)

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

@@ -20 +20 @@
 void ObjectPlacer::AddObject(SceneGraphLeaf *obj)
 {
-        mDynamicObjects.push_back(obj);
+        mLibraryObjects.push_back(obj);
 }
 
@@ -26 +26 @@
 void ObjectPlacer::NextObject()
 {
-        mCurrentObject = (mCurrentObject + 1) % (int)mDynamicObjects.size();
+        mCurrentObject = (mCurrentObject + 1) % (int)mLibraryObjects.size();
 }
 
@@ -32 +32 @@
 void ObjectPlacer::PreviousObject()
 {
-        mCurrentObject = (mCurrentObject - 1) % (int)mDynamicObjects.size();
+        mCurrentObject = (mCurrentObject - 1) % (int)mLibraryObjects.size();
 }
 
@@ -38 +38 @@
 SceneGraphLeaf *ObjectPlacer::GetCurrentObject() 
 { 
-        if (mCurrentObject >= mDynamicObjects.size())
+        if (mCurrentObject >= mLibraryObjects.size())
                 return NULL;
 
-        return mDynamicObjects[mCurrentObject];
+        return mLibraryObjects[mCurrentObject];
 }
 
@@ -49 +49 @@
         Vector3 p = pt;
 
-        SceneGraphLeaf *obj = mDynamicObjects[mCurrentObject];
+        SceneGraphLeaf *obj = mLibraryObjects[mCurrentObject];
 
         // set pivot to ground of object
@@ -58 +58 @@
 }
 
-
-/*void TestApp::Placer(const String &parm)
-{
-        if (parm.Empty())
-        {
-                OUT1("Object placement: place/load <libaryfile>/removelast/next/previous/save <objectfile>");
-                return;
-        }
-
-        ASM_RET(viewer->GetRoot(), "No scene");
-        
-        if (!placer)
-                placer = new ObjectPlacer;
-
-        //-- make sure the placer visualization (which shows the already placed objects) is in the viewer
-        SearchNodeByNameVisitor search("placervis");
-        search.Apply(viewer->GetRoot(), SearchNodeByNameVisitor::FIRST);
-        BranchGroup *placervis = search.GetNode();
-        if (!placervis)
-        {
-                placervis = placer->GetPlacedNodeVisualization();
-                viewer->GetRoot()->addChild(placervis);
-                placervis->setName("placervis");
-        }
-
-        if (parm == "place")
-        {
-                int x, y;
-                input_module->GetMousePos(x, y);
-
-                Point3f pos = viewer->UnProject(x, y);
-                if (viewer && viewer->GetRoot() && viewer->GetRoot()->getBoundingBox()->intersects(pos))
-                {
-                        placer->AddObject(pos);
-                        OUT1(x << " " << y << " " << pos);
-                }
-                else
-                {
-                        OUT1("Point out of bounds");
-                }
-        } else if (parm == "removelast") {
-                placer->RemoveLastObject();
-        } else if (parm == "next") {
-                placer->NextObject();
-        } else if (parm == "previous") {
-                placer->PreviousObject();
-        } else if (parm.Left(5) == "save ") {
-                String filename = parm.Right(parm.size()-5);
-                if (!filename.Empty())
-                        placer->SaveObjects(filename);
-        } else if (parm.Left(5) == "clear") {
-                placer->Clear();
-        } else if (parm.Left(5) == "load ") {
-                String fn = sysutils::FindFile(parm.Right(parm.size()-5), settings->get_ObjectPath());
-
-                ASM_ELSE(!fn.empty(), "Couldn't find file " << fn)
-                {
-                        OUT1("Loading library " << fn << "...");
-                        SceneBasePtr<BranchGroup> root = ReadSceneGraph(fn, 0, 0, 1);
-
-                        BranchGroup *library = new BranchGroup;
-                        ASM_ELSE((root != NULL), "No scene found in file...")
-                        {
-                                SearchNodeByNameVisitor search("start");
-                                search.Apply(root, SearchNodeByNameVisitor::FIRST);
-                                BranchGroup *local_root = search.GetNode();
-
-                                if (local_root == NULL)
-                                {
-                                        OUT1("Note: BranchGroup named \"start\" not found - using root node");
-                                        local_root = root;
-                                }
-
-                                placer->SetLibrary(local_root);
-                                BranchGroup *viz = placer->GetLibraryVisualization();
-                                mRenderArea->SetSceneRoot(viz);
-                                mRenderArea->SetCamera(new Camera);
-                                mRenderArea->GetCamera()->ViewAll(viz->getBoundingSphere());
-                        }
-                }
-        } else
-                OUT1("Unknown placer command");
 }
-*/
-
-}

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

@@ -1 @@
- #ifndef OBJECTPLACER_H
+#ifndef OBJECTPLACER_H
 #define OBJECTPLACER_H
 
@@ -15 +15 @@
 {
 public:
-        /** Default constructor taking a pointer to the currently used preprocessor.
+        /** Default constructor.
         */
-//      ObjectPlacer(Preprocessor *prep);
         ObjectPlacer();
 
-        /** Sets library objects.
+        virtual ~ObjectPlacer() {}
+
+        /** Adds a library objects.
         */
-        void AddObject(SceneGraphLeaf *object);
-
+        void AddObject(SceneGraphLeaf *obj);
         /** Selects the next library object.
         */
@@ -33 +33 @@
         */
         void PlaceObject(const Vector3 &p);
-
+        /** Returns the currently active object.
+        */
         SceneGraphLeaf *GetCurrentObject();
-
-        virtual ~ObjectPlacer() {}
-
-        DynamicObjectsContainer &GetDynamicObjects() { return mDynamicObjects; }
+        /** Returns a ref to the object container.
+        */
+        DynamicObjectsContainer &GetDynamicObjects() { return mLibraryObjects; }
 
 
 protected:
 
-        //Preprocessor *mPreprocessor;
-
-        DynamicObjectsContainer mDynamicObjects;
-                
+        DynamicObjectsContainer mLibraryObjects;
         int mCurrentObject;
 

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

@@ -63 +63 @@
    GLuint names, *ptr;
 
-   cout << "hits = %d" << endl;;
+   cout << "hits: " << hits << endl;;
    ptr = (GLuint *) buffer;
 
@@ -71 +71 @@
            names = *ptr;
 
-           printf (" number of names for hit = %d\n", names); ptr++;
-           printf("  z1 is %g;", (float) *ptr/0x7fffffff); ptr++;
-           printf(" z2 is %g\n", (float) *ptr/0x7fffffff); ptr++;
-           printf ("   the name is ");
-
-           for (j = 0; j < names; j++) {     /*  for each name */
+           printf ("number of names for hit: %d\n", names); ptr ++;
+           printf("z1: %g;", (float) *ptr / 0x7fffffff); ptr ++;
+           printf("z2: %g\n", (float) *ptr / 0x7fffffff); ptr ++;
+           printf ("the name is ");
+
+           // for each name 
+           for (j = 0; j < names; j++) 
                    printf ("%d ", *ptr); ptr++;
-           }
+
            printf ("\n");
    }
@@ -555 +556 @@
         glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
 
-#if DYNAMIC_OBJECTS_HACK
         // handle dynamic objects
-        DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicObjects.end();
-
-        for (dit = mDynamicObjects.begin(); dit != dit_end; ++ dit)
+        DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicPvsObjects.end();
+
+        for (dit = mDynamicPvsObjects.begin(); dit != dit_end; ++ dit)
         {
                 _RenderDynamicObject(*dit);
@@ -565 +565 @@
 
         // handle dynamic objects
-        dit, dit_end = mPendingDynamicObjects.end();
-
-        for (dit = mPendingDynamicObjects.begin(); dit != dit_end; ++ dit)
+        Preprocessor *p = mViewCellsManager->GetPreprocessor();
+        dit, dit_end = p->mDynamicObjects.end();
+
+        for (dit = p->mDynamicObjects.begin(); dit != dit_end; ++ dit)
         {
                 _RenderDynamicObject(*dit);
@@ -573 +574 @@
 
         //_RenderDynamicObject(mPendingDynamicObject);
-#endif
 }
 
@@ -586 +586 @@
         mPvsSize = pvs.GetSize();
 
-#if DYNAMIC_OBJECTS_HACK
-        mDynamicObjects.clear();
-#endif
+        mDynamicPvsObjects.clear();
 
         ObjectPvsIterator it = pvs.GetIterator();
@@ -604 +602 @@
                         }
                         break;
-#if DYNAMIC_OBJECTS_HACK
 
                 case Intersectable::SCENEGRAPHLEAF_INTERSECTABLE:
-                        mDynamicObjects.push_back(static_cast<SceneGraphLeafIntersectable *>(obj)->GetItem());
+                        mDynamicPvsObjects.push_back(static_cast<SceneGraphLeafIntersectable *>(obj)->GetItem());
                         break;
-#endif
                 default:
                         cerr << "PreparePvs: type " << Intersectable::GetTypeName(obj) << " not handled yet" << endl;
@@ -807 +803 @@
 
                         mPlacer->PlaceObject(pt);
-                        //mPendingDynamicObjects.push_back( mPlacer->GetCurrentObject());
+                        SceneGraphLeaf *leaf = mPlacer->GetCurrentObject();
+
+                        // hack: should just pass a IntersectableGroup as a whole
+                        // instead we duplicate the object container and create a new
+                        // leaf
+                        SceneGraphLeaf *newObj = new SceneGraphLeaf(*leaf);
+
+                        mViewCellsManager->GetPreprocessor()->RegisterDynamicObject(newObj);
+                        //mPendingDynamicObjects.push_back();
                 }
         }
@@ -825 +829 @@
                 const Vector3 pt = Unproject(x, y);
 
-                int num = FindDynamicObject(pt);
-                cout << "\n*****************\n" << "here4" << num << endl;
-                //processHits(buf);
-
+                int idx = FindDynamicObject(x, y);
+                
+                Preprocessor *p = GetPreprocessor();
+
+                swap(p->mDynamicObjects[idx], p->mDynamicObjects.back());
+                p->mDynamicObjects.pop_back();
                 /*if (mCurrentDynamicObjectIdx >= 0) {
                 preprocessor->ScheduleUpdateDynamicObjects();
@@ -933 +939 @@
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-        if (1) 
-        {
-                SetupCameraProjection(width(), height());
-                SetupCamera();
-
-                if (mRenderErrors) 
-                {
-                        RenderErrors();
-                } 
-                else 
-                {
-                        glColor3f(0.6f, 0.6f, 0.6f);
-                        VisualizePvs();
-                }
-
-                if (mShowRays) 
-                {
-                        RenderRays(mViewCellsManager->mVizBuffer.GetRays(), mRayVisualizationMethod, mShowDistribution, 1);
-                }
-        }
-
+        SetupCameraProjection(width(), height());
+        SetupCamera();
+
+        if (mRenderErrors) 
+                RenderErrors();
+        else 
+        {
+                glColor3f(0.6f, 0.6f, 0.6f);
+                VisualizePvs();
+        }
+
+        if (mShowRays) 
+                RenderRays(mViewCellsManager->mVizBuffer.GetRays(), mRayVisualizationMethod, mShowDistribution, 1);
+        
         RenderInfo();
-        mFrame ++;
+
+        ++ mFrame;
         //      cout<<"vp="<<mViewPoint<<" vd="<<mViewDirection<<endl;
 }
@@ -2367 +2367 @@
         vbox->layout()->addWidget(button);
         connect(button, SIGNAL(clicked()), SIGNAL(ComputeGVS()));
-
-#else
-        
+#endif
+
+#if 1   
         button = new QPushButton("Replay view points", vbox);
         vbox->layout()->addWidget(button);
@@ -2376 +2376 @@
 #endif
 
-#if DYNAMIC_OBJECTS_HACK
-
         button = new QPushButton("Load object", vbox);
         vbox->layout()->addWidget(button);
         connect(button, SIGNAL(clicked()), SIGNAL(LoadObject()));
-#endif
 
         /*cb = new QCheckBox("Stats", vbox);
@@ -2650 +2647 @@
 
 
-int QtGlRendererWidget::FindDynamicObject(const Vector3 &pos) 
+int QtGlRendererWidget::FindDynamicObject(float x, float y) 
 { 
+        makeCurrent();
         // we need to lock the rendering context 
         //glw.lockGLContext(); 
@@ -2660 +2658 @@
         // see below for an explanation on the buffer content 
         GLuint buffer[maxSize]; 
-        GLint viewport[4];
-
-        glGetIntegerv(GL_VIEWPORT, viewport); 
         glSelectBuffer(maxSize, buffer); 
         
@@ -2673 +2668 @@
         glPushMatrix(); 
         glLoadIdentity(); 
-        gluPickMatrix((GLdouble)pos.x, (GLdouble)(viewport[3] - pos.y), 5.0f, 5.0f, viewport); 
-        
-        GLfloat x = (GLfloat)width() / height(); 
-        glFrustum(-x, x, -1.0, 1.0, 4.0, 15.0); 
-        
-         glLoadName(1);
-
-        _RenderDynamicObject(mPendingDynamicObjects[0]);
+
+        glViewport(0, 0, width(), height());
+
+        GLint viewport[4];
+        glGetIntegerv(GL_VIEWPORT, viewport); 
+
+        const float w = 1.0f;
+
+        //gluPickMatrix(x, y, 1000.0, 1000.0, viewport);
+        gluPickMatrix((GLdouble)x, (GLdouble)(viewport[3] - y), w, w, viewport); 
+
+        GLfloat aspect = (GLfloat) width() / height(); 
+        gluPerspective(70.0f, aspect, 0.1f, 2.0f * Magnitude(mSceneGraph->GetBox().Diagonal()));
+        
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix(); 
+        glLoadIdentity();
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        
+        
+        SetupCamera();
+
+        for (size_t i = 0; i < GetPreprocessor()->mDynamicObjects.size(); ++ i)
+        {
+                glLoadName(i);
+                _RenderDynamicObject(GetPreprocessor()->mDynamicObjects[i]);
+        }
+
+        glFlush();
+        glPopMatrix();
 
         glMatrixMode(GL_PROJECTION); 
         glPopMatrix();
 
+        //updateGL();
+
+        int hits;
         // finally release the rendering context again 
-        if (!glRenderMode(GL_RENDER)) 
+        if ((hits = glRenderMode(GL_RENDER)) < 0) 
         { 
+                cout << "no object picked" << endl;
                 //glw.unlockGLContext(); 
                 return -1; 
         } 
+
+
+        //processHits(hits, buffer);
+
         
         //glw.unlockGLContext(); 
@@ -2703 +2728 @@
         // (number of the surface). 
         // return the name of the clicked surface 
-        
         return buffer[3]; 
 }

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

@@ -248 +248 @@
         ObjectPlacer *mPlacer;
 
-#if DYNAMIC_OBJECTS_HACK
-
-        DynamicObjectsContainer mPendingDynamicObjects;
-        DynamicObjectsContainer mDynamicObjects;
-
-#endif
+        //DynamicObjectsContainer mPendingDynamicObjects;
+        DynamicObjectsContainer mDynamicPvsObjects;
 
         QtGlRendererWidget(SceneGraph *sceneGraph,
@@ -329 +325 @@
         Vector3 Unproject(int x, int y);
         
-        int FindDynamicObject(const Vector3 &pos);
+        int FindDynamicObject(float x, float y);