Changeset 1263

Timestamp:

08/23/06 09:30:35 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• ViewCellsParser.cpp (modified) (13 diffs)
• ViewCellsParserXerces.h (modified) (5 diffs)

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

@@ -388 +388 @@
 {
         friend class ViewCellsManager;
-
+        friend class ViewCellsParseHandlers;
 
 public:

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

@@ -749 +749 @@
 
 
-        // the type of hierarchy: this must be known before to build 
-        // the view cells manager
-        stream << "<ViewSpaceHierarchyType name=\"vspBspTree\" />" << endl;
+        // the type of hierarchy: this must be known before to build the view cells manager
+        //stream << "<ViewSpaceHierarchyType name=\"vspBspTree\" />" << endl;
 
         //-- export the view cells and the pvs

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

@@ -33 +33 @@
 #include "VspTree.h"
 #include "KdTree.h"
-
+#include "BvHierarchy.h"
 
 
@@ -84 +84 @@
   , mBspTree(NULL)
   , mViewCellsTree(NULL)
-  , mCurrentTask(PARSE_OPTIONS)
+  , mCurrentState(PARSE_OPTIONS)
   , mCurrentViewCell(NULL)
   , mCurrentBspNode(NULL)
@@ -118 +118 @@
 
         // inside the view cell description
-        if (mCurrentTask == PARSE_VIEWCELLS)
+        if (mCurrentState == PARSE_VIEWCELLS)
         {
                 if (element == "Interior")
@@ -173 +173 @@
 
         // not parsing view cells anymore
-        mCurrentTask = PARSE_OPTIONS;
+        mCurrentState = PARSE_OPTIONS;
 }
 
@@ -206 +206 @@
                         
                         // the view cells manager is created here
-                        CreateViewCellsManager(ptr);
+                        //CreateViewCellsManager(ptr);
                 }
         }
@@ -331 +331 @@
         {
                 cout << "parsing view cells" << endl;
-                mCurrentTask = PARSE_VIEWCELLS;
+                mCurrentState = PARSE_VIEWCELLS;
         }
 
@@ -346 +346 @@
                 //StartViewSpaceHierarchy(attributes);
                 cout << "parsing view space partition" << endl;
-                mCurrentTask = PARSE_VSP;
+                mCurrentState = PARSE_VSP;
         }
 
@@ -354 +354 @@
                 //StartObjectSpaceHierarchy(attributes);
                 cout << "parsing object space partition" << endl;
-                mCurrentTask = PARSE_OSP;
+                mCurrentState = PARSE_OSP;
         }
         
@@ -372 +372 @@
 
         // parse view space partition
-        switch (mCurrentTask)
+        switch (mCurrentState)
         {
         case PARSE_VSP:
@@ -713 +713 @@
 
 
-void ViewCellsParseHandlers::CreateViewCellsManager(const char *name)
-{
-        if (strcmp(name, "bspTree") == 0)
+void ViewCellsParseHandlers::CreateViewCellsManager(/*const char *name*/)
+{
+        /*if (strcmp(name, "bsp") == 0)
         {
                 Debug << "view cell type: Bsp" << endl;
@@ -723 +723 @@
 
                 mViewCellsManager = new BspViewCellsManager(mBspTree);
-        }
-        else if (strcmp(name, "vspBspTree") == 0) // 
+        }*/
+        if (mViewSpaceHierarchyType == BSP) // 
         {
                 Debug << "view cell type: VspBsp" << endl;
@@ -732 +732 @@
 
                 mVspBspTree->mBox = mViewSpaceBox;
-        }
-        else if (strcmp(name, "vspOspTree") == 0)
-        {
-                Debug << "view cell type: VspOsp" << endl;
+                mVspBspTree->mRoot = mBspRoot;
+        }
+        else if (mViewSpaceHierarchyType == VSP) 
+        {
+                Debug << "view cell type: Vsp" << endl;
 
                 mVspTree = new VspTree();
-                mOspTree = new OspTree();
+
+                if (mObjectSpaceHierarchyType == OSP) 
+                        mOspTree = new OspTree();
+                else
+                        mBvHierarchy = new BvHierarchy();
 
                 // hack
@@ -747 +752 @@
 
         mViewCellsTree = mViewCellsManager->GetViewCellsTree();
+        mViewCellsTree->mRoot = mViewCellRoot;
+
         mViewCellsManager->SetViewSpaceBox(mViewSpaceBox);
 }

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

@@ -24 +24 @@
 class OspTree;
 class VspNode;
-
+class BvHierarchy;
 
 class ViewCellsParseHandlers: public HandlerBase
@@ -69 +69 @@
   void resetDocument();
 
-  void CreateViewCellsManager(const char *name);
+  void CreateViewCellsManager(/*const char *name*/);
 
 
@@ -75 +75 @@
   VspTree *mVspTree;
   OspTree *mOspTree;
+  BvHierarchy *mBvHierarchy;
 
   BspTree *mBspTree;
@@ -83 +84 @@
   ViewCell *mCurrentViewCell;
   KdNode *mCurrentKdNode;
+  
+  BspNode *mBspRoot;
+  VspNode *mVspRoot;
+  ViewCell *mViewCellRoot;
 
   ViewCellContainer mViewCells;
@@ -91 +96 @@
   IndexedBoundingBoxContainer mIBoundingBoxes;
  
-  /// current task for the parser
-  int mCurrentTask;
-
+  /// current state of the parser
+  int mCurrentState;
+  
   enum {PARSE_OPTIONS, PARSE_VIEWCELLS, PARSE_VSP, PARSE_OSP};
+
+  /// view space / object space hierarchy types
+  enum {BSP, VSP, OSP, BVH};
+
+  int mViewSpaceHierarchyType;
+  int mObjectSpaceHierarchyType;
 
   // Handlers for X3D