Changeset 2017

Timestamp:

01/22/07 23:35:03 (17 years ago)

Author:

mattausch

Message:

changed to static cast

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (17 diffs)
• Exporter.cpp (modified) (5 diffs)
• GlRenderer.cpp (modified) (2 diffs)
• GlRenderer.h (modified) (1 diff)
• GvsPreprocessor.cpp (modified) (10 diffs)
• HierarchyManager.cpp (modified) (11 diffs)
• IntelRayCaster.cpp (modified) (1 diff)
• KdTree.cpp (modified) (6 diffs)
• OspTree.cpp (modified) (10 diffs)
• Preprocessor.cpp (modified) (4 diffs)
• Preprocessor.h (modified) (2 diffs)
• Preprocessor.vcproj (modified) (2 diffs)
• Pvs.cpp (modified) (8 diffs)
• QtInterface/QtGlViewer.h (modified) (1 diff)
• QtInterface/QtInterface.vcproj (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (1 diff)
• ViewCell.cpp (modified) (20 diffs)
• ViewCellBsp.cpp (modified) (27 diffs)
• ViewCellsManager.cpp (modified) (29 diffs)
• ViewCellsManager.h (modified) (2 diffs)
• ViewCellsParser.cpp (modified) (12 diffs)
• VrmlExporter.cpp (modified) (5 diffs)
• VspBspTree.cpp (modified) (46 diffs)
• VspTree.cpp (modified) (41 diffs)
• X3dExporter.cpp (modified) (6 diffs)
• main.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

@@ -490 +490 @@
 {
         BvhSubdivisionCandidate *sc = 
-                dynamic_cast<BvhSubdivisionCandidate *>(splitCandidate);
+                static_cast<BvhSubdivisionCandidate *>(splitCandidate);
         BvhTraversalData &tData = sc->mParentData;
 
@@ -1994 +1994 @@
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
-        VspViewCell *vc = dynamic_cast<VspViewCell *>(*vit);
+        VspViewCell *vc = static_cast<VspViewCell *>(*vit);
                 VspLeaf *leaf = vc->mLeaves[0];
         
@@ -2060 +2060 @@
                 if (node->IsLeaf()) 
                 {
-                        leaf = dynamic_cast<BvhLeaf *>(node);
+                        leaf = static_cast<BvhLeaf *>(node);
 
                         if (IsObjectInLeaf(leaf, object))
@@ -2070 +2070 @@
                 {       
                         // find point
-                        BvhInterior *interior = dynamic_cast<BvhInterior *>(node);
+                        BvhInterior *interior = static_cast<BvhInterior *>(node);
         
                         if (interior->GetBack()->GetBoundingBox().Includes(object->GetBox()))
@@ -2112 +2112 @@
         if (node->IsLeaf())
         {
-                BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(node);
+                BvhLeaf *leaf = static_cast<BvhLeaf *>(node);
                 const AxisAlignedBox3 box = leaf->GetBoundingBox();
                 stream << "<Leaf"
@@ -2127 +2127 @@
         else
         {       
-                BvhInterior *interior = dynamic_cast<BvhInterior *>(node);
+                BvhInterior *interior = static_cast<BvhInterior *>(node);
                 const AxisAlignedBox3 box = interior->GetBoundingBox();
 
@@ -2215 +2215 @@
         
         // root and bounding box was already constructed
-        BvhLeaf *bvhLeaf = dynamic_cast<BvhLeaf *>(mRoot);
+        BvhLeaf *bvhLeaf = static_cast<BvhLeaf *>(mRoot);
         
         // only rays intersecting objects in node are interesting
@@ -2226 +2226 @@
         // create bvh traversal data
         BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
-        cout << "here4" << endl;
-        
+                
         // create sorted object lists for the first data
         if (mUseGlobalSorting)
@@ -2234 +2233 @@
         }
         
-        cout << "here6" << endl;
         ///////////////////
         //-- add first candidate for object space partition     
@@ -2267 +2265 @@
                 for (cit = candidateContainer.begin(); cit != cit_end; ++ cit)
                 {
-                        BvhSubdivisionCandidate *sCandidate = dynamic_cast<BvhSubdivisionCandidate *>(*cit);
+                        BvhSubdivisionCandidate *sCandidate = static_cast<BvhSubdivisionCandidate *>(*cit);
                         
                         // reevaluate priority
@@ -2295 +2293 @@
         for (int i = 0; i < 3; ++ i)
         {
-                cout << "here2 " << endl;
                 SortableEntryContainer *sortedObjects = new SortableEntryContainer();
 
@@ -2316 +2313 @@
                 delete sortedObjects;
         }
-cout << "here102" << endl;
+
         // last sorted list: by size
         tData.mSortedObjects[3] = new ObjectContainer();
@@ -2390 +2387 @@
 
         const int nRays = CountRays(objects);
-        BvhLeaf *bvhLeaf = dynamic_cast<BvhLeaf *>(mRoot);
+        BvhLeaf *bvhLeaf = static_cast<BvhLeaf *>(mRoot);
 
         // create bvh traversal data
@@ -2517 +2514 @@
 {
         BvhSubdivisionCandidate *sc = 
-                dynamic_cast<BvhSubdivisionCandidate *>(splitCandidate);
+                static_cast<BvhSubdivisionCandidate *>(splitCandidate);
         BvhTraversalData &tData = sc->mParentData;
 
@@ -2531 +2528 @@
                 BvhTraversalData tBackData;
                         
-                BvhInterior *oldInterior = dynamic_cast<BvhInterior *>(oldNode);
+                BvhInterior *oldInterior = static_cast<BvhInterior *>(oldNode);
                 
                 sc->mFrontObjects.clear();
@@ -2667 +2664 @@
 
                 BvhSubdivisionCandidate *bsc = 
-                        dynamic_cast<BvhSubdivisionCandidate *>(candidate);
+                        static_cast<BvhSubdivisionCandidate *>(candidate);
 
                 if (!InitialTerminationCriteriaMet(bsc->mParentData))
@@ -2767 +2764 @@
                 if (node->IsLeaf())
                 {
-                        BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(node);
+                        BvhLeaf *leaf = static_cast<BvhLeaf *>(node);
                         node->mRenderCost = EvalAbsCost(leaf->mObjects);
                 }
                 else
                 {
-                        BvhInterior *interior = dynamic_cast<BvhInterior *>(node);
+                        BvhInterior *interior = static_cast<BvhInterior *>(node);
                 
                         node->mRenderCost = GetRenderCostIncrementially(interior->GetFront()) + 

GTP/trunk/Lib/Vis/Preprocessing/src/Exporter.cpp

@@ -86 +86 @@
         {
                 // eyport leaf pvs
-                KdLeaf *leaf = dynamic_cast<KdLeaf *>(node);
+                KdLeaf *leaf = static_cast<KdLeaf *>(node);
 
                 ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
@@ -171 +171 @@
                 break;
         case Intersectable::TRANSFORMED_MESH_INSTANCE:
-                ExportTransformedMeshInstance(dynamic_cast<TransformedMeshInstance *>(object));
+                ExportTransformedMeshInstance(static_cast<TransformedMeshInstance *>(object));
                 break;
         case Intersectable::VIEW_CELL:
-                ExportViewCell(dynamic_cast<ViewCell *>(object));
+                ExportViewCell(static_cast<ViewCell *>(object));
                 break;
         case Intersectable::KD_INTERSECTABLE:
-                ExportKdIntersectable(*(dynamic_cast<KdIntersectable *>(object)));
+                ExportKdIntersectable(*(static_cast<KdIntersectable *>(object)));
                 break;
         case Intersectable::TRIANGLE_INTERSECTABLE:
                 {
                         // if (mClampToBox && !Overlap(mBoundingBox, object->GetBox()))  return;
-                        const Triangle3 triangle = dynamic_cast<TriangleIntersectable *>(object)->GetItem();
+                        const Triangle3 triangle = static_cast<TriangleIntersectable *>(object)->GetItem();
 
             Polygon3 poly(triangle);
@@ -190 +190 @@
         case Intersectable::BVH_INTERSECTABLE:
                 {
-                        BvhNode *node = dynamic_cast<BvhNode *>(object);
+                        BvhNode *node = static_cast<BvhNode *>(object);
                         
                         if (node->IsLeaf())
                         {
-                                ExportGeometry(dynamic_cast<BvhLeaf *>(node)->mObjects, true);
+                                ExportGeometry(static_cast<BvhLeaf *>(node)->mObjects, true);
                         }
 
@@ -275 +275 @@
                 case Intersectable::TRIANGLE_INTERSECTABLE:
                         {
-                                TriangleIntersectable *ti = dynamic_cast<TriangleIntersectable *>(obj);
+                                TriangleIntersectable *ti = static_cast<TriangleIntersectable *>(obj);
                                 polys.push_back(new Polygon3(ti->GetItem()));
                 break;
@@ -281 +281 @@
                 case Intersectable::MESH_INSTANCE:
                         {
-                                MeshInstance *mi = dynamic_cast<MeshInstance *>(obj);
+                                MeshInstance *mi = static_cast<MeshInstance *>(obj);
                                 ExportMesh(mi->GetMesh());
                                 break;

GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

@@ -139 +139 @@
         break;
   case Intersectable::VIEW_CELL:
-        RenderViewCell(dynamic_cast<ViewCell *>(object));
+        RenderViewCell(static_cast<ViewCell *>(object));
         break;
   case Intersectable::TRANSFORMED_MESH_INSTANCE:
-        RenderTransformedMeshInstance(dynamic_cast<TransformedMeshInstance *>(object));
+        RenderTransformedMeshInstance(static_cast<TransformedMeshInstance *>(object));
         break;
   case Intersectable::TRIANGLE_INTERSECTABLE:
-        RenderTriangle(dynamic_cast<TriangleIntersectable *>(object));
+        RenderTriangle(static_cast<TriangleIntersectable *>(object));
         break;
   case Intersectable::BVH_INTERSECTABLE: {
 
-        BvhNode *node = dynamic_cast<BvhNode *>(object);
+        BvhNode *node = static_cast<BvhNode *>(object);
         
         if (mRenderBoxes)
@@ -158 +158 @@
   }
   case Intersectable::KD_INTERSECTABLE: {
-        KdNode *node = (dynamic_cast<KdIntersectable *>(object))->GetItem();
+        KdNode *node = (static_cast<KdIntersectable *>(object))->GetItem();
         
         if (mRenderBoxes)

GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.h

@@ -195 +195 @@
   };
 friend class GlobalLinesRenderer;
+friend class ViewCellsManager;
+
 protected:
 

GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

@@ -25 +25 @@
 };
 
-static const float MIN_DIST = 0.01f;
+static const float MIN_DIST = 0.001f;
 
 static vector<VizStruct> vizContainer;
@@ -286 +286 @@
                                                                    const VssRay &ray2,
                                                                    const VssRay &oldRay)
-{
+{//cout <<"x"<<Magnitude(p1 - p2) << " ";
         int castRays = 0;
 
@@ -293 +293 @@
         castRays += CheckDiscontinuity(ray2, hitTriangle, oldRay);
 
-        if (EqualVisibility(ray1, ray2) || (Magnitude(p1 - p2) <= MIN_DIST))
+        if (EqualVisibility(ray1, ray2) || (SqrMagnitude(p1 - p2) <= MIN_DIST))
         {
                 return castRays;
@@ -300 +300 @@
         // the new subdivision point
         const Vector3 p = (p1 + p2) * 0.5f;
-
+        //cout << "p: " << p << " " << p1 << " " << p2 << endl;
         // cast ray into the new point
         SimpleRay sray(oldRay.mOrigin, p - oldRay.mOrigin, SamplingStrategy::GVS, 1.0f);
@@ -335 +335 @@
         if (tObj->Type() == Intersectable::TRIANGLE_INTERSECTABLE)
         {
-                hitTriangle = dynamic_cast<TriangleIntersectable *>(tObj)->GetItem();
+                hitTriangle = static_cast<TriangleIntersectable *>(tObj)->GetItem();
         }
         else
@@ -427 +427 @@
 
         CLEAR_CONTAINER(invalidSamples);
-
+//cout << "***********"<< endl;
         return castRays;
 }
@@ -495 +495 @@
         // other types not implemented yet
         if (tObj->Type() == Intersectable::TRIANGLE_INTERSECTABLE)
-                occluder = dynamic_cast<TriangleIntersectable *>(tObj)->GetItem();
+                occluder = static_cast<TriangleIntersectable *>(tObj)->GetItem();
         else
                 cout << "not yet implemented" << endl;
@@ -828 +828 @@
                                 break;
                         }
-
+//if (viewCell->GetId() == 36658)
+//{
                         mViewCells.push_back(viewCell);
+//                      return;
+//}
                 }
 
@@ -859 +862 @@
                 for (oit = leaf->mObjects.begin(); oit != oit_end; ++ oit)
                 {
-                        TriangleIntersectable *triObj = dynamic_cast<TriangleIntersectable *>(*oit);
+                        TriangleIntersectable *triObj = static_cast<TriangleIntersectable *>(*oit);
 
                         if (box.Intersects(triObj->GetItem()))
@@ -1065 +1068 @@
         }
 
-        cout << "here4 " << mKdTree->GetBox() << endl;
-        cout << "here5 " << mViewCellsManager->GetViewSpaceBox() << endl;
         mGvsStats.Stop();
         mGvsStats.Print(mGvsStatsStream);

GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

@@ -1724 +1724 @@
                 if (!mNode->IsLeaf())
                 {
-                        VspInterior *interior = dynamic_cast<VspInterior *>(mNode);
+                        VspInterior *interior = static_cast<VspInterior *>(mNode);
 
                         tQueue.push(new VspNodeWrapper(interior->GetFront()));
@@ -1750 +1750 @@
                 if (!mNode->IsLeaf())
                 {
-                        BvhInterior *interior = dynamic_cast<BvhInterior *>(mNode);
+                        BvhInterior *interior = static_cast<BvhInterior *>(mNode);
 
                         tQueue.push(new BvhNodeWrapper(interior->GetFront()));
@@ -1777 +1777 @@
                 if (!mViewCell->IsLeaf())
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(mViewCell);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(mViewCell);
 
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -1819 +1819 @@
                         {
                                 //cout << "1";
-                                ViewCellWrapper *viewCellWrapper = dynamic_cast<ViewCellWrapper *>(nodeWrapper);
+                                ViewCellWrapper *viewCellWrapper = static_cast<ViewCellWrapper *>(nodeWrapper);
                                 viewCells.push_back(viewCellWrapper->mViewCell);
                         }
@@ -1825 +1825 @@
                         {
                                 //cout << "0";
-                                BvhNodeWrapper *bvhNodeWrapper = dynamic_cast<BvhNodeWrapper *>(nodeWrapper);
+                                BvhNodeWrapper *bvhNodeWrapper = static_cast<BvhNodeWrapper *>(nodeWrapper);
                                 bvhNodes.push_back(bvhNodeWrapper->mNode);
                         }
@@ -1854 +1854 @@
                         cout << "error " << entry.mObject->Type() << endl;
 
-                BvhNode *intersect = dynamic_cast<BvhNode *>(entry.mObject);
+                BvhNode *intersect = static_cast<BvhNode *>(entry.mObject);
                 BvhNode *activeNode;
 
@@ -1861 +1861 @@
                 {
                         activeNode = 
-                                dynamic_cast<BvhLeaf *>(intersect)->GetActiveNode();
+                                static_cast<BvhLeaf *>(intersect)->GetActiveNode();
                 }
                 else
@@ -1921 +1921 @@
                 else if (!vc->IsLeaf()) // interior cells: go down to leaf level
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
 
@@ -1958 +1958 @@
                 {
                         //cout <<" t";
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
 
@@ -2000 +2000 @@
                 {
                         //cout <<" t";
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
 
@@ -2024 +2024 @@
         else
         {
-                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 #if 0
                 ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();

GTP/trunk/Lib/Vis/Preprocessing/src/IntelRayCaster.cpp

@@ -75 +75 @@
         if (castDoubleRay)
         {
-                //cerr<<"HERE"<<endl;
                 Vector3 dir = -simpleRay.mDirection;
                 hittriangle = mlrtaIntersectAS(

GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp

@@ -744 +744 @@
 {
         int hits = 0;
+
         float mint = 0.0f, maxt = 1.0f;
         const Vector3 dir = termination - origin;
@@ -764 +765 @@
         while (1)
         {
-          if (!node->IsLeaf()) {
-                KdInterior *in = (KdInterior *)node;
-                position = in->mPosition;
-                axis = in->mAxis;
-                
-                if (entp[axis] <= position)
-                  {
-                        if (extp[axis] <= position)
-                          {
-                                node = in->mBack;
-                                // cases N1,N2,N3,P5,Z2,Z3
-                                continue;
-                          } 
+                if (!node->IsLeaf())
+                {
+                        KdInterior *in = static_cast<KdInterior *>(node);
+                        position = in->mPosition;
+                        axis = in->mAxis;
+
+                        if (entp[axis] <= position)
+                        {
+                                if (extp[axis] <= position)
+                                {
+                                        node = in->mBack;
+                                        // cases N1,N2,N3,P5,Z2,Z3
+                                        continue;
+                                } 
+                                else
+                                {
+                                        // case N4
+                                        node = in->mBack;
+                                        farChild = in->mFront;
+                                }
+                        }
                         else
-                          {
-                                // case N4
-                                node = in->mBack;
-                                farChild = in->mFront;
-                          }
-                  }
+                        {
+                                if (position <= extp[axis])
+                                {
+                                        node = in->mFront;
+                                        // cases P1,P2,P3,N5,Z1
+                                        continue;
+                                }
+                                else
+                                {
+                                        node = in->mFront;
+                                        farChild = in->mBack;
+                                        // case P4
+                                }
+                        }
+
+                        // $$ modification 3.5.2004 - hints from Kamil Ghais
+                        // case N4 or P4
+                        float tdist = (position - origin[axis]) / dir[axis];
+                        //tStack.push(RayTraversalData(farChild, extp, maxt)); //TODO
+                        extp = origin + dir * tdist;
+                        maxt = tdist;
+                }
                 else
-                  {
-                        if (position <= extp[axis])
-                          {
-                                node = in->mFront;
-                                // cases P1,P2,P3,N5,Z1
-                                continue;
-                          }
-                        else
-                          {
-                                node = in->mFront;
-                                farChild = in->mBack;
-                                // case P4
-                          }
-                  }
-                
-                // $$ modification 3.5.2004 - hints from Kamil Ghais
-                // case N4 or P4
-                float tdist = (position - origin[axis]) / dir[axis];
-                //tStack.push(RayTraversalData(farChild, extp, maxt)); //TODO
-                extp = origin + dir * tdist;
-                maxt = tdist;
-          }
-          else
                 {
-                  // compute intersection with all objects in this leaf
-                  KdLeaf *leaf = (KdLeaf *)node;
-                  
-                  // add view cell to intersections
-                  ViewCell *vc = leaf->mViewCell;
-                  
-                  if (!vc->Mailed()) {
-                        vc->Mail();
-                        viewcells.push_back(vc);
-                        ++ hits;
-                  }
-                  
-                  // get the next node from the stack
-                  if (tStack.empty())
-                        break;
-                  
-                  entp = extp;
-                  mint = maxt;
-                  
-                  RayTraversalData &s  = tStack.top();
-                  node = s.mNode;
-                  extp = s.mExitPoint;
-                  maxt = s.mMaxT;
-                  tStack.pop();
+                        // compute intersection with all objects in this leaf
+                        KdLeaf *leaf = static_cast<KdLeaf *>(node);
+
+                        // add view cell to intersections
+                        ViewCell *vc = leaf->mViewCell;
+
+                        if (!vc->Mailed())
+                        {
+                                vc->Mail();
+                                viewcells.push_back(vc);
+                                ++ hits;
+                        }
+
+                        // get the next node from the stack
+                        if (tStack.empty())
+                                break;
+
+                        entp = extp;
+                        mint = maxt;
+                        
+                        RayTraversalData &s  = tStack.top();
+                        node = s.mNode;
+                        extp = s.mExitPoint;
+                        maxt = s.mMaxT;
+                        tStack.pop();
                 }
         }
-        
+
         return hits;
 }
@@ -1323 +1326 @@
                 {
                         //Debug << "l";
-                        ExportBinLeaf(stream, dynamic_cast<KdLeaf *>(node));
+                        ExportBinLeaf(stream, static_cast<KdLeaf *>(node));
                 }
                 else
                 {
                         //Debug << "i";
-                        KdInterior *interior = dynamic_cast<KdInterior *>(node);
+                        KdInterior *interior = static_cast<KdInterior *>(node);
 
                         ExportBinInterior(stream, interior);
@@ -1350 +1353 @@
         if (nodeType == TYPE_LEAF)
         {
-                return ImportBinLeaf(stream, dynamic_cast<KdInterior *>(parent), objects);
+                return ImportBinLeaf(stream, static_cast<KdInterior *>(parent), objects);
         }
 
         if (nodeType == TYPE_INTERIOR)
         {
-                return ImportBinInterior(stream, dynamic_cast<KdInterior *>(parent));
+                return ImportBinInterior(stream, static_cast<KdInterior *>(parent));
         }
 
@@ -1409 +1412 @@
 
                         //Debug << "i" ;
-                        KdInterior *interior = dynamic_cast<KdInterior *>(node);
+                        KdInterior *interior = static_cast<KdInterior *>(node);
                         interior->mBox = tData.mBox;
 
@@ -1554 +1557 @@
                 if (node->IsLeaf())
                 {
-                        leaves.push_back(dynamic_cast<KdLeaf *>(node));
+                        leaves.push_back(static_cast<KdLeaf *>(node));
                 }
                 else // interior
                 {
-                        KdInterior *interior = dynamic_cast<KdInterior *>(node);
+                        KdInterior *interior = static_cast<KdInterior *>(node);
 
                         if (box.Max(interior->mAxis) >= interior->mPosition)

GTP/trunk/Lib/Vis/Preprocessing/src/OspTree.cpp

@@ -418 +418 @@
                                                    const bool globalCriteriaMet)
 {
-        OspSubdivisionCandidate *sc = dynamic_cast<OspSubdivisionCandidate *>(splitCandidate);
+        OspSubdivisionCandidate *sc = static_cast<OspSubdivisionCandidate *>(splitCandidate);
         OspTraversalData &tData = sc->mParentData;
 
@@ -475 +475 @@
                 if (mStoreRays)
                 {
-                        KdLeaf *leaf = dynamic_cast<KdLeaf *>(newNode);
+                        KdLeaf *leaf = static_cast<KdLeaf *>(newNode);
 
                         RayInfoContainer::const_iterator it, it_end = tData.mRays->end();
@@ -1509 +1509 @@
         if (!node->IsLeaf())
         {
-                return (dynamic_cast<KdInterior *>(node))->mBox;                
-        }
-
-        KdInterior *parent = dynamic_cast<KdInterior *>(node->mParent);
+                return (static_cast<KdInterior *>(node))->mBox;         
+        }
+
+        KdInterior *parent = static_cast<KdInterior *>(node->mParent);
 
         AxisAlignedBox3 box(parent->mBox);
@@ -1575 +1575 @@
                 for (vit = tmpViewCells.begin(); vit != vit_end; ++ vit)
                 {
-                        VspViewCell *vc = dynamic_cast<VspViewCell *>(*vit);
+                        VspViewCell *vc = static_cast<VspViewCell *>(*vit);
 
                         if (!vc->Mailed())
@@ -1590 +1590 @@
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
-                VspViewCell *vc = dynamic_cast<VspViewCell *>(*vit);
+                VspViewCell *vc = static_cast<VspViewCell *>(*vit);
 
                 VspLeaf *leaf = vc->mLeaves[0];
@@ -1630 +1630 @@
                 if (node->IsLeaf()) 
                 {
-                        leaf = dynamic_cast<KdLeaf *>(node);
+                        leaf = static_cast<KdLeaf *>(node);
                 } 
                 else    
                 {       
                         // find point
-                        KdInterior *interior = dynamic_cast<KdInterior *>(node);
+                        KdInterior *interior = static_cast<KdInterior *>(node);
         
                         if (interior->mPosition > pt[interior->mAxis])
@@ -2283 +2283 @@
         if (node->IsLeaf())
         {
-                KdLeaf *leaf = dynamic_cast<KdLeaf *>(node);
+                KdLeaf *leaf = static_cast<KdLeaf *>(node);
 
                 stream << "<Leaf ";
@@ -2295 +2295 @@
         else
         {       
-                KdInterior *interior = dynamic_cast<KdInterior *>(node);
+                KdInterior *interior = static_cast<KdInterior *>(node);
         
                 stream << "<Interior plane=\"" << interior->mPosition << " " 
@@ -2328 +2328 @@
                 if (node->IsLeaf())
                 {
-                        KdLeaf *leaf = dynamic_cast<KdLeaf *>(node);
+                        KdLeaf *leaf = static_cast<KdLeaf *>(node);
 
                         ObjectContainer::const_iterator oit, oit_end = tData.objects->end();
@@ -2340 +2340 @@
                 {
                         KdObjectsTraversalData frontData, backData;
-                        KdInterior *interior = dynamic_cast<KdInterior *>(node);
+                        KdInterior *interior = static_cast<KdInterior *>(node);
 
                         frontData.objects = new ObjectContainer();

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

@@ -208 +208 @@
         cout << "done.\n";
 
+        cout << "deleting render simulator ... \n";
         DEL_PTR(mRenderSimulator);
+        mRenderSimulator = NULL;
+        cout << "deleting renderer ... \n";
         DEL_PTR(renderer);
+        renderer = NULL;
+        cout << "deleting ray caster ... \n";
         DEL_PTR(mRayCaster);
 
 #ifdef USE_CG
+        cout << "deleting global lines renderer ... \n";
         DEL_PTR(mGlobalLinesRenderer);
 #endif
+        cout << "finished" << endl;
 }
 
@@ -336 +343 @@
                 if (obj->Type() == Intersectable::TRIANGLE_INTERSECTABLE)
                 {
-                        Triangle3 tri = dynamic_cast<TriangleIntersectable *>(obj)->GetItem();
+                        Triangle3 tri = static_cast<TriangleIntersectable *>(obj)->GetItem();
 
                         samplesOut.write(reinterpret_cast<char *>(tri.mVertices + 0), sizeof(Vector3));
@@ -370 +377 @@
                 if (obj->Type() == Intersectable::TRIANGLE_INTERSECTABLE)
                 {
-                        Triangle3 tri = dynamic_cast<TriangleIntersectable *>(obj)->GetItem();
+                        Triangle3 tri = static_cast<TriangleIntersectable *>(obj)->GetItem();
                         //if (!(bbox.IsInside(tri.mVertices[0]) && bbox.IsInside(tri.mVertices[1]) && bbox.IsInside(tri.mVertices[2])))continue;
                         
@@ -391 +398 @@
                 if (obj->Type() == Intersectable::TRIANGLE_INTERSECTABLE)
                 {
-                        //Triangle3 tri = dynamic_cast<TriangleIntersectable *>(obj)->GetItem();
+                        //Triangle3 tri = static_cast<TriangleIntersectable *>(obj)->GetItem();
                         //if (!(bbox.IsInside(tri.mVertices[0]) && bbox.IsInside(tri.mVertices[1]) && bbox.IsInside(tri.mVertices[2]))) continue;
                         
-                        Triangle3 tri = dynamic_cast<TriangleIntersectable *>(obj)->GetItem();
+                        Triangle3 tri = static_cast<TriangleIntersectable *>(obj)->GetItem();
                         samplesOut << "f " << i << " " << i + 1 << " " << i + 2 << endl;
                         i += 3;

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.h

@@ -262 +262 @@
         /////////////////////////
 
-  GlobalLinesRenderer *mGlobalLinesRenderer;
-  RayCaster *mRayCaster;
-  /// samples used for construction of the BSP view cells tree.
+        GlobalLinesRenderer *mGlobalLinesRenderer;
+
+        RayCaster *mRayCaster;
+        /// samples used for construction of the BSP view cells tree.
         int mBspConstructionSamples;
         /// samples used for construction of the VSP OSP tree.
@@ -281 +282 @@
 };
 
-  extern Preprocessor *preprocessor;
+extern Preprocessor *preprocessor;
 
 }

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj

@@ -213 +213 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="3"
+                                GlobalOptimizations="TRUE"
                                 InlineFunctionExpansion="0"
-                                FavorSizeOrSpeed="0"
+                                EnableIntrinsicFunctions="TRUE"
+                                FavorSizeOrSpeed="1"
+                                OmitFramePointers="TRUE"
+                                EnableFiberSafeOptimizations="TRUE"
                                 OptimizeForProcessor="3"
                                 OptimizeForWindowsApplication="TRUE"
@@ -221 +225 @@
                                 ExceptionHandling="TRUE"
                                 RuntimeLibrary="2"
+                                EnableEnhancedInstructionSet="2"
                                 DisableLanguageExtensions="FALSE"
                                 ForceConformanceInForLoopScope="FALSE"
-                                RuntimeTypeInfo="TRUE"
+                                RuntimeTypeInfo="FALSE"
                                 UsePrecompiledHeader="0"
                                 BrowseInformation="1"

GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.cpp

@@ -42 +42 @@
                         if (node->IsLeaf())
                         {
-                                KdLeaf *leaf = dynamic_cast<KdLeaf *>(node);
+                                KdLeaf *leaf = static_cast<KdLeaf *>(node);
                        
                                 // add #objects exclusivly in this node
@@ -64 +64 @@
                         else // traverse tree
                         {
-                                KdInterior *interior = dynamic_cast<KdInterior *>(node);
+                                KdInterior *interior = static_cast<KdInterior *>(node);
 
                                 tStack.push(interior->mFront);
@@ -85 +85 @@
         // hack for choosing which node to account for
         if (bvhObj->IsLeaf())
-                node = dynamic_cast<BvhLeaf *>(bvhObj)->GetActiveNode();
+                node = static_cast<BvhLeaf *>(bvhObj)->GetActiveNode();
         else
                 node = bvhObj;
@@ -92 +92 @@
         if (node->IsLeaf())     
         {       
-                BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(node);
+                BvhLeaf *leaf = static_cast<BvhLeaf *>(node);
                 // objects already accounted for
                 if (leaf->Mailed())
@@ -118 +118 @@
                         if (node->IsLeaf())
                         {
-                                BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(node);
+                                BvhLeaf *leaf = static_cast<BvhLeaf *>(node);
 
                                 // add #objects exclusivly in this node
@@ -125 +125 @@
                         else // traverse tree
                         {
-                                BvhInterior *interior = dynamic_cast<BvhInterior *>(node);
+                                BvhInterior *interior = static_cast<BvhInterior *>(node);
 
                                 tStack.push(interior->GetFront());
@@ -156 +156 @@
                                 {
                                         // found kd node
-                                        KdIntersectable *kdObj = dynamic_cast<KdIntersectable *>(obj);
+                                        KdIntersectable *kdObj = static_cast<KdIntersectable *>(obj);
                                         pvs += EvalKdNodeContribution(kdObj);   
                                         break;
@@ -162 +162 @@
                         case Intersectable::BVH_INTERSECTABLE:
                                 {
-                                        BvhNode *bvhObj = dynamic_cast<BvhNode *>(obj);
+                                        BvhNode *bvhObj = static_cast<BvhNode *>(obj);
                                         pvs += EvalBvhNodeContribution(bvhObj);
                                         break;

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

@@ -12 +12 @@
 {
 
-  Q_OBJECT
+  //Q_OBJECT
 
         friend class QtGlRendererWidget;

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

@@ -180 +180 @@
                                 Name="VCMIDLTool"/>
                         <Tool
-                                Name="VCPostBuildEventTool"
-                                Description="&quot;copy dll to preprocessor dir&quot;"
-                                CommandLine="copy Release\*.dll ..\..\bin\"/>
+                                Name="VCPostBuildEventTool"/>
                         <Tool
                                 Name="VCPreBuildEventTool"/>

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -189 +189 @@
                                 GlobalOptimizations="TRUE"
                                 InlineFunctionExpansion="2"
-                                FavorSizeOrSpeed="1"
+                                EnableIntrinsicFunctions="TRUE"
+                                FavorSizeOrSpeed="1"
+                                OmitFramePointers="TRUE"
                                 EnableFiberSafeOptimizations="TRUE"
                                 OptimizeForProcessor="3"
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT3"
-                                RuntimeLibrary="2"
-                                RuntimeTypeInfo="TRUE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT"
+                                RuntimeLibrary="2"
+                                EnableEnhancedInstructionSet="2"
+                                RuntimeTypeInfo="FALSE"
                                 UsePrecompiledHeader="0"
                                 WarningLevel="3"

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

@@ -471 +471 @@
                 else
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -504 +504 @@
                 else
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
 
@@ -1274 +1274 @@
 
         
-        ViewCellInterior *p = dynamic_cast<ViewCellInterior *>(leaf->GetParent());
+        ViewCellInterior *p = static_cast<ViewCellInterior *>(leaf->GetParent());
 
         p->RemoveChildLink(leaf);
@@ -1285 +1285 @@
         float cost1, cost2;
 
-        ViewCellInterior *vc1 = dynamic_cast<ViewCellInterior *>(mc.GetLeftViewCell());
-        ViewCellInterior *vc2 = dynamic_cast<ViewCellInterior *>(mc.GetRightViewCell());
+        ViewCellInterior *vc1 = static_cast<ViewCellInterior *>(mc.GetLeftViewCell());
+        ViewCellInterior *vc2 = static_cast<ViewCellInterior *>(mc.GetRightViewCell());
 
         ViewCell *leaf1 = mc.GetInitialLeftViewCell();
@@ -1480 +1480 @@
         if (!root->IsLeaf())
         {
-                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(root);
+                ViewCellInterior *interior = static_cast<ViewCellInterior *>(root);
 
         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -1577 +1577 @@
                 if (!vc->IsLeaf()) 
                 {       
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
                         const float parentCost = GetPvsCost(interior);
@@ -1651 +1651 @@
                 else 
                 {       
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -1789 +1789 @@
                 if (!vc->IsLeaf()) // interior cells: go down to leaf level
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
 
@@ -1925 +1925 @@
                 if (!vc->IsLeaf())
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
 
@@ -1976 +1976 @@
                 if (!vc->IsLeaf())
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -2068 +2068 @@
         if (!root->IsLeaf())
         {
-                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(root);
+                ViewCellInterior *interior = static_cast<ViewCellInterior *>(root);
 
                 ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -2126 +2126 @@
                 if (!viewCell->IsLeaf())
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(viewCell);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(viewCell);
 
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -2156 +2156 @@
                 if (!vc->IsLeaf()) 
                 {       
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                   
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -2219 +2219 @@
                 if (!vc->IsLeaf()) 
                 {       
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
                         const float parentCost = GetPvsCost(interior);
@@ -2284 +2284 @@
                 if (!vc->IsLeaf()) 
                 {       
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
 
                         const float parentPvsCost = GetPvsCost(interior);
@@ -2372 +2372 @@
                 if (!vc->IsLeaf())
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                         
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
@@ -2397 +2397 @@
                 {
                         ObjectContainer objects; 
-                        BvhNode *node = dynamic_cast<BvhNode *>(obj);
+                        BvhNode *node = static_cast<BvhNode *>(obj);
                         node->CollectObjects(objects);
                 
@@ -2422 +2422 @@
                 stream << "<Leaf ";
                 stream << "id=\"" << viewCell->GetId() << "\" ";
-                stream << "active=\"" << dynamic_cast<ViewCellLeaf *>(viewCell)->GetActiveViewCell()->GetId() << "\" ";
+                stream << "active=\"" << static_cast<ViewCellLeaf *>(viewCell)->GetActiveViewCell()->GetId() << "\" ";
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
                 stream << "pvs=\"";
@@ -2435 +2435 @@
         else
         {
-                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(viewCell);
+                ViewCellInterior *interior = static_cast<ViewCellInterior *>(viewCell);
         
                 stream << "<Interior ";
@@ -2481 +2481 @@
                 if (!vc->IsLeaf())
                 {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(vc);
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp

@@ -498 +498 @@
                 if (!tData.mNode->IsLeaf())
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(tData.mNode);
+                        BspInterior *interior = static_cast<BspInterior *>(tData.mNode);
 
                         ///////////////////
@@ -636 +636 @@
                 {
                 case Intersectable::MESH_INSTANCE:
-                        mesh = dynamic_cast<MeshInstance *>(object)->GetMesh();
+                        mesh = static_cast<MeshInstance *>(object)->GetMesh();
                         break;
                 case Intersectable::VIEW_CELL:
-                        mesh = dynamic_cast<ViewCell *>(object)->GetMesh();
+                        mesh = static_cast<ViewCell *>(object)->GetMesh();
                         break;
                 case Intersectable::TRANSFORMED_MESH_INSTANCE:
                         {
-                                TransformedMeshInstance *mi = dynamic_cast<TransformedMeshInstance *>(object);
+                                TransformedMeshInstance *mi = static_cast<TransformedMeshInstance *>(object);
 
                                 if (!mi->GetMesh())     
@@ -801 +801 @@
                 if (!ray->intersections.empty())
                 {
-                        MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->intersections[0].mObject);
+                        MeshInstance *obj = static_cast<MeshInstance *>(ray->intersections[0].mObject);
 
                         Mesh *mesh;
@@ -807 +807 @@
                         {
                                 TransformedMeshInstance *tmobj = 
-                                        dynamic_cast<TransformedMeshInstance *>(obj);
+                                        static_cast<TransformedMeshInstance *>(obj);
                         
                                 mesh = new Mesh();
@@ -1006 +1006 @@
         if (TerminationCriteriaMet(tData))              
         {
-                BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);
+                BspLeaf *leaf = static_cast<BspLeaf *>(tData.mNode);
         
                 BspViewCell *viewCell;
@@ -1017 +1017 @@
                 {       
                         // add predefined view cell to leaf
-                        viewCell = dynamic_cast<BspViewCell *>(tData.mViewCell);
+                        viewCell = static_cast<BspViewCell *>(tData.mViewCell);
 
                         // out of bounds cell can be handled as any other view cell,
@@ -1154 +1154 @@
                 if (DotProd((*it)->GetNormal(), splitPlane.mNormal) > 0)
                 {
-                        backData.mViewCell = dynamic_cast<ViewCellLeaf *>((*it)->mParent);
+                        backData.mViewCell = static_cast<ViewCellLeaf *>((*it)->mParent);
                         foundBack = true;
                 }
                 else
                 {
-                        frontData.mViewCell = dynamic_cast<ViewCellLeaf *>((*it)->mParent);
+                        frontData.mViewCell = static_cast<ViewCellLeaf *>((*it)->mParent);
                         foundFront = true;
                 }
@@ -1173 +1173 @@
         mStat.nodes += 2;
         
-        BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);   
+        BspLeaf *leaf = static_cast<BspLeaf *>(tData.mNode);    
         
         // select subdivision plane
@@ -1972 +1972 @@
                 else 
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         nodeStack.push(interior->GetBack());
@@ -1990 +1990 @@
 {
         // the node became a leaf -> evaluate stats for leafs
-        BspLeaf *leaf = dynamic_cast<BspLeaf *>(data.mNode);
+        BspLeaf *leaf = static_cast<BspLeaf *>(data.mNode);
 
         // store maximal and minimal depth
@@ -2055 +2055 @@
                 if (!node->IsLeaf()) 
                 {
-                        BspInterior *in = dynamic_cast<BspInterior *>(node);
+                        BspInterior *in = static_cast<BspInterior *>(node);
                         
                         Plane3 splitPlane = in->GetPlane();
@@ -2097 +2097 @@
                 } else // reached leaf => intersection with view cell
                 {
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        BspLeaf *leaf = static_cast<BspLeaf *>(node);
       
                         if (!leaf->mViewCell->Mailed())
@@ -2154 +2154 @@
                 if (!node->IsLeaf())  
                 {
-                        BspInterior *in = dynamic_cast<BspInterior *>(node);
+                        BspInterior *in = static_cast<BspInterior *>(node);
 
                         Plane3 splitPlane = in->GetPlane();
@@ -2202 +2202 @@
                 {
                         // reached leaf => intersection with view cell
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        BspLeaf *leaf = static_cast<BspLeaf *>(node);
                 
                         if (!leaf->mViewCell->Mailed()) 
@@ -2246 +2246 @@
                 if (node->IsLeaf()) 
                 {
-                        ViewCellLeaf *viewCell = dynamic_cast<BspLeaf *>(node)->mViewCell;
+                        ViewCellLeaf *viewCell = static_cast<BspLeaf *>(node)->mViewCell;
 
                         if (!viewCell->Mailed()) 
@@ -2256 +2256 @@
                 else 
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         nodeStack.push(interior->GetFront());
@@ -2372 +2372 @@
                 if (n)
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(n);
-                        Plane3 halfSpace = dynamic_cast<BspInterior *>(interior)->GetPlane();
+                        BspInterior *interior = static_cast<BspInterior *>(n);
+                        Plane3 halfSpace = static_cast<BspInterior *>(interior)->GetPlane();
 
             if (interior->GetBack() != lastNode)
@@ -2403 +2403 @@
                         continue;
 
-                BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*it);
+                BspViewCell *bspVc = static_cast<BspViewCell *>(*it);
                 vector<BspLeaf *>::const_iterator bit, bit_end = bspVc->mLeaves.end();
 
@@ -2592 +2592 @@
                                 if (isAdjacent)
                                 {       
-                                        neighbors.push_back(dynamic_cast<BspLeaf *>(node));
+                                        neighbors.push_back(static_cast<BspLeaf *>(node));
                                 }
                         }
@@ -2598 +2598 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         const int cf = Polygon3::ClassifyPlane(nodeGeom.GetPolys(),
@@ -2660 +2660 @@
                 {
                         if ( (!onlyUnmailed || !node->Mailed()) )
-                                return dynamic_cast<BspLeaf *>(node);
+                                return static_cast<BspLeaf *>(node);
                 }
                 else 
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         // random decision
@@ -2829 +2829 @@
 
                 iit = ray->mViewCells.begin();
-                BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*(iit ++));
+                BspViewCell *bspVc = static_cast<BspViewCell *>(*(iit ++));
                 BspLeaf *leaf = bspVc->mLeaves[0];
                 
@@ -2838 +2838 @@
                         // next pair
                         BspLeaf *prevLeaf = leaf;
-                        bspVc = dynamic_cast<BspViewCell *>(*iit);
+                        bspVc = static_cast<BspViewCell *>(*iit);
             leaf = bspVc->mLeaves[0];
 
@@ -3340 +3340 @@
                 if (node->IsLeaf()) 
                 {
-                        viewcell = dynamic_cast<BspLeaf *>(node)->mViewCell;
+                        viewcell = static_cast<BspLeaf *>(node)->mViewCell;
                         break;
                 } 
@@ -3346 +3346 @@
                 {
 
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         // random decision
@@ -3375 +3375 @@
         if (node->IsLeaf())
         {
-                BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                BspLeaf *leaf = static_cast<BspLeaf *>(node);
                 ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
 
@@ -3384 +3384 @@
         else
         {
-                BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                BspInterior *interior = static_cast<BspInterior *>(node);
         
                 Plane3 plane = interior->GetPlane();

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -238 +238 @@
                 mEvaluationSamplingType = SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION;
         }
-        /*else if (strcmp(buf, "interior") == 0)
-        {
-                mEvaluationSamplingType = SamplingStrategy::OBJECTS_INTERIOR_DISTRIBUTION;
-        }*/
         else
         {
@@ -311 +307 @@
 
 
+ViewCell *ViewCellsManager::GetViewCellById(const int id)
+{
+        ViewCellContainer::const_iterator vit, vit_end = mViewCells.end();
+
+        for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
+        {
+                if ((*vit)->GetId() == id)
+                        return (*vit);
+        }
+        return NULL;
+}
+
+
+bool ViewCellsManager::ExportRandomViewCells(const string &filename,
+                                                                                         const vector<ViewCellPoints *> &viewCells)
+{
+        std::ofstream outStream;
+        outStream.open(filename.c_str());
+
+        vector<ViewCellPoints *>::const_iterator vit, vit_end = viewCells.end();
+    
+        for (vit = viewCells.begin(); vit != vit_end; ++ vit)
+        {
+                ViewCell *vc = (*vit)->first;
+
+                outStream << "v " << vc->GetId() << endl;
+
+                SimpleRayContainer viewPoints;
+        
+                SimpleRayContainer::const_iterator pit, pit_end = (*vit)->second.end();
+
+                for (pit = (*vit)->second.begin(); pit != pit_end; ++ pit)
+                {
+                        const Vector3 pt = (*pit).mOrigin;
+                        const Vector3 dir = (*pit).mDirection;
+
+                        outStream << "p " << pt.x  << " " << pt.y  << " " << pt.z 
+                                      << " "  << dir.x << " " << dir.y << " " << dir.z << endl;
+                }
+        }
+
+        return true;
+}
+
+
+bool ViewCellsManager::GenerateRandomViewCells(vector<ViewCellPoints *> &viewCells,
+                                                                                           const int nViewCells,
+                                                                                           const int nViewPoints)
+{
+        ViewCellContainer rViewCells;
+
+        cout << "generating " << nViewCells << " random view cells" << endl;
+        GenerateRandomViewCells(rViewCells, nViewCells);
+
+        cout << "finished" << endl;
+
+        //for (int i = 0; i < viewCells.size(); ++ i)
+        //      cout << "vc " << i << ": " << viewCells[i]->GetId() << endl;
+
+        cout << "generating " << nViewPoints << " view points per view cell" << endl;
+        ViewCellContainer::const_iterator vit, vit_end = rViewCells.end();
+    
+        for (vit = rViewCells.begin(); vit != vit_end; ++ vit)
+        {
+                ViewCell *vc = *vit;
+
+                ViewCellPoints *vcPts = new ViewCellPoints();
+                viewCells.push_back(vcPts);
+
+                vcPts->first = vc;
+
+                SimpleRayContainer viewPoints;
+                // generate random view points
+                GenerateViewPoints(vc, nViewPoints, viewPoints);
+                
+                SimpleRayContainer::const_iterator pit, pit_end = viewPoints.end();
+
+                for (pit = viewPoints.begin(); pit != pit_end; ++ pit)
+                {
+                        vcPts->second.push_back(*pit);  
+                }
+        }
+
+        return true;
+}
+
+
+bool ViewCellsManager::ImportRandomViewCells(const string &filename, 
+                                                                                         vector<ViewCellPoints *> &viewCells)
+{
+        ifstream inStream(filename.c_str());
+        if (!inStream.is_open())
+                return false;
+
+        ViewCellPoints *currentViewCell = NULL;
+
+        string buf;
+        while (!(getline(inStream, buf)).eof())
+        {
+                switch (buf[0])
+                {
+                case 'v':
+                        {
+                                int id;
+                                sscanf(buf.c_str(), "v %d", &id);
+                        
+                                currentViewCell = new ViewCellPoints();
+                                currentViewCell->first = GetViewCellById(id);
+                                                
+                                viewCells.push_back(currentViewCell);
+                                break;
+                        }
+                case 'p':
+                        {
+                                Vector3 pt, dir;
+                                sscanf(buf.c_str(), "p %f %f %f %f %f %f", &pt.x, &pt.y, &pt.z, &dir.x, &dir.y, &dir.z);
+                                
+                                SimpleRay ray(pt, dir, 0, 1);
+                                currentViewCell->second.push_back(ray);
+                                break;
+                        }
+                default:
+                        break;
+                }
+        }
+
+        return true;
+}
+
+
+bool ViewCellsManager::GenerateViewPoints(ViewCell *viewCell, 
+                                                                                  const int numViewPoints,
+                                                                                  SimpleRayContainer &viewPoints)
+{
+        bool success = true;
+        int generatedPts = 0;
+        int i = 0;
+
+        while (generatedPts < numViewPoints)
+        {
+                SimpleRay pt;
+
+                if (GenerateViewPoint(viewCell, pt))
+                {
+                        ++ generatedPts;
+                        viewPoints.push_back(pt);
+                }
+
+                // savety criterium
+                if (++ i > numViewPoints + 100000)
+                {
+                        return false;
+                }
+        }
+        
+        return true;
+}
+
+
+bool ViewCellsManager::GenerateViewPoint(ViewCell *viewCell, 
+                                                                                 SimpleRay &ray)
+{
+        // do not use this function since it could return different viewpoints for
+        // different executions of the algorithm
+        int tries = 0;
+        Vector3 viewPoint, direction;
+        const int maxTries = 100;
+
+        while (1) 
+        {
+                // hack
+                if (!viewCell->GetMesh())
+                        CreateMesh(viewCell);
+
+        Mesh *mesh = viewCell->GetMesh();
+                AxisAlignedBox3 box = mesh->mBox;
+                //cout <<"box: " << box << endl;
+                /*Vector3 pVector = Vector3(halton.GetNumber(1),
+                                                                  halton.GetNumber(2),
+                                                                  halton.GetNumber(3));*/
+
+                Vector3 pVector = Vector3(Random(1.0f),
+                                                                  Random(1.0f),
+                                                                  Random(1.0f));
+
+                viewPoint =  box.GetPoint(pVector);
+        
+                //const Vector3 dVector = Vector3(2 * M_PI * halton.GetNumber(4), M_PI*halton.GetNumber(5),0.0f);
+                const Vector3 dVector = Vector3(2 * M_PI * Random(1.0f), M_PI * Random(1.0f), 0.0f);
+                direction = Normalize(Vector3(sin(dVector.x), 0.0f, cos(dVector.x)));
+                //halton.GenerateNext();
+
+                //cout << "vp: " << viewPoint << endl;
+                //cout << "dir: " << direction << endl;
+
+                ViewCell *v = GetViewCell(viewPoint);
+
+                if (v && v->GetValid())
+                {
+                        //cout << "validating view point" << endl;
+
+                        mPreprocessor->GetRenderer()->mViewPoint = viewPoint;
+                        mPreprocessor->GetRenderer()->mViewDirection = direction;
+
+                        if (mPreprocessor->GetRenderer()->ValidViewPoint())
+                        {
+                                cout << "view point valid" << endl;
+                                break;
+                        }
+                }
+
+                // generate a new vector
+                //halton.GenerateNext();
+
+                //if (!box.IsInside(viewPoint))
+                //      cout << "error!" << endl;
+                if (++ tries > maxTries)
+                        return false;
+        }
+
+        ray = SimpleRay(viewPoint, direction, 0, 1);
+        //cout << "view point generated: " << viewPoint << " " << direction << endl;
+
+        return true;
+}
+
+
+bool ViewCellsManager::IsValidViewSpace(ViewCell *vc)
+{
+        SimpleRay simpleRay;
+        //check if view point can be generated
+        return GenerateViewPoint(vc, simpleRay);
+}
+
+
+bool ViewCellsManager::GenerateRandomViewCells(ViewCellContainer &viewCells, 
+                                                                                           const int numViewCells)
+{
+        int generatedViewCells = 0;
+        //HaltonSequence halton;
+        //float r[1];
+
+        ViewCell::NewMail();
+
+        while (generatedViewCells < numViewCells)
+        {
+                // savety criterium
+                const int tries = 100000 + generatedViewCells;
+                int i = 0;
+
+                // generate next view cell
+                while (1)
+                {
+                        //halton.GetNext(1, r);
+                        //const int idx = (int)(r[0] * mViewCells.size() - 1.0f);
+                        const int idx = (int)RandomValue(0.0f, (float)mViewCells.size() - 0.5f);
+                        
+                        ViewCell *viewCell = GetViewCell(idx);
+
+                        if (!viewCell->Mailed())
+                        {
+                                viewCell->Mail();
+
+                                // check for valid view space
+                                if (IsValidViewSpace(viewCell))
+                                {
+                                        // valid view cell found
+                                        viewCells.push_back(viewCell);
+
+                        ++ generatedViewCells;
+                                        //cout << "view cell " << generatedViewCells << " generated: " << viewCell->GetId() << endl;    
+                                        break;
+                                }
+                                else
+                                {
+                                        cout << "error: invalid view cell " << generatedViewCells << " generated: " << viewCell->GetId() << endl;       
+                                }
+                        }
+
+                        if (++ i == tries) // no new view cell fond
+                        {
+                                cerr << "big error! no view cell found" << endl;
+                                return false;
+                        }               
+                }                       
+        }
+
+        return true;
+}
+
+
 ViewCellsManager::~ViewCellsManager()
 {
@@ -575 +862 @@
                 mRenderer->RenderScene();
                 SimulationStatistics ss;
-                dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
+                static_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
 
                 Debug << ss << endl;
@@ -1616 +1903 @@
                         if ((*oit)->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
                         {
-                                TransformedMeshInstance *mit = dynamic_cast<TransformedMeshInstance *>(*oit);
+                                TransformedMeshInstance *mit = static_cast<TransformedMeshInstance *>(*oit);
                                 mesh = MeshManager::GetSingleton()->CreateResource();
                                 mit->GetTransformedMesh(*mesh);
@@ -1622 +1909 @@
                         else if ((*oit)->Type() == Intersectable::MESH_INSTANCE)
                         {
-                                MeshInstance *mit = dynamic_cast<MeshInstance *>(*oit);
+                                MeshInstance *mit = static_cast<MeshInstance *>(*oit);
                                 mesh = mit->GetMesh();
                         }
@@ -2608 +2895 @@
         for (lit = leaves.begin(); lit != lit_end; ++ lit)
         {
-                dynamic_cast<ViewCellLeaf *>(*lit)->SetActiveViewCell(vc);
+                static_cast<ViewCellLeaf *>(*lit)->SetActiveViewCell(vc);
         }
 }
@@ -2648 +2935 @@
                 for (it = objects.begin(); it != it_end; ++ it)
                 {
-                        MeshInstance *mi = dynamic_cast<MeshInstance *>(*it);
+                        MeshInstance *mi = static_cast<MeshInstance *>(*it);
                         const AxisAlignedBox3 box = mi->GetBox();
 
@@ -2671 +2958 @@
                 for (it = objects.begin(); it != it_end; ++ it)
                 {       
-                        MeshInstance *mi = dynamic_cast<MeshInstance *>(*it);
+                        MeshInstance *mi = static_cast<MeshInstance *>(*it);
                         const AxisAlignedBox3 box = mi->GetBox();
                         Vector3 bmin = box.Min();
@@ -3252 +3539 @@
         //-- interior node => propagate pvs up the tree
 
-        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(root);
+        ViewCellInterior *interior = static_cast<ViewCellInterior *>(root);
 
         // reset interior pvs
@@ -3920 +4207 @@
 
         Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
-
+        
         IncludeNodeGeomInMesh(geom, *mesh);
+        mesh->ComputeBoundingBox();
+
         vc->SetMesh(mesh);
 }
@@ -4101 +4390 @@
         if (root->IsLeaf())
         {
-                BspLeaf *leaf = dynamic_cast<BspLeaf *>(root);
+                BspLeaf *leaf = static_cast<BspLeaf *>(root);
                 leaf->GetViewCell()->SetMergeCost(0.0f);
                 return leaf->GetViewCell();
         }
         
-        BspInterior *interior = dynamic_cast<BspInterior *>(root);
+        BspInterior *interior = static_cast<BspInterior *>(root);
         ViewCellInterior *viewCellInterior = new ViewCellInterior();
                 
@@ -4243 +4532 @@
 
                 for (int i = 0; i < leafOut; ++ i)
-                        kdLeaves.push_back(dynamic_cast<KdLeaf *>(mKdTree->GetRandomLeaf()));
+                        kdLeaves.push_back(static_cast<KdLeaf *>(mKdTree->GetRandomLeaf()));
 
                 for (int i = 0; i < kdLeaves.size(); ++ i)
@@ -4406 +4695 @@
         for (it = leaves.begin(); it != it_end; ++ it)
         {
-                KdViewCell *kdVc = dynamic_cast<KdViewCell *>(*it);
+                KdViewCell *kdVc = static_cast<KdViewCell *>(*it);
                 exporter->ExportBox(mKdTree->GetBox(kdVc->mLeaves[0]));
         }
@@ -4746 +5035 @@
 
         SimulationStatistics ss;
-        dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
+        static_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
     Debug << "render time before refine\n\n" << ss << endl;
 
@@ -4826 +5115 @@
 
         cout << "\nview cells partition render time before compress" << endl << endl;;
-        dynamic_cast<RenderSimulator *>(mRenderer)->RenderScene();
+        static_cast<RenderSimulator *>(mRenderer)->RenderScene();
         SimulationStatistics ss;
-        dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
+        static_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
         cout << ss << endl;
         
@@ -4857 +5146 @@
         if (root->IsLeaf())
         {
-                BspLeaf *leaf = dynamic_cast<BspLeaf *>(root);
+                BspLeaf *leaf = static_cast<BspLeaf *>(root);
                 leaf->GetViewCell()->SetMergeCost(0.0f);
                 return leaf->GetViewCell();
@@ -4863 +5152 @@
         
         
-        BspInterior *interior = dynamic_cast<BspInterior *>(root);
+        BspInterior *interior = static_cast<BspInterior *>(root);
         ViewCellInterior *viewCellInterior = new ViewCellInterior();
                 
@@ -5095 +5384 @@
                 for (vit = leaves.begin(); vit != vit_end; ++ vit)
                         {       
-                                BspLeaf *vcLeaf = dynamic_cast<BspViewCell *>(*vit)->mLeaves[0];
+                                BspLeaf *vcLeaf = static_cast<BspViewCell *>(*vit)->mLeaves[0];
                                 VssRayContainer::const_iterator rit, rit_end = vcLeaf->mVssRays.end();
 
@@ -5387 +5676 @@
                 for (int j = 0; j < (int)leaves.size(); ++ j)
                 {
-                        BspLeaf *leaf = dynamic_cast<BspViewCell *>(leaves[i])->mLeaves[0];
+                        BspLeaf *leaf = static_cast<BspViewCell *>(leaves[i])->mLeaves[0];
 
                         if (i != j)
                         {
-                                BspLeaf *leaf2 =dynamic_cast<BspViewCell *>(leaves[j])->mLeaves[0];
+                                BspLeaf *leaf2 =static_cast<BspViewCell *>(leaves[j])->mLeaves[0];
                                 const int dist = mVspBspTree->TreeDistance(leaf, leaf2);
                                 
@@ -5422 +5711 @@
         
         Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
+        
         IncludeNodeGeomInMesh(geom, *mesh);
+        mesh->ComputeBoundingBox();
 
         vc->SetMesh(mesh);
@@ -5500 +5791 @@
 {
         // TODO: do I still need this here?
-        if (0)
-                mVspBspTree->RepairViewCellsLeafLists();
+        if (0) mVspBspTree->RepairViewCellsLeafLists();
 }
 
@@ -5748 +6038 @@
 
         cout << "\nview cells partition render time before compress" << endl << endl;
-        dynamic_cast<RenderSimulator *>(mRenderer)->RenderScene();
+        static_cast<RenderSimulator *>(mRenderer)->RenderScene();
         SimulationStatistics ss;
-        dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
+        static_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
         cout << ss << endl;
         
@@ -5782 +6072 @@
         if (root->IsLeaf())
         {
-                VspLeaf *leaf = dynamic_cast<VspLeaf *>(root);
+                VspLeaf *leaf = static_cast<VspLeaf *>(root);
                 leaf->GetViewCell()->SetMergeCost(0.0f);
                 return leaf->GetViewCell();
         }
         
-        VspInterior *interior = dynamic_cast<VspInterior *>(root);
+        VspInterior *interior = static_cast<VspInterior *>(root);
         ViewCellInterior *viewCellInterior = new ViewCellInterior();
                 
@@ -5861 +6151 @@
         for (it = leaves.begin(); it != it_end; ++ it)
         {
-                VspViewCell *vspVc = dynamic_cast<VspViewCell *>(*it);
+                VspViewCell *vspVc = static_cast<VspViewCell *>(*it);
                 VspLeaf *l = vspVc->mLeaves[0];
 
@@ -5927 +6217 @@
                         ObjectPvsEntry entry = pit.Next();
                                 
-                        BvhNode *node = dynamic_cast<BvhNode *>(entry.mObject);
+                        BvhNode *node = static_cast<BvhNode *>(entry.mObject);
                         
                         // hack!!
@@ -6165 +6455 @@
                         for (vit = leaves.begin(); vit != vit_end; ++ vit)
                         {
-                                VspLeaf *vcLeaf = dynamic_cast<VspViewCell *>(*vit)->mLeaves[0];
+                                VspLeaf *vcLeaf = static_cast<VspViewCell *>(*vit)->mLeaves[0];
                                 VssRayContainer::const_iterator rit, rit_end = vcLeaf->mVssRays.end();
 
@@ -6311 +6601 @@
 void VspOspViewCellsManager::CreateMesh(ViewCell *vc)
 {
-        // matt: TODO
         Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
-
+        
         ViewCellContainer leaves;
         mViewCellsTree->CollectLeaves(vc, leaves);
@@ -6321 +6610 @@
     for (it = leaves.begin(); it != it_end; ++ it)
         {
-                VspLeaf *leaf = dynamic_cast<VspViewCell *>(*it)->mLeaves[0];
+                VspLeaf *leaf = static_cast<VspViewCell *>(*it)->mLeaves[0];
                 const AxisAlignedBox3 box = mHierarchyManager->GetVspTree()->GetBoundingBox(leaf);
         IncludeBoxInMesh(box, *mesh);
         }
 
+        mesh->ComputeBoundingBox();
+
         vc->SetMesh(mesh);
 }
@@ -6349 +6640 @@
     for (it = leaves.begin(); it != it_end; ++ it)
         {
-                VspLeaf *leaf = dynamic_cast<VspViewCell *>(*it)->mLeaves[0];
+                VspLeaf *leaf = static_cast<VspViewCell *>(*it)->mLeaves[0];
                 
                 const AxisAlignedBox3 box = mHierarchyManager->GetVspTree()->GetBoundingBox(leaf);

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

@@ -77 +77 @@
 };
 
+typedef pair<ViewCell *, SimpleRayContainer> ViewCellPoints;
 
 /**     Manages different higher order operations on the view cells.
@@ -513 +514 @@
         virtual void CompressViewCells();
 
+        ViewCell *GetViewCellById(const int id);
+
+        /** Returns number of view cells.
+        */
         int GetNumViewCells() const;
 
-        /////////////////////////////
+        bool GenerateRandomViewCells(ViewCellContainer &viewCells, 
+                                                                 const int numViewCells);
+
+        bool GenerateRandomViewCells(vector<ViewCellPoints *> &viewCells,
+                                                                 const int nViewCells,
+                                                                 const int nViewPoints);
+
+
+        bool GenerateViewPoints(ViewCell *viewCell, 
+                                                        const int numViewPoints,
+                                                        SimpleRayContainer &viewPoints);
+
+        bool ImportRandomViewCells(const string &filename, 
+                                                           vector<ViewCellPoints *> &viewCells);
+
+
+        bool ExportRandomViewCells(const string &filename,
+                                                           const vector<ViewCellPoints *> &viewCells);
+
+        bool GenerateViewPoint(ViewCell *viewCell, SimpleRay &ray);
+
+        bool IsValidViewSpace(ViewCell *vc);
+
+        //////////////
         // static members
         

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp

@@ -660 +660 @@
         if (mCurrentBspNode) // replace front or (if not NULL) back child
         {
-                BspInterior *interior = dynamic_cast<BspInterior *>(mCurrentBspNode);
+                BspInterior *interior = static_cast<BspInterior *>(mCurrentBspNode);
 
                 leaf = new BspLeaf(interior);
@@ -701 +701 @@
                 
                 //ViewCellsMap::iterator vit = mViewCells.find(viewCellId);
-//              BspViewCell *viewCell = dynamic_cast<BspViewCell *>((*vit).second);
-                BspViewCell *viewCell = dynamic_cast<BspViewCell *>(*vit);
+//              BspViewCell *viewCell = static_cast<BspViewCell *>((*vit).second);
+                BspViewCell *viewCell = static_cast<BspViewCell *>(*vit);
                 if (viewCell->GetId() == viewCellId)
                 {
@@ -746 +746 @@
         if (mCurrentBspNode) // replace NULL child of parent with current node
         {
-                BspInterior *parent = dynamic_cast<BspInterior *>(mCurrentBspNode);
+                BspInterior *parent = static_cast<BspInterior *>(mCurrentBspNode);
 
                 parent->ReplaceChildLink(NULL, interior);
@@ -825 +825 @@
                         {       
                                 ViewCellInterior *interior = 
-                                        dynamic_cast<ViewCellInterior *>(mCurrentViewCell);
+                                        static_cast<ViewCellInterior *>(mCurrentViewCell);
                                 interior->SetupChildLink(viewCell);
                         }
@@ -1022 +1022 @@
         if (mCurrentVspNode) // replace front or (if not NULL) back child
         {
-                VspInterior *interior = dynamic_cast<VspInterior *>(mCurrentVspNode);
+                VspInterior *interior = static_cast<VspInterior *>(mCurrentVspNode);
                 leaf = new VspLeaf(interior);
                 interior->ReplaceChildLink(NULL, leaf);
@@ -1065 +1065 @@
                         Debug << "error: view cell " << viewCellId << " not found" << endl;
         
-                //VspViewCell *viewCell = dynamic_cast<VspViewCell *>((*vit).second);
-                VspViewCell *viewCell = dynamic_cast<VspViewCell *>(*vit);
+                //VspViewCell *viewCell = static_cast<VspViewCell *>((*vit).second);
+                VspViewCell *viewCell = static_cast<VspViewCell *>(*vit);
                 
                 if (viewCell->GetId() == viewCellId)
@@ -1109 +1109 @@
         if (mCurrentVspNode) // replace NULL child of parent with current node
         {
-                VspInterior *parent = dynamic_cast<VspInterior *>(mCurrentVspNode);
+                VspInterior *parent = static_cast<VspInterior *>(mCurrentVspNode);
 
                 parent->ReplaceChildLink(NULL, interior);
@@ -1161 +1161 @@
         if (mCurrentOspNode) // replace NULL child of parent with current node
         {
-                KdInterior *parent = dynamic_cast<KdInterior *>(mCurrentOspNode);
+                KdInterior *parent = static_cast<KdInterior *>(mCurrentOspNode);
                 parent->ReplaceChildLink(NULL, interior);
                 interior->mParent = parent;
@@ -1186 +1186 @@
 void ViewCellsParseHandlers::StartOspLeaf(AttributeList& attributes)
 {
-        KdLeaf * leaf = new KdLeaf(dynamic_cast<KdInterior *>(mCurrentOspNode), NULL);
+        KdLeaf * leaf = new KdLeaf(static_cast<KdInterior *>(mCurrentOspNode), NULL);
 
         if (mCurrentOspNode)
         {
                  // replace front or (if not NULL) back child
-                dynamic_cast<KdInterior *>(mCurrentOspNode)->ReplaceChildLink(NULL, leaf);
+                static_cast<KdInterior *>(mCurrentOspNode)->ReplaceChildLink(NULL, leaf);
         }
         else
@@ -1233 +1233 @@
         if (mCurrentBvhNode) // replace front or (if not NULL) back child
         {
-                BvhInterior *interior = dynamic_cast<BvhInterior *>(mCurrentBvhNode);
+                BvhInterior *interior = static_cast<BvhInterior *>(mCurrentBvhNode);
                 leaf = new BvhLeaf(box, interior, (int)objects.size());
                 interior->ReplaceChildLink(NULL, leaf);
@@ -1317 +1317 @@
         if (mCurrentBvhNode) // replace NULL child of parent with current node
         {
-                BvhInterior *parent = dynamic_cast<BvhInterior *>(mCurrentBvhNode);
+                BvhInterior *parent = static_cast<BvhInterior *>(mCurrentBvhNode);
                 parent->ReplaceChildLink(NULL, interior);
                 interior->SetParent(parent);
@@ -1380 +1380 @@
     }
 
-  cout<<"parsing started"<<endl<<flush;
+  //cout<<"parsing started"<<endl<<flush;
 
   //

GTP/trunk/Lib/Vis/Preprocessing/src/VrmlExporter.cpp

@@ -202 +202 @@
                 if (!node->IsLeaf()) 
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
                                                                 
                         BspNodeGeometry *front = new BspNodeGeometry();
@@ -220 +220 @@
                         if (maxPvs)
                         {
-                                BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                                BspLeaf *leaf = static_cast<BspLeaf *>(node);
 
                                 mForcedMaterial.mDiffuseColor.b = 1.0f;
@@ -816 +816 @@
                 if (node->IsLeaf()) 
                 {
-                        ViewCell *vc = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                        ViewCell *vc = static_cast<BspLeaf *>(node)->GetViewCell();
 #if 0     
                         // set the mesh material according to the ray density
@@ -990 +990 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(tData.mNode);
+                        BspInterior *interior = static_cast<BspInterior *>(tData.mNode);
 
                         // add current side of split plane
@@ -1107 +1107 @@
                 if (!node->IsLeaf())
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         // bounded plane is added to the polygons

GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

@@ -273 +273 @@
                 case Intersectable::MESH_INSTANCE:
                         {
-                                Mesh *mesh = dynamic_cast<MeshInstance *>(object)->GetMesh();
+                                Mesh *mesh = static_cast<MeshInstance *>(object)->GetMesh();
                                 AddMeshToPolygons(mesh, polys);
                         }
@@ -279 +279 @@
                 case Intersectable::VIEW_CELL:
                         {
-                                Mesh *mesh = dynamic_cast<ViewCell *>(object)->GetMesh();
+                                Mesh *mesh = static_cast<ViewCell *>(object)->GetMesh();
                                 AddMeshToPolygons(mesh, polys);
                                 break;
@@ -286 +286 @@
                         {
                                 TransformedMeshInstance *mi = 
-                                        dynamic_cast<TransformedMeshInstance *>(object);
+                                        static_cast<TransformedMeshInstance *>(object);
 
                                 Mesh mesh;
@@ -296 +296 @@
                         {
                                 TriangleIntersectable *intersect = 
-                                        dynamic_cast<TriangleIntersectable *>(object);
+                                        static_cast<TriangleIntersectable *>(object);
 
                                 Polygon3 *poly = new Polygon3(intersect->GetItem());
@@ -762 +762 @@
                 
                 Plane3 splitPlane;
-                BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);
+                BspLeaf *leaf = static_cast<BspLeaf *>(tData.mNode);
                 
                 // choose next split plane
@@ -817 +817 @@
         if (newNode->IsLeaf())
         {
-                BspLeaf *leaf = dynamic_cast<BspLeaf *>(newNode);
+                BspLeaf *leaf = static_cast<BspLeaf *>(newNode);
                 
                 BspViewCell *viewCell = new BspViewCell();
@@ -961 +961 @@
         if (newNode->IsLeaf())
         {
-                BspLeaf *leaf = dynamic_cast<BspLeaf *>(newNode);
+                BspLeaf *leaf = static_cast<BspLeaf *>(newNode);
 
                 BspViewCell *viewCell = new BspViewCell();
@@ -1037 +1037 @@
         VspBspTraversalData backData;
         
-        BspLeaf *leaf = dynamic_cast<BspLeaf *>(splitCandidate.mParentData.mNode);
+        BspLeaf *leaf = static_cast<BspLeaf *>(splitCandidate.mParentData.mNode);
         
         // compute locally best split plane
@@ -1109 +1109 @@
                                                                            PolygonContainer &coincident)
 {
-        BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);
+        BspLeaf *leaf = static_cast<BspLeaf *>(tData.mNode);
         
         //-- the front and back traversal data is filled with the new values
@@ -2205 +2205 @@
                         if (node->IsLeaf())
                         {
-                                BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                                BspLeaf *leaf = static_cast<BspLeaf *>(node);
                         
                                 if (!leaf->GetViewCell()->Mailed() && leaf->TreeValid())
@@ -2215 +2215 @@
                         else 
                         {
-                                BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                                BspInterior *interior = static_cast<BspInterior *>(node);
                         
                                 BspNode *first = interior->GetFront();
@@ -2398 +2398 @@
                 {
                         // test if this leaf is in valid view space
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        BspLeaf *leaf = static_cast<BspLeaf *>(node);
                         if (leaf->TreeValid() && 
                                 (!onlyUnmailed || !leaf->Mailed()) &&
@@ -2408 +2408 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         nodeStack.push(interior->GetBack());
@@ -2432 +2432 @@
 {
         // the node became a leaf -> evaluate stats for leafs
-        BspLeaf *leaf = dynamic_cast<BspLeaf *>(data.mNode);
+        BspLeaf *leaf = static_cast<BspLeaf *>(data.mNode);
 
 
@@ -2508 +2508 @@
                 if (!node->IsLeaf())
                 {
-                        BspInterior *in = dynamic_cast<BspInterior *>(node);
+                        BspInterior *in = static_cast<BspInterior *>(node);
 
                         Plane3 splitPlane = in->GetPlane();
@@ -2550 +2550 @@
                 else // reached leaf => intersection with view cell
                 {
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        BspLeaf *leaf = static_cast<BspLeaf *>(node);
 
                         if (!leaf->GetViewCell()->Mailed())
@@ -2612 +2612 @@
                         if (!onlyValid || node->TreeValid())
                         {
-                                ViewCellLeaf *leafVc = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                                ViewCellLeaf *leafVc = static_cast<BspLeaf *>(node)->GetViewCell();
 
                                 ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leafVc);
@@ -2625 +2625 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
                 
                         nodeStack.push(interior->GetFront());
@@ -2652 +2652 @@
                 if (node->IsLeaf())
         {
-                        BspViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                        BspViewCell *viewCell = static_cast<BspLeaf *>(node)->GetViewCell();
 
                         if (!viewCell->GetValid())
                         {
-                                BspViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                                BspViewCell *viewCell = static_cast<BspLeaf *>(node)->GetViewCell();
         
                                 ViewCellContainer leaves;
@@ -2665 +2665 @@
                                 for (it = leaves.begin(); it != it_end; ++ it)
                                 {
-                                        BspLeaf *l = dynamic_cast<BspViewCell *>(*it)->mLeaf;
+                                        BspLeaf *l = static_cast<BspViewCell *>(*it)->mLeaf;
                                         l->SetViewCell(GetOrCreateOutOfBoundsCell());
                                         ++ mBspStats.invalidLeaves;
@@ -2677 +2677 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
                 
                         nodeStack.push(interior->GetFront());
@@ -2723 +2723 @@
                 if (node->IsLeaf())
                 {
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        BspLeaf *leaf = static_cast<BspLeaf *>(node);
 
                         if (!leaf->GetViewCell()->GetValid())
@@ -2737 +2737 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
                 
                         nodeStack.push(interior->GetFront());
@@ -2880 +2880 @@
                 if (n)
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(n);
-                        Plane3 halfSpace = dynamic_cast<BspInterior *>(interior)->GetPlane();
+                        BspInterior *interior = static_cast<BspInterior *>(n);
+                        Plane3 halfSpace = static_cast<BspInterior *>(interior)->GetPlane();
 
             if (interior->GetBack() != lastNode)
@@ -3023 +3023 @@
                         continue;
                 
-                BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*it);
+                BspViewCell *bspVc = static_cast<BspViewCell *>(*it);
                 vector<BspLeaf *>::const_iterator bit, bit_end = bspVc->mLeaves.end();
 
@@ -3110 +3110 @@
                                 if (isAdjacent)
                                 {       
-                                        neighbors.push_back(dynamic_cast<BspLeaf *>(node));
+                                        neighbors.push_back(static_cast<BspLeaf *>(node));
                                 }
                         }
@@ -3116 +3116 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         const int cf = Polygon3::ClassifyPlane(nodeGeom.GetPolys(),
@@ -3204 +3204 @@
                                 if (isAdjacent)
                                 {       
-                                        neighbors.push_back(dynamic_cast<BspLeaf *>(node));
+                                        neighbors.push_back(static_cast<BspLeaf *>(node));
                                 }
                         }
@@ -3210 +3210 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         const int cf = Polygon3::ClassifyPlane(nodeGeom.GetPolys(),
@@ -3271 +3271 @@
                 if (node->IsLeaf())
                 {
-                        return dynamic_cast<BspLeaf *>(node);
+                        return static_cast<BspLeaf *>(node);
                 }
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
                         BspNode *next;
                         BspNodeGeometry geom;
@@ -3324 +3324 @@
                 {
                         if ( (!onlyUnmailed || !node->Mailed()) )
-                                return dynamic_cast<BspLeaf *>(node);
+                                return static_cast<BspLeaf *>(node);
                 }
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         // random decision
@@ -3452 +3452 @@
                 if (!node->IsLeaf())
                 {
-                        BspInterior *in = dynamic_cast<BspInterior *>(node);
+                        BspInterior *in = static_cast<BspInterior *>(node);
 
                         Plane3 splitPlane = in->GetPlane();
@@ -3499 +3499 @@
                 {
                         // reached leaf => intersection with view cell
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        BspLeaf *leaf = static_cast<BspLeaf *>(node);
                         ViewCell *viewCell;
                         
@@ -3577 +3577 @@
                 return node;
 
-        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+        BspInterior *interior = static_cast<BspInterior *>(node);
 
         BspNode *front = CollapseTree(interior->GetFront(), collapsed);
@@ -3584 +3584 @@
         if (front->IsLeaf() && back->IsLeaf())
         {
-                BspLeaf *frontLeaf = dynamic_cast<BspLeaf *>(front);
-                BspLeaf *backLeaf = dynamic_cast<BspLeaf *>(back);
+                BspLeaf *frontLeaf = static_cast<BspLeaf *>(front);
+                BspLeaf *backLeaf = static_cast<BspLeaf *>(back);
 
                 //-- collapse tree
@@ -3643 +3643 @@
                 if (node->IsLeaf())
                 {
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        BspLeaf *leaf = static_cast<BspLeaf *>(node);
 
                         BspViewCell *viewCell = leaf->GetViewCell();
@@ -3658 +3658 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         nodeStack.push(interior->GetFront());
@@ -3699 +3699 @@
                         if (node->IsLeaf())
                         {
-                                BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                                BspLeaf *leaf = static_cast<BspLeaf *>(node);
                         
                                 if (!leaf->GetViewCell()->Mailed() && leaf->TreeValid())
@@ -3709 +3709 @@
                         else 
                         {
-                                BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                                BspInterior *interior = static_cast<BspInterior *>(node);
                         
                                 BspNode *first = interior->GetFront();
@@ -3837 +3837 @@
 
                 iit = ray->mViewCells.begin();
-                BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*(iit ++));
+                BspViewCell *bspVc = static_cast<BspViewCell *>(*(iit ++));
                 BspLeaf *leaf = bspVc->mLeaves[0];
                 
@@ -3846 +3846 @@
                         // next pair
                         BspLeaf *prevLeaf = leaf;
-                        bspVc = dynamic_cast<BspViewCell *>(*iit);
+                        bspVc = static_cast<BspViewCell *>(*iit);
             leaf = bspVc->mLeaves[0]; // exactly one leaf
 
@@ -3929 +3929 @@
                 if (node->IsLeaf()) 
                 {
-                        viewcell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                        viewcell = static_cast<BspLeaf *>(node)->GetViewCell();
                         break;
                 } 
                 else    
                 {       
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
         
                         // random decision
@@ -3964 +3964 @@
                         return false;
                         
-                BspInterior *in = dynamic_cast<BspInterior *>(node);
+                BspInterior *in = static_cast<BspInterior *>(node);
                                         
                 if (in->GetPlane().Side(viewPoint) <= 0) 
@@ -4000 +4000 @@
                 {
             node = node->GetParent();
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
                         
                         // the parent is valid iff both leaves are valid
@@ -4021 +4021 @@
         if (node->IsLeaf())
         {
-                BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                BspLeaf *leaf = static_cast<BspLeaf *>(node);
                 ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
 
@@ -4032 +4032 @@
         else
         {
-                BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                BspInterior *interior = static_cast<BspInterior *>(node);
         
                 Plane3 plane = interior->GetPlane();

GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

@@ -268 +268 @@
 
 
-
-
+bool VspInterior::IsLeaf() const
+{ 
+        return false; 
+}
+
+
+VspNode *VspInterior::GetBack() 
+{
+        return mBack;
+}
+
+
+VspNode *VspInterior::GetFront() 
+{
+        return mFront;
+}
+
+
+AxisAlignedPlane VspInterior::GetPlane() const
+{
+        return mPlane;
+}
+
+
+float VspInterior::GetPosition() const
+{
+        return mPlane.mPosition;
+}
+
+
+int VspInterior::GetAxis() const
+{
+        return mPlane.mAxis;
+}
 
 
@@ -356 +388 @@
 
 
+ViewCellLeaf *VspLeaf::GetViewCell() const
+{
+        return mViewCell;
+}
 
 
@@ -364 +400 @@
 
 
+bool VspLeaf::IsLeaf() const 
+{ 
+        return true; 
+}
 
 
@@ -665 +705 @@
         // todo remove dynamic cast
         VspSubdivisionCandidate *sc = 
-                dynamic_cast<VspSubdivisionCandidate *>(splitCandidate);
+                static_cast<VspSubdivisionCandidate *>(splitCandidate);
 
         VspTraversalData &tData = sc->mParentData;
@@ -718 +758 @@
         if (newNode->IsLeaf()) // subdivision terminated
         {
-                VspLeaf *leaf = dynamic_cast<VspLeaf *>(newNode);
+                VspLeaf *leaf = static_cast<VspLeaf *>(newNode);
                 
 #if 0
@@ -787 +827 @@
         }
         
-        VspLeaf *leaf = dynamic_cast<VspLeaf *>(splitCandidate.mParentData.mNode);
+        VspLeaf *leaf = static_cast<VspLeaf *>(splitCandidate.mParentData.mNode);
 
         /////////////
@@ -882 +922 @@
                                                                         VspTraversalData &backData)
 {
-        VspLeaf *leaf = dynamic_cast<VspLeaf *>(sc.mParentData.mNode);
+        VspLeaf *leaf = static_cast<VspLeaf *>(sc.mParentData.mNode);
 
         const VspTraversalData &tData = sc.mParentData;
@@ -1441 +1481 @@
                 if (parent)
                 {
-                        parentAxis = dynamic_cast<VspInterior *>(parent)->GetAxis();
+                        parentAxis = static_cast<VspInterior *>(parent)->GetAxis();
                 }
 
@@ -1816 +1856 @@
                 {
                         // test if this leaf is in valid view space
-                        VspLeaf *leaf = dynamic_cast<VspLeaf *>(node);
+                        VspLeaf *leaf = static_cast<VspLeaf *>(node);
 
                         if (leaf->TreeValid() && 
@@ -1827 +1867 @@
                 else
                 {
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
 
                         nodeStack.push(interior->GetBack());
@@ -1851 +1891 @@
 {
         // the node became a leaf -> evaluate stats for leafs
-        VspLeaf *leaf = dynamic_cast<VspLeaf *>(data.mNode);
+        VspLeaf *leaf = static_cast<VspLeaf *>(data.mNode);
 
         if (data.mPvs > mVspStats.maxPvs)
@@ -1926 +1966 @@
                 if (node->IsLeaf())
         {
-                        BspViewCell *viewCell = dynamic_cast<VspLeaf *>(node)->GetViewCell();
+                        BspViewCell *viewCell = static_cast<VspLeaf *>(node)->GetViewCell();
 
                         if (!viewCell->GetValid())
                         {
-                                BspViewCell *viewCell = dynamic_cast<VspLeaf *>(node)->GetViewCell();
+                                BspViewCell *viewCell = static_cast<VspLeaf *>(node)->GetViewCell();
         
                                 ViewCellContainer leaves;
@@ -1939 +1979 @@
                                 for (it = leaves.begin(); it != it_end; ++ it)
                                 {
-                                        VspLeaf *l = dynamic_cast<BspViewCell *>(*it)->mLeaf;
+                                        VspLeaf *l = static_cast<BspViewCell *>(*it)->mLeaf;
                                         l->SetViewCell(GetOrCreateOutOfBoundsCell());
                                         ++ mVspStats.invalidLeaves;
@@ -1952 +1992 @@
                 else
                 {
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
                 
                         nodeStack.push(interior->GetFront());
@@ -2005 +2045 @@
                 if (node->IsLeaf())
                 {
-                        VspLeaf *leaf = dynamic_cast<VspLeaf *>(node);
+                        VspLeaf *leaf = static_cast<VspLeaf *>(node);
 
                         if (!leaf->GetViewCell()->GetValid())
@@ -2019 +2059 @@
                 else
                 {
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
                 
                         nodeStack.push(interior->GetFront());
@@ -2051 +2091 @@
                         if (!onlyValid || node->TreeValid())
                         {
-                                ViewCellLeaf *leafVc = dynamic_cast<VspLeaf *>(node)->GetViewCell();
+                                ViewCellLeaf *leafVc = static_cast<VspLeaf *>(node)->GetViewCell();
 
                                 ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leafVc);
@@ -2064 +2104 @@
                 else
                 {
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
                 
                         nodeStack.push(interior->GetFront());
@@ -2089 +2129 @@
                 if (node->IsLeaf())
                 {
-                        VspLeaf *leaf = dynamic_cast<VspLeaf *>(node);
+                        VspLeaf *leaf = static_cast<VspLeaf *>(node);
 
                         if (leaf != n && (!onlyUnmailed || !leaf->Mailed()))
@@ -2096 +2136 @@
                 else
                 {
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
                         
                         if (interior->GetPosition() > box.Max(interior->GetAxis()))
@@ -2134 +2174 @@
                 if (node->IsLeaf()) 
                 {
-                        return dynamic_cast<VspLeaf *>(node);
+                        return static_cast<VspLeaf *>(node);
                 } 
                 else 
                 {
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
                         VspNode *next;
                         
@@ -2186 +2226 @@
                 {
                         if ( (!onlyUnmailed || !node->Mailed()) )
-                                return dynamic_cast<VspLeaf *>(node);
+                                return static_cast<VspLeaf *>(node);
                 }
                 else
                 {
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
 
                         // random decision
@@ -2336 +2376 @@
         int axis;
 
-        ViewCell::NewMail();
-        
         while (1)
         {
                 if (!node->IsLeaf())
                 {
-                        VspInterior *in = (VspInterior *)node;
+                        VspInterior *in = static_cast<VspInterior *>(node);
                         position = in->GetPosition();
                         axis = in->GetAxis();
@@ -2387 +2425 @@
                 {
                         // compute intersection with all objects in this leaf
-                        VspLeaf *leaf = (VspLeaf *)node;
+                        VspLeaf *leaf = static_cast<VspLeaf *>(node);
                         ViewCell *viewCell;
-                        //                      if (0)
-                        //                              viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
-                        //                      else
-
-                        viewCell = leaf->GetViewCell();
-                        
+                        if (0)
+                                viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
+                        else
+                                viewCell = leaf->GetViewCell();
+
                         // don't have to mail if each view cell belongs to exactly one leaf
-                        // $$ JB -> always mailbox so that we have less conditions
-                        if (!viewCell->Mailed()) {
-                          viewCell->Mail();
-                          
-                          viewcells.push_back(viewCell);
-                          ++ hits;
-                        }
-                        
+                        if (!useMailboxing || !viewCell->Mailed())
+                        {
+                                if (useMailboxing)
+                                        viewCell->Mail();
+
+                                viewcells.push_back(viewCell);
+                                ++ hits;
+                        }
+
                         // get the next node from the stack
                         if (tStack.empty())
-                          break;
-                        
+                                break;
+
                         entp = extp;
                         mint = maxt;
@@ -2454 +2492 @@
                 if (!node->IsLeaf())
                 {
-                        VspInterior *in = dynamic_cast<VspInterior *>(node);
+                        VspInterior *in = static_cast<VspInterior *>(node);
                         position = in->GetPosition();
                         axis = in->GetAxis();
@@ -2499 +2537 @@
                 {
                         // compute intersection with all objects in this leaf
-                        VspLeaf *leaf = dynamic_cast<VspLeaf *>(node);
+                        VspLeaf *leaf = static_cast<VspLeaf *>(node);
                         ViewCell *vc = leaf->GetViewCell();
 
@@ -2545 +2583 @@
                 if (node->IsLeaf()) 
                 {
-                        /*const AxisAlignedBox3 box = GetBoundingBox(dynamic_cast<VspLeaf *>(node));
+                        /*const AxisAlignedBox3 box = GetBoundingBox(static_cast<VspLeaf *>(node));
                         if (!box.IsInside(point))
                                 cerr << "error, point " << point << " should be in view cell " << box << endl;
                         */      
-                        viewcell = dynamic_cast<VspLeaf *>(node)->GetViewCell();
+                        viewcell = static_cast<VspLeaf *>(node)->GetViewCell();
                         break;
                 } 
                 else    
                 {       
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
      
                         // random decision
@@ -2592 +2630 @@
                         return false;
                         
-                VspInterior *in = dynamic_cast<VspInterior *>(node);
+                VspInterior *in = static_cast<VspInterior *>(node);
                                         
                 if (in->GetPosition() - viewPoint[in->GetAxis()] <= 0) 
@@ -2628 +2666 @@
                 {
             node = node->GetParent();
-                        VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                        VspInterior *interior = static_cast<VspInterior *>(node);
                         
                         // the parent is valid iff both leaves are valid
@@ -2650 +2688 @@
         if (node->IsLeaf())
         {
-                VspLeaf *leaf = dynamic_cast<VspLeaf *>(node);
+                VspLeaf *leaf = static_cast<VspLeaf *>(node);
                 ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
 
@@ -2661 +2699 @@
         else
         {       
-                VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                VspInterior *interior = static_cast<VspInterior *>(node);
         
                 AxisAlignedPlane plane = interior->GetPlane();
@@ -2731 +2769 @@
         if (!node->IsLeaf())
         {
-                return (dynamic_cast<VspInterior *>(node))->GetBoundingBox();           
-        }
-
-        VspInterior *parent = dynamic_cast<VspInterior *>(node->GetParent());
+                return (static_cast<VspInterior *>(node))->GetBoundingBox();            
+        }
+
+        VspInterior *parent = static_cast<VspInterior *>(node->GetParent());
 
         AxisAlignedBox3 box(parent->GetBoundingBox());
@@ -2766 +2804 @@
                   if (node->IsLeaf())
                         {
-                          VspLeaf *leaf = dynamic_cast<VspLeaf *>(node);
+                          VspLeaf *leaf = static_cast<VspLeaf *>(node);
                           
                           if (!leaf->GetViewCell()->Mailed() && leaf->TreeValid())
@@ -2776 +2814 @@
                   else 
                         {
-                          VspInterior *interior = dynamic_cast<VspInterior *>(node);
+                          VspInterior *interior = static_cast<VspInterior *>(node);
                           
                           VspNode *first = interior->GetFront();
@@ -2887 +2925 @@
         
         // root and bounding box were already constructed
-        VspLeaf *leaf = dynamic_cast<VspLeaf *>(mRoot);
+        VspLeaf *leaf = static_cast<VspLeaf *>(mRoot);
 
         //////////
@@ -3304 +3342 @@
 {
         // todo remove dynamic cast
-        VspSubdivisionCandidate *sc = dynamic_cast<VspSubdivisionCandidate *>(splitCandidate);
+        VspSubdivisionCandidate *sc = static_cast<VspSubdivisionCandidate *>(splitCandidate);
 
         VspTraversalData &tData = sc->mParentData;
@@ -3318 +3356 @@
                 VspTraversalData tBackData;
                 
-                VspInterior *oldInterior = dynamic_cast<VspInterior *>(oldNode);
+                VspInterior *oldInterior = static_cast<VspInterior *>(oldNode);
 
                 // create new interior node and two leaf node
@@ -3387 +3425 @@
                 {
                         const ObjectPvsEntry &entry = oit.Next();
-                        BvhNode *obj = dynamic_cast<BvhNode *>(entry.mObject);
+                        BvhNode *obj = static_cast<BvhNode *>(entry.mObject);
 
                         if (!obj->IsRoot())
@@ -3416 +3454 @@
                 {
                         const ObjectPvsEntry &entry = oit.Next();
-                        BvhNode *obj = dynamic_cast<BvhNode *>(entry.mObject);
+                        BvhNode *obj = static_cast<BvhNode *>(entry.mObject);
 
                         if (!obj->IsRoot())
@@ -3486 +3524 @@
                 if (!node->IsLeaf())
                 {
-                        VspInterior *in = dynamic_cast<VspInterior *>(node);
+                        VspInterior *in = static_cast<VspInterior *>(node);
                         position = in->GetPosition();
                         axis = in->GetAxis();
@@ -3531 +3569 @@
                 {
                         // compute intersection with all objects in this leaf
-                        VspLeaf *leaf = dynamic_cast<VspLeaf *>(node);
+                        VspLeaf *leaf = static_cast<VspLeaf *>(node);
                         ViewCell *viewCell;
                         if (0)

GTP/trunk/Lib/Vis/Preprocessing/src/X3dExporter.cpp

@@ -225 +225 @@
                 if (!node->IsLeaf()) 
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
                                                                 
                         BspNodeGeometry *front = new BspNodeGeometry();
@@ -243 +243 @@
                         if (maxPvs)
                         {
-                                BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                                BspLeaf *leaf = static_cast<BspLeaf *>(node);
 
                                 mForcedMaterial.mDiffuseColor.b = 1.0f;
@@ -584 +584 @@
                 SetFilled();
                 SetForcedMaterial(RandomMaterial());
-                ExportGeometry(dynamic_cast<KdLeaf *>(node)->mObjects); 
+                ExportGeometry(static_cast<KdLeaf *>(node)->mObjects);  
                 SetWireframe();
         }
@@ -764 +764 @@
                 if (node->IsLeaf()) 
                 {
-                        ViewCell *vc = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                        ViewCell *vc = static_cast<BspLeaf *>(node)->GetViewCell();
 #if 0     
                         // set the mesh material according to the ray density
@@ -918 +918 @@
                 else
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(tData.mNode);
+                        BspInterior *interior = static_cast<BspInterior *>(tData.mNode);
 
                         // add current side of split plane
@@ -1035 +1035 @@
                 if (!node->IsLeaf())
                 {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        BspInterior *interior = static_cast<BspInterior *>(node);
 
                         // bounded plane is added to the polygons

GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

@@ -220 +220 @@
         }
         
-
         ////////////
         //-- initialize external ray caster
@@ -269 +268 @@
                 exit(1);
         }
-        
+
+        const string viewCellsFile = ReplaceSuffix(filename, ".obj", ".vc");
+        const int numViewCells = 2;
+        const int numViewPoints = 2;
 
         bool useHwGlobalLines;
@@ -357 +359 @@
                 }
 
+        /*      vector<ViewCellPoints *> myViewCells;
+
+                preprocessor->mViewCellsManager->GenerateRandomViewCells(myViewCells, numViewCells, numViewPoints);
+                cout << "exporting random view cells" << endl;
+                preprocessor->mViewCellsManager->ExportRandomViewCells(viewCellsFile, myViewCells);
+
+                //preprocessor->mViewCellsManager->ImportRandomViewCells(viewCellsFile, myViewCells);
+                CLEAR_CONTAINER(myViewCells);
+*/
                 qApp->exec();
 #endif
@@ -381 +392 @@
         // release memory
         Cleanup();
+        
         delete pt;