Changeset 1020 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

06/18/06 03:47:06 (18 years ago)

Author:

mattausch

Message:

worked on view-object space partition
fixed some loading bugs
fixeds some exporting bugs using line segments
enabling other methods for view space sampling in ViewCellsManager? OBJECT_DIRECTION_BASED_DISTRIBUTION)
added class interface for a sampling strategy

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (5 diffs)

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

@@ -12 +12 @@
 #include "GlRenderer.h"
 #include "PlyParser.h"
+#include "SamplingStrategy.h"
+
+
 
 namespace GtpVisibilityPreprocessor {
 
+const static bool ADDITIONAL_GEOMETRY_HACK = false;
 
 Preprocessor *preprocessor;
@@ -76 +80 @@
                 //Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
                 Vector3 boxSize = sceneBox.Size() * Vector3(0.005, 0.02, 0.005);
+
                 AxisAlignedBox3 box(pt2 + 0.1, pt2 + boxSize);
                 Mesh *mesh = CreateMeshFromBox(box);
@@ -243 +248 @@
         {
                 // HACK 
-                //AddGeometry(mSceneGraph);
-          mSceneGraph->AssignObjectIds();
-                
-          int intersectables, faces;
-          mSceneGraph->GetStatistics(intersectables, faces);
-
-          cout<<filename<<" parsed successfully."<<endl;
-          cout<<"#NUM_OBJECTS (Total numner of objects)\n"<<intersectables<<endl;
-          cout<<"#NUM_FACES (Total numner of faces)\n"<<faces<<endl;
-          mSceneGraph->CollectObjects(&mObjects);
-          mSceneGraph->mRoot->UpdateBox();
-
-         /* Exporter *exporter = Exporter::GetExporter("testload.x3d");
-
-          if (exporter)
-          {
-                  exporter->ExportGeometry(mObjects);
-                  delete exporter;
-          }*/
-
+                if (ADDITIONAL_GEOMETRY_HACK)
+                        AddGeometry(mSceneGraph);
+                
+                mSceneGraph->AssignObjectIds();
+        
+                int intersectables, faces;
+                mSceneGraph->GetStatistics(intersectables, faces);
+        
+                cout<<filename<<" parsed successfully."<<endl;
+                cout<<"#NUM_OBJECTS (Total numner of objects)\n"<<intersectables<<endl;
+                cout<<"#NUM_FACES (Total numner of faces)\n"<<faces<<endl;
+                mSceneGraph->CollectObjects(&mObjects);
+                mSceneGraph->mRoot->UpdateBox();
+
+                if (0)
+                {
+                        Exporter *exporter = Exporter::GetExporter("testload.x3d");
+
+                        if (exporter)
+                        {
+                                exporter->ExportGeometry(mObjects);
+                                delete exporter;
+                        }
+                }
         }
         
@@ -594 +603 @@
 }
 
-
-
+#if 0 // matt: implemented interface samplestrategy
 bool
 Preprocessor::GenerateRays(
@@ -656 +664 @@
   return true;
 }
-
-}
+#endif
+bool Preprocessor::GenerateRays(const int number,
+                                                                const int sampleType,
+                                                                SimpleRayContainer &rays)
+{
+        Vector3 origin, direction; 
+        
+        const int startSize = (int)rays.size();
+        SamplingStrategy *strategy = GenerateSamplingStrategy(sampleType);
+
+        if (!strategy)
+                return false;
+
+        for (int i=0; (int)rays.size() - startSize < number; ++ i) 
+        {
+                SimpleRay newRay;
+                bool success = strategy->GenerateSample(newRay);
+
+                if (success)
+                        rays.AddRay(newRay);
+        }
+
+        delete strategy;
+
+    return true;
+}
+
+
+SamplingStrategy *Preprocessor::GenerateSamplingStrategy(const int strategyId) const
+{
+        switch (strategyId)
+        {
+        case OBJECT_BASED_DISTRIBUTION: 
+                return new ObjectBasedDistribution(*this);
+        case OBJECT_DIRECTION_BASED_DISTRIBUTION:
+                return new ObjectDirectionBasedDistribution(*this);
+        case DIRECTION_BASED_DISTRIBUTION:
+                return new DirectionBasedDistribution(*this);
+        case DIRECTION_BOX_BASED_DISTRIBUTION: 
+                return new DirectionBoxBasedDistribution(*this);
+        case SPATIAL_BOX_BASED_DISTRIBUTION:
+                return new SpatialBoxBasedDistribution(*this);
+        case OBJECTS_INTERIOR_DISTRIBUTION:
+                return new ObjectsInteriorDistribution(*this);
+        default: // no valid strategy
+                return NULL;
+        }
+        // should never come here
+        return NULL;
+}
+
+
+}