Changeset 2069 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

01/31/07 18:11:51 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (2 diffs)
• IntersectableWrapper.h (modified) (1 diff)
• Preprocessor.cpp (modified) (2 diffs)
• Preprocessor.vcproj (modified) (1 diff)
• RayCaster.h (modified) (3 diffs)
• SamplingStrategy.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• VspBspTree.cpp (modified) (1 diff)

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

@@ -1237 +1237 @@
                                  "render_sampler_use_occlusion_queries=",
                                  "true");
-
-//    RegisterOption("VssPreprocessor.initialSamples",
-//                               optInt,
-//                               "vss_initial_samples=",
-//                               "100000");
   
   RegisterOption("VssPreprocessor.testBeamSampling", 
@@ -1247 +1242 @@
                                 "vss_beam_sampling=", 
                                 "false");
-
-//   RegisterOption("VssPreprocessor.vssSamples",
-//                               optInt,
-//                               "vss_samples=",
-//                               "1000000");
-        
-//   RegisterOption("VssPreprocessor.vssSamplesPerPass",
-//                               optInt,
-//                               "vss_samples_per_pass=",
-//                               "1000");
-  
-//   RegisterOption("VssPreprocessor.samplesPerPass",
-//                               optInt,
-//                               "vss_samples_per_pass=",
-//                               "100000");
 
   RegisterOption("VssPreprocessor.useImportanceSampling",

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

@@ -1 @@
-#ifndef __KDINTERSECTABLE_H
-#define __KDINTERSECTABLE_H
+#ifndef __INTERSECTABLEWRAPPER_H
+#define __INTERSECTABLEWRAPPER_H
 
 #include "AxisAlignedBox3.h"

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

@@ -1221 +1221 @@
 {
 
-  const long t1 = GetTime();
-  if (rays.size() > 10000) {
-        mRayCaster->SortRays(rays);
-        cout<<"Rays sorted in "<<TimeDiff(t1, GetTime())<<" ms."<<endl;
-        
-        if (0) {
-          VssRayContainer tmpRays;
-          int m = 50000;
-          for (int i=m; i < m+20; i++) {
-                tmpRays.push_back(new VssRay(rays[i].mOrigin,
-                                                                         rays[i].mOrigin + 100.0f*rays[i].mDirection,
-                                                                         NULL,
-                                                                         NULL
-                                                                         )
-                                                  );
-                
-          }
-          ExportRays("sorted_rays.x3d", tmpRays, 200);
-        }
-  }
-  
-  SimpleRayContainer::const_iterator rit, rit_end = rays.end();
+        const long t1 = GetTime();
+        
+        if ((int)rays.size() > 10000) {
+        
+                //mRayCaster->SortRays(rays);
+                cout<<"Rays sorted in "<<TimeDiff(t1, GetTime())<<" ms."<<endl;
+
+                if (0) {
+                        VssRayContainer tmpRays;
+                        int m = 890000;
+
+                        for (int i=m; i < m+20; i++) {
+                                tmpRays.push_back(new VssRay(rays[i].mOrigin,
+                                        rays[i].mOrigin + 100.0f*rays[i].mDirection,
+                                        NULL,
+                                        NULL
+                                        )
+                                        );
+
+                        }
+                        ExportRays("sorted_rays.x3d", tmpRays, 200);
+                }
+        }
+
+        SimpleRayContainer::const_iterator rit, rit_end = rays.end();
 
         SimpleRayContainer rayBucket;
@@ -1298 +1301 @@
                                                         pruneInvalidRays);
                 
+        }
+
+        cout << "here5 " << vssRays.size()<<endl;
+
+        if (1) {
+          VssRayContainer tmpRays;
+          int m = 700000;
+          
+          for (int i=m; i < m+20; i++) {
+                  if (vssRays[i])
+                tmpRays.push_back(vssRays[i]);          
+          }
+          ExportRays("sorted_rays2.x3d", tmpRays, 200);
         }
 

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

@@ -77 +77 @@
                                 DisableLanguageExtensions="FALSE"
                                 ForceConformanceInForLoopScope="FALSE"
-                                RuntimeTypeInfo="TRUE"
+                                RuntimeTypeInfo="FALSE"
                                 UsePrecompiledHeader="0"
                                 BrowseInformation="1"

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

@@ -82 +82 @@
           if (mRays)
                 delete mRays;
+          cout << "here4" << endl;
           mRays = new VssRay[number];
           mNumber = number;
@@ -93 +94 @@
                 if (mIndex == mNumber)
                         mIndex = 0;
-          return mRays + mIndex++;
+          return mRays + mIndex ++;
         }
 
@@ -121 +122 @@
         
   struct Intersection
-        {
-                Intersection(): mObject(NULL), mFaceId(0)
-                {}
+  {
+          Intersection(): mObject(NULL), mFaceId(0)
+          {}
 
-                Intersection(const Vector3 &p, const Vector3 &n, Intersectable *o, const int f):
-                        mPoint(p), mNormal(n), mObject(o), mFaceId(f)
-                {}
+          Intersection(const Vector3 &p, const Vector3 &n, Intersectable *o, const int f):
+          mPoint(p), mNormal(n), mObject(o), mFaceId(f)
+          {}
 
-                Intersection(const Vector3 &p): mPoint(p), mObject(NULL), mFaceId(0)
-                {}
-                Vector3 mPoint;
-                Vector3 mNormal;
-                Intersectable *mObject;
-                int mFaceId;
-        };
+          Intersection(const Vector3 &p): mPoint(p), mObject(NULL), mFaceId(0)
+          {}
+          Vector3 mPoint;
+          Vector3 mNormal;
+          Intersectable *mObject;
+          int mFaceId;
+  };
 
 
-        int ProcessRay(const SimpleRay &ray,
-                                   Intersection &hitA,
-                                   Intersection &hitB,
-                                   VssRayContainer &vssRays,
-                                   const AxisAlignedBox3 &box,
-                                   const bool castDoubleRay,
-                                   const bool pruneInvalidRays = true);
+  int ProcessRay(const SimpleRay &ray,
+          Intersection &hitA,
+          Intersection &hitB,
+          VssRayContainer &vssRays,
+          const AxisAlignedBox3 &box,
+          const bool castDoubleRay,
+          const bool pruneInvalidRays = true);
 
-        /** Checks if ray is valid.
-                I.e., the ray is in valid view space.
-                @note: clamps the ray to valid view space.
-        */
-        bool ValidateRay(const Vector3 &origin,
-                                         const Vector3 &direction,
-                                 const AxisAlignedBox3 &box,
-                                         Intersection &hit);
+  /** Checks if ray is valid.
+  I.e., the ray is in valid view space.
+  @note: clamps the ray to valid view space.
+  */
+  bool ValidateRay(const Vector3 &origin,
+          const Vector3 &direction,
+          const AxisAlignedBox3 &box,
+          Intersection &hit);
 
-        bool
-                ClipToViewSpaceBox(const Vector3 &origin,
-                                                   const Vector3 &termination,
-                                                   Vector3 &clippedOrigin,
-                                                   Vector3 &clippedTermination);
-        
+  bool
+          ClipToViewSpaceBox(const Vector3 &origin,
+          const Vector3 &termination,
+          Vector3 &clippedOrigin,
+          Vector3 &clippedTermination);
 
 
 
-  
+
+
 
   const Preprocessor &mPreprocessor;

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

@@ -8 +8 @@
 #include "Mutation.h"
 #include "PerfTimer.h"
+
 
 namespace GtpVisibilityPreprocessor {

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

@@ -3844 +3844 @@
         Exporter *exporter;
 
-#if 0
-        // export merged view cells
-        mColorCode = 0; // use random colors
-
-        exporter = Exporter::GetExporter("merged_view_cells.wrl");
-
-        cout << "exporting view cells after merge ... ";
-
-        if (exporter)
-        {
-                if (mExportGeometry)
-                {
-                        exporter->ExportGeometry(objects);
-                }
-
-                exporter->SetFilled();
-                ExportViewCellsForViz(exporter, NULL, mColorCode, GetClipPlane());
-
-                delete exporter;
-        }
-        cout << "finished" << endl;
-#endif
-
         // export merged view cells using pvs color coding
         exporter = Exporter::GetExporter("merged_view_cells_pvs.wrl");

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

@@ -679 +679 @@
                 if (r == mRoot)
                 {
-                        Debug << "VSP BSP tree construction time spent at root: "
-                                  << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
+                        cout << "VSP BSP tree construction time spent at root: "
+                                 << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
                 }