Changeset 574 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

Timestamp:

01/25/06 01:44:46 (18 years ago)

Author:

mattausch

Message:

finished function for view cell construction
removed bsp rays from vspbspmanager

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h (modified) (11 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -47 +47 @@
   enum {BSP, KD, VSP_KD, VSP_BSP};
   
-        /** Constructor taking the maximal number of samples used for construction
-        */
-        ViewCellsManager(const int constructionSamples);
+        /** Constructor taking the initial and construction samples.
+                @param initialSamples the maximal number of samples used for creating the hierarchy
+                of view cells
+                @param constructionSamples the maximal number of samples used for construction
+        */
+        ViewCellsManager(const int initialSamples, const int constructionSamples);
 
         ViewCellsManager();
@@ -62 +65 @@
         /** Constructs view cell container with a given number of samples.
         */
-        virtual int Construct(const ObjectContainer &objects, 
+        virtual int ConstructSubdivision(const ObjectContainer &objects, 
                                                   const VssRayContainer &rays) = 0;
 
@@ -70 +73 @@
                 adding the contribution
                 @param addRays true if rays should be added to the PVSs of the viewcells they
-                intersect */
+                intersect 
+                @param storeViewCells true if view cells should be stored in the ray
+        */
   float ComputeSampleContributions(const VssRayContainer &rays,
-                                                                   const bool addContributions = true);
+                                                                   const bool addContributions,
+                                                                   const bool storeViewCells);
 
   /** Add sample contributions to the viewcells they intersect */
@@ -85 +91 @@
                 @returns number of sample contributions
         */
-        virtual float ComputeSampleContributions(VssRay &ray, const bool addRays = true);
+        virtual float ComputeSampleContributions(VssRay &ray, const bool addRays, const bool storeViewCells);
 
   virtual void AddSampleContributions(VssRay &ray);
@@ -147 +153 @@
         void SetVisualizationSamples(const int visSamples);
 
+        /** Sets maximal number of samples used for the construction of the view cells.
+        */
+        void SetConstructionSamples(const int constructionSamples);
+
         /** Sets maximal number of samples used for the visualization of the view cells.
         */
-        void SetConstructionSamples(const int constructionSamples);
+        void SetInitialSamples(const int initialSamples);
 
         /** Sets maximal number of samples used for the post processing of the view cells.
@@ -306 +316 @@
 protected:
 
-        int CastPassSamples(int samplesPerPass, 
-                                                int sampleType, 
-                                                VssRayContainer *outRays) const;
+        int CastPassSamples(const int samplesPerPass, 
+                                                const int sampleType, 
+                                                VssRayContainer &vssRays) const;
 
         void ParseEnvironment();
@@ -367 +377 @@
         /// maximum number of samples taken for construction of the view cells
         int mConstructionSamples;
+        int mSamplesPerPass;
+        int mInitialSamples;
         int mPostProcessSamples;
         int mVisualizationSamples;
@@ -409 +421 @@
                 used to construct the bsp tree.
         */
-        BspViewCellsManager(BspTree *tree, int constructionSamples);
+        BspViewCellsManager(BspTree *tree);
 
         ~BspViewCellsManager();
 
-        int Construct(const ObjectContainer &objects, 
+        int ConstructSubdivision(const ObjectContainer &objects, 
                                   const VssRayContainer &rays);
 
@@ -482 +494 @@
         KdViewCellsManager(KdTree *tree);
 
-        int Construct(const ObjectContainer &objects, 
+        int ConstructSubdivision(const ObjectContainer &objects, 
                                   const VssRayContainer &rays);
 
@@ -536 +548 @@
 public:
 
-        VspKdViewCellsManager(VspKdTree *vspKdTree, int constructionSamples);
-
-        int Construct(const ObjectContainer &objects, 
+        VspKdViewCellsManager(VspKdTree *vspKdTree);
+
+        int ConstructSubdivision(const ObjectContainer &objects, 
                                   const VssRayContainer &rays);
 
@@ -595 +607 @@
 public:
 
-        VspBspViewCellsManager(VspBspTree *tree, int constructionSamples);
+        VspBspViewCellsManager(VspBspTree *tree);
         ~VspBspViewCellsManager();
 
-        int Construct(const ObjectContainer &objects, 
+        int ConstructSubdivision(const ObjectContainer &objects, 
                                   const VssRayContainer &rays);