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

Timestamp:

05/27/08 21:24:34 (17 years ago)

Author:

mattausch

Message:

dynamic objects problem!!

Location:

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

Files:

• ObjectPlacer.cpp (modified) (1 diff)
• QtGlRenderer.cpp (modified) (6 diffs)

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

@@ -63 +63 @@
         AxisAlignedBox3 box = leaf->GetBox();
 
-        Vector3 p = box.Center() - pt;;
+        Vector3 p = box.Center() - pt;
 
         // set pivot to ground of object

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

@@ -589 +589 @@
 
         //cout << "dynamic objects in pvs " << mDynamicPvsObjects.size() << endl;;
-
+#if 0
         for (dit = mDynamicPvsObjects.begin(); dit != dit_end; ++ dit)
         {
                 _RenderDynamicObject(*dit);
         }
-
-        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+#endif
+        //glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
         // show placed dynamic objects as wireframe
@@ -789 +789 @@
 
         int pixelCount = query->GetQueryResult();
-        pErrorPixels = ((float)pixelCount) / (GetWidth() * GetHeight());
+        pErrorPixels = (float)pixelCount / (GetWidth() * GetHeight());
         
         if (0) cout << "error pixels=" << pixelCount << endl;
@@ -1347 +1347 @@
 void QtGlRendererWidget::LoadObjects()
 {
+        AxisAlignedBox3 sceneBox = mViewCellsManager->GetViewSpaceBox();
+        
+        float x = 1.0f;
+        float y = 20.0f;
+        float z = 80.0f;
+
+        AxisAlignedBox3 box(Vector3(0.5f * x, 0, -0.5f * z), Vector3(-0.5f * x, y, 0.5f * z));
+
+//      box.Scale(Vector3(0.02f, 0.1f, 0.1f));
+
+        box.Translate(-box.Min());
+
+        SceneGraphLeaf *leaf = GetPreprocessor()->GenerateBoxGeometry(box);
+        mPlacer->AddObject(leaf);
+        
         LoadObject("../data/teapot.bn");
         LoadObject("../data/bunny.bn");
@@ -1625 +1640 @@
 }
 
-#if 0
-float QtGlRendererWidget::ComputeRenderCost(ViewCell *vc)
-{
-        ObjectPvs basePvs;
-        
-        basePvs = vc->CopyPvs();
-        ObjectPvsIterator pit = basePvs.GetIterator();
-
-        float renderCost = 0;
-
-        //cout << "cost vis: " << mShowDistanceWeightedPvs << " " << " " << mShowDistanceWeightedTriangles << " " << mShowWeightedTriangles << endl;
-        
-        // first mark all objects from this pvs
-        while (pit.HasMoreEntries())    
-        {
-                KdIntersectable *kdObj = static_cast<KdIntersectable *>(pit.Next());
-
-                if (mShowDistanceWeightedPvs)
-                {
-                        const AxisAlignedBox3 box = kdObj->GetBox();
-
-                        const float dist = SqrDistance(vc->GetBox().Center(), box.Center());
-                        renderCost += 1.0f / dist;
-                }
-                else if (mShowDistanceWeightedTriangles)
-                {
-                        const AxisAlignedBox3 box = kdObj->GetBox();
-
-                        const float dist = SqrDistance(vc->GetBox().Center(), box.Center());
-                        renderCost += kdObj->ComputeNumTriangles() / dist;
-                }
-                else //if (mShowWeightedTriangles)
-                {
-                        renderCost += kdObj->ComputeNumTriangles();
-                }
-                //if (pit.Next()->Mail();
-        }
-
-        return renderCost;
-}
-#else
 
 float QtGlRendererWidget::ComputeRenderCost(ViewCell *vc)
@@ -1688 +1662 @@
 #endif
 }
-#endif
-
 
 
@@ -1946 +1918 @@
                 if (0 && (i < 20))
                 {
-                        cout << "pvs1: " << vc->GetPvs().GetSize() << " pvs2: " << compareInfo[i].mPvsSize << " importance: " << importance << endl;
+                        cout << "pvs1: " << vc->GetPvs().GetSize() << " pvs2: " 
+                                 << compareInfo[i].mPvsSize << " importance: " << importance << endl;
                 }