Changeset 1076 for GTP/trunk/Lib/Vis

Timestamp:

07/05/06 10:43:45 (18 years ago)

Author:

mattausch

Message:

version for performance testing

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/TestPreprocessor.vcproj (modified) (3 diffs)
• src/KdTree.cpp (modified) (1 diff)
• src/Mesh.cpp (modified) (3 diffs)
• src/Plane3.cpp (modified) (1 diff)
• src/Plane3.h (modified) (1 diff)
• src/Polygon3.cpp (modified) (5 diffs)
• src/Polygon3.h (modified) (2 diffs)
• src/UnigraphicsParser.cpp (modified) (2 diffs)
• src/VspBspTree.cpp (modified) (5 diffs)
• src/VspOspTree.cpp (modified) (3 diffs)
• src/VssPreprocessor.cpp (modified) (1 diff)
• src/main.cpp (modified) (2 diffs)

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

@@ -73 +73 @@
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 RuntimeLibrary="2"
+                                RuntimeTypeInfo="TRUE"
                                 UsePrecompiledHeader="0"
                                 WarningLevel="3"
@@ -85 +86 @@
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;"$(QTDIR)\lib";..\include;..\src\GL;"$(CG_LIB_PATH)";"$(GTPDIR)\NonGTP\Xerces";"$(GTPDIR)\NonGTP\Xerces\xercesc\lib";"$(GTPDIR)\NonGTP\zlib\lib";"$(GTPDIR)\NonGTP\Devil\lib";..\lib\release;..\..\Preprocessing\lib\release"
-                                GenerateDebugInformation="FALSE"
+                                GenerateDebugInformation="TRUE"
                                 SubSystem="1"
                                 OptimizeReferences="2"
                                 EnableCOMDATFolding="2"
-                                TargetMachine="1"/>
+                                TargetMachine="1"
+                                FixedBaseAddress="1"/>
                         <Tool
                                 Name="VCMIDLTool"/>
@@ -133 +135 @@
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
                 </Filter>
+                <File
+                        RelativePath=".\VTune\TestPreprocessor.vpj">
+                </File>
         </Files>
         <Globals>

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

@@ -74 +74 @@
 KdTree::Construct()
 {
+
   if (!splitCandidates)
     splitCandidates = new vector<SortableEntry>;

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

@@ -72 +72 @@
 {
         Cleanup();
-   
+ 
         ComputeBoundingBox();
-   
+ 
         /** true if it is a watertight convex mesh 
         */
@@ -88 +88 @@
                 
                 cout<<"KD";
+                
                 mKdTree->Construct();
 
@@ -480 +481 @@
 
         Plane3 plane = Plane3(mVertices[face->mVertexIndices[0]],
-                                                                                                mVertices[face->mVertexIndices[1]],
-                                                                                                mVertices[face->mVertexIndices[2]]);
+                                                  mVertices[face->mVertexIndices[1]],
+                                                  mVertices[face->mVertexIndices[2]]);
         
         if (!eq(Magnitude(plane.mNormal), 1.0f))

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

@@ -4 +4 @@
 
 namespace GtpVisibilityPreprocessor {
+
+
+Plane3::Plane3(const Vector3 &a,
+                           const Vector3 &b,
+                           const Vector3 &c) 
+{
+    Vector3 v1=a-b, v2=c-b;
+    mNormal = Normalize(CrossProd(v2,v1));
+    mD = -DotProd(b, mNormal);
+}
+
+Plane3::Plane3(const Vector3 &normal,
+                           const Vector3 &point):
+mNormal(normal)
+{
+    mD = -DotProd(normal, point);
+}
 
 

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

@@ -19 +19 @@
                  const Vector3 &b,
                  const Vector3 &c
-         ) {
-    Vector3 v1=a-b, v2=c-b;
-    mNormal = Normalize(CrossProd(v2,v1));
-    mD = -DotProd(b, mNormal);
-  }
+         );
 
   Plane3(const Vector3 &normal,
                  const Vector3 &point
-                 ):mNormal(normal)
-  {
-    mD = -DotProd(normal, point);
-  }
+                 );
 
   void ReverseOrientation()

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

@@ -11 +11 @@
 Polygon3::Polygon3(): 
 mMaterial(NULL), mParent(NULL), mPiercingRays(0)
+, mPlane(NULL)
 {
         // mostly there will be triangles
@@ -18 +19 @@
 Polygon3::Polygon3(const VertexContainer &vertices): 
 mMaterial(NULL), mParent(NULL), mPiercingRays(0)
+, mPlane(NULL)
 {
         mVertices.reserve(vertices.size());
@@ -26 +28 @@
 Polygon3::Polygon3(MeshInstance *parent): 
 mMaterial(NULL), mParent(parent), mPiercingRays(0)
+, mPlane(NULL)
 {}
 
@@ -31 +34 @@
 Polygon3::Polygon3(Face *face, Mesh *parentMesh):
 mMaterial(NULL), mParent(NULL), mPiercingRays(0)
+, mPlane(NULL)
 {       
         mVertices.reserve(face->mVertexIndices.size());
@@ -44 +48 @@
 
 
-Plane3 Polygon3::GetSupportingPlane() const
-{
+Plane3 Polygon3::GetSupportingPlane()// const
+{
+#if 0
         return Plane3(mVertices[0], mVertices[1], mVertices[2]);
+#else
+        if (!mPlane)
+                mPlane = new Plane3(mVertices[0], mVertices[1], mVertices[2]);
+        return *mPlane;
+#endif
 }
 

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

@@ -46 +46 @@
         /** Returns supporting plane of this polygon.
         */
-        Plane3 GetSupportingPlane() const;
+        Plane3 GetSupportingPlane(); //const;
 
         /** Splits polygon.
@@ -156 +156 @@
         RayContainer mPiercingRays;
 
+        ~Polygon3() {DEL_PTR(mPlane);}
+        Plane3 *mPlane;
+
 };
 

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

@@ -46 +46 @@
                                  const bool loadPolygonsAsMeshese)
 {
-  
   map<string, Vector3, ltstr> vht; // hash table for vectors
   map<string, Vector3, ltstr> cht; // hash table for colors
@@ -139 +138 @@
                 vertexIndices.push_back(index);
       }
-      
+    
       face = new Face(vertexIndices);
       
       fscanf(file,"%s",str);   // get the next vertex label
-      
+    
       if (str[0]!=';') {
         c = cht.find(str);

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

@@ -629 +629 @@
 
 
+        // first node is kd node, i.e. an axis aligned box
+        if (1)
+        tData.mIsKdNode = true;
+        else
+                tData.mIsKdNode = false;
+
         // compute first split candidate
         VspBspSplitCandidate splitCandidate;
@@ -793 +799 @@
                         // if it was a kd node (i.e., a box) and the split axis is axis aligned, it is still a kd node
                         tFrontData.mIsKdNode = tBackData.mIsKdNode = (tData.mIsKdNode && (splitAxis < 3));
+                        
                         tFrontData.mAxis = tBackData.mAxis = splitAxis;
 
@@ -1539 +1546 @@
         //Debug << "use special axis: " << useSpecialAxis << endl;
         //Debug << "axis: " << sAxis << " drivingaxis: " << box.Size().DrivingAxis();
-
+        
         for (axis = 0; axis < 3 ; ++ axis)
         {
@@ -1560 +1567 @@
                                 nPosition[axis] = (box.Min()[axis] + box.Max()[axis]) * 0.5f;
                                 Vector3 normal(0,0,0); normal[axis] = 1.0f;
-
+                                
                                 // allows faster split because we have axis aligned kd tree boxes
                                 if (isKdNode)
@@ -2262 +2269 @@
 
 
-void VspBspTree::AddObjToPvs(Intersectable *obj,
-                                                         const int cf,
-                                                         float &frontPvs,
-                                                         float &backPvs,
-                                                         float &totalPvs) const
+inline void VspBspTree::AddObjToPvs(Intersectable *obj,
+                                                                                 const int cf,
+                                                                                 float &frontPvs,
+                                                                                 float &backPvs,
+                                                                                 float &totalPvs) const
 {
         if (!obj)
                 return;
-
+#if 0
         const float renderCost = mViewCellsManager->EvalRenderCost(obj);
-
+#else
+        const int renderCost = 1;
+#endif
         // new object
         if ((obj->mMailbox != sFrontId) &&

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

@@ -377 +377 @@
         //-- debug output
 
-        Debug << "******* VSP BSP options ******** " << endl;
+        Debug << "******* VSP options ******** " << endl;
     Debug << "max depth: " << mTermMaxDepth << endl;
         Debug << "min PVS: " << mTermMinPvs << endl;
@@ -1641 +1641 @@
                 return;
 
-        const float renderCost = mViewCellsManager->EvalRenderCost(obj);
+        //const float renderCost = mViewCellsManager->EvalRenderCost(obj);
+        const int renderCost = 1;
 
         // new object
@@ -2735 +2736 @@
         //-- debug output
 
-        Debug << "******* VSP BSP options ******** " << endl;
+        Debug << "******* OSP options ******** " << endl;
     Debug << "max depth: " << mTermMaxDepth << endl;
         Debug << "min PVS: " << mTermMinPvs << endl;

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

@@ -566 +566 @@
   cout << "use view space box=" << mUseViewSpaceBox<<endl;
 
-
+  
   if (mUseViewSpaceBox)
   {

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

@@ -90 +90 @@
   }
   
-
   QApplication *app = NULL;
 
@@ -110 +109 @@
   Environment::GetSingleton()->GetStringValue("Scene.filename", buff);
   string filename(buff);
+ 
   p->LoadScene(filename);