Changeset 498 for trunk/VUT

Timestamp:

01/04/06 19:34:11 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• GtpVisibilityPreprocessor/include/GL (deleted)
• GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj (modified) (2 diffs)
• GtpVisibilityPreprocessor/scripts/default.env (modified) (1 diff)
• GtpVisibilityPreprocessor/src/GL/glew.h (added)
• GtpVisibilityPreprocessor/src/GL/glew32.lib (added)
• GtpVisibilityPreprocessor/src/GL/glew32s.lib (added)
• GtpVisibilityPreprocessor/src/GL/glut.h (added)
• GtpVisibilityPreprocessor/src/GL/glut32.lib (added)
• GtpVisibilityPreprocessor/src/GL/glxew.h (added)
• GtpVisibilityPreprocessor/src/GL/wglew.h (added)
• GtpVisibilityPreprocessor/src/GlRenderer.h (modified) (2 diffs)
• GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (1 diff)
• GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (7 diffs)
• scripts/GtpVisibility.suo (modified) (previous)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -62 +62 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;include"
+                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;..\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
                                 RuntimeLibrary="2"
@@ -77 +77 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="xerces-c_2.lib zdll.lib zziplib.lib devil.lib qtmain.lib QtOpenGL4.lib QtUiTools.lib QtCore4.lib QtDesigner4.lib QtGui4.lib QtAssistantClient.lib QtTest4.lib Qt3Supportd4.lib QAxContainer.lib QAxServerd.lib QtXml4.lib glut32.lib OpenGL32.Lib glu32.lib QAxServer.lib QtDesignerComponents4.lib"
-                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;;..\include\GL"/>
+                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;;..\include;..\src\GL"/>
                         <Tool
                                 Name="VCMIDLTool"/>

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -21 +21 @@
         # stored sample rays
         samplesFilename rays.out
-        useGlRenderer false
+        useGlRenderer true
 #       type sampling
         type vss

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.h

@@ -26 +26 @@
   PvsRenderStatistics() { Reset(); }
   
-  Reset() {
+  void Reset() {
         maxError = 0.0f;
         sumError = 0.0f;
@@ -49 +49 @@
 
 public:
-  SceneGraph *mSceneGraph;
   ObjectContainer mObjects;
-  ViewCellsManager *mViewCellsManager;
-  
+   
   Vector3 mViewPoint;
   Vector3 mViewDirection;

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -320 +320 @@
 {
         mViewCells.clear();
+        
         CollectViewCells();
         mViewCellsStats.Reset();

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -1508 +1508 @@
 void VspBspTree::CollectViewCells(ViewCellContainer &viewCells) const
 {
-  stack<BspNode *> nodeStack;
-
-  if (!mRoot)
+        stack<BspNode *> nodeStack;
+
+        if (!mRoot)
         return;
 
-  nodeStack.push(mRoot);
-  
-  ViewCell::NewMail();
-
-  while (!nodeStack.empty()) 
-  {
-          BspNode *node = nodeStack.top();
-          nodeStack.pop();
-          
-          if (node->IsLeaf() && !mShowInvalidSpace && node->TreeValid())
-          {
-                  ViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
-                  
-                  if (!viewCell->Mailed()) 
-                  {
-                          viewCell->Mail();
-                          viewCells.push_back(viewCell);
-                  }
-          }
-          else
-          {
-                  BspInterior *interior = dynamic_cast<BspInterior *>(node);
-                  
-                  nodeStack.push(interior->GetFront());
-                  nodeStack.push(interior->GetBack());
-          }
-  }
+        nodeStack.push(mRoot);
+
+        ViewCell::NewMail();
+        
+        while (!nodeStack.empty()) 
+        {
+                BspNode *node = nodeStack.top();
+                nodeStack.pop();
+                
+                if (node->IsLeaf())
+                {
+                        if (!mShowInvalidSpace && node->TreeValid())
+                        {
+                                ViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                        
+                                if (!viewCell->Mailed()) 
+                                {
+                                        viewCell->Mail();
+                                        viewCells.push_back(viewCell);
+                                }
+                        }
+                }
+                else
+                {
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        
+                        nodeStack.push(interior->GetFront());
+                        nodeStack.push(interior->GetBack());
+                }
+        }
 }
 
@@ -1742 +1745 @@
                                                    const bool onlyUnmailed) const
 {
-        PolygonContainer cell;
-        ConstructGeometry(n, cell);
+        PolygonContainer geom;
+        ConstructGeometry(n, geom);
 
         stack<BspNode *> nodeStack;
@@ -1758 +1761 @@
 
                 if (node->IsLeaf())
+
                 {       // test if this leaf is in valid view space
             if (node->TreeValid() &&
@@ -1790 +1794 @@
                         BspInterior *interior = dynamic_cast<BspInterior *>(node);
 
-                        const int cf = Polygon3::ClassifyPlane(cell,
+                        const int cf = Polygon3::ClassifyPlane(geom,
                                                                                                    interior->GetPlane(),
                                                                                                    mEpsilon);
@@ -1808 +1812 @@
         }
 
-        CLEAR_CONTAINER(cell);
+        CLEAR_CONTAINER(geom);
         return (int)neighbors.size();
 }
@@ -1835 +1839 @@
                         BspNode *next;
 
-                        PolygonContainer cell;
+                        PolygonContainer geom;
 
                         // todo: not very efficient: constructs full cell everytime
-                        ConstructGeometry(interior, cell);
-
-                        const int cf = Polygon3::ClassifyPlane(cell, halfspace, mEpsilon);
+                        ConstructGeometry(interior, geom);
+
+                        const int cf = Polygon3::ClassifyPlane(geom, halfspace, mEpsilon);
 
                         if (cf == Polygon3::BACK_SIDE)
@@ -2323 +2327 @@
             leaf = (*iit).mLeaf;
 
-                        // view space does not correspond to valid space
+                        // view space not valid
                         if (!leaf->TreeValid() || !prevLeaf->TreeValid())
                                 continue;