Changeset 2529

Timestamp:

07/06/07 00:38:58 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/demo1.env (added)
• scripts/run_demo1 (added)
• scripts/run_demo2 (added)
• scripts/run_test2 (added)
• src/Pvs.h (modified) (11 diffs)
• src/PvsBase.h (modified) (2 diffs)
• src/QtInterface/QtGlRenderer.cpp (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (3 diffs)
• src/VspTree.cpp (modified) (1 diff)

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

@@ -59 +59 @@
 
         /** creates pvs and initializes it with the given entries. 
-        Assumes that entries are sorted-
+                Assumes that entries are sorted.
         */
         VerbosePvs(const vector<PvsEntry<T, S> > &samples);
@@ -66 +66 @@
         /** Compresses PVS lossless or lossy.
         */
-        int Compress() 
-        {
-                return 0;
-        }
-        
-        int GetSize() const 
-        {
-                return (int)mEntries.size();
-        }
-        
-        bool Empty() const 
-        {
-                return mEntries.empty();
-        }
-
-        void Reserve(const int n) 
-        { 
-                mEntries.reserve(n); 
-        }
-
+        int Compress() { return 0; }
+        
+        inline int GetSize() const { return (int)mEntries.size(); }
+        
+        inline bool Empty() const { return mEntries.empty(); }
+
+        inline void Reserve(const int n) { mEntries.reserve(n); }
         /** Normalize the visibility of entries in order to get 
-        comparable results.
+                comparable results.
         */
         void NormalizeMaximum();
-
         /** Merges pvs of a into this pvs.
-        Warning: very slow!
+                Warning: very slow!
         */
         void MergeInPlace(const VerbosePvs<T, S> &a);
-
         /** Difference of pvs to pvs b.
         @returns number of different entries.
         */
         int Diff(const VerbosePvs<T, S> &b);
-
         /** Finds sample in PVS.
                 @param checkDirty if dirty part of the pvs should be checked for entry 
@@ -112 +96 @@
 
         bool GetSampleContribution(T sample, const float pdf, float &contribution);
-
         /** Adds sample to PVS.
                 @returns contribution of sample (0 or 1)
         */
         float AddSample(T sample, const float pdf);
-
         /** Adds sample to PVS without checking for presence of the sample
                 warning: pvs remains unsorted!
         */
         void AddSampleDirty(T sample, const float pdf);
-
         /** Adds sample dirty (on the end of the vector) but
                 first checks if sample is already in clean part of the pvs.
         */
         bool AddSampleDirtyCheck(T sample, const float pdf);
-
-        /** Sort pvs entries - this should always be called after a
+        /** Sort pvs entries. This should always be called after a
                 sequence of AddSampleDirty calls 
         */
         void Sort();
-
         /** Sort pvs entries assume that the pvs contains unique entries
         */
         void SimpleSort();
-
         /** Adds sample to PVS.
                 @returns PvsData
@@ -142 +120 @@
         typename std::vector<PvsEntry<T, S> >::iterator 
                 AddSample2(T sample, const float pdf);
-
         /** Subtracts one pvs from another one.
                 WARNING: could contains bugs
@@ -172 +149 @@
         */
         void Clear(const bool trim = true);
-
+        /** Trim the vector containing the pvs.
+        */
         void Trim();
 
@@ -186 +164 @@
                                           const VerbosePvs<T, S> &b);
 
-        int GetSamples() const
-        {
-                return mSamples;
-        }
-
-        bool IsDirty() const
-        {
-                return mLastSorted < mEntries.size();
-        }
-
+        inline int GetSamples() const { return mSamples; }
+
+        /** If there is an unsorted part in the pvs.
+        */
+        bool IsDirty() const { return mLastSorted < mEntries.size(); }
+
+        /** If this pvs requires a resort to stay efficient.
+        */
         bool RequiresResort() const
         {
@@ -212 +188 @@
                         mQueriesSinceSort*((mLastSorted*logS + dirtySize*dirtySize/2)/n - logN)) 
                 {
-                                //              cout<<"Q="<<mQueriesSinceSort<<" N="<<n<<" D="<<dirtySize<<endl;
+                        // cout<<"Q="<<mQueriesSinceSort<<" N="<<n<<" D="<<dirtySize<<endl;
                         return true;
                 }
@@ -219 +195 @@
         }
 
+        /** If this pvs requires a resort to stay efficient.
+        */
         bool RequiresResortLog() const
         {
@@ -227 +205 @@
         }
 
-        int GetLastSorted() const
-        {
-                return mLastSorted;
-        }
+        inline int GetLastSorted() const { return mLastSorted; }
 
         typename PvsIterator<T, S> GetIterator() const;
@@ -236 +211 @@
 protected:
 
+        /** Merge pvs 1 from begin iterator to end iterator with
+                pvs 2 from begin iterator to end iterator.
+        */
         static void Merge(VerbosePvs<T, S> &mergedPvs, 
                                           const typename std::vector<PvsEntry<T, S> >::const_iterator &aBegin,
@@ -243 +221 @@
                                           const int aSamples, 
                                           const int bSamples);
+
 
         //////////////////////////////

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

@@ -73 +73 @@
         // $$JB in order to return meaningfull values
         // it assumes that the sum pdf has been normalized somehow!!!
-        inline float GetVisibility() 
-        { 
-                return mSumPdf; 
-        }
+        inline float GetVisibility() { return mSumPdf; }
 
         /// sum of probability density of visible sample rays
@@ -96 +93 @@
         // $$JB in order to return meaningfull values
         // it assumes that the sum pdf has been normalized somehow!!!
-        float GetVisibility() 
-        { 
-                return mSumPdf; 
-        }
+        inline float GetVisibility() { return mSumPdf; }
+
 
         ///////////////

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -417 +417 @@
                   //float visibility = mTransferFunction*log10(entry.mData.mSumPdf + 1); // /5.0f
                   //              glColor3f(visibility, 0.0f, 0.0f);
-
+                        cerr << "sumpdf: " << entry.mData.mSumPdf << endl;
                   RgbColor color = RainbowColorMapping(mTransferFunction*log10(entry.mData.mSumPdf + 1));
                   glColor3f(color.r, color.g, color.b);

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

@@ -3649 +3649 @@
                 pvs = root->GetPvs();
                 UpdateScalarPvsSize(root, pvs.EvalPvsCost(), pvs.GetSize());
+
                 return;
         }
@@ -3671 +3672 @@
         int i = 0;
 
+        ////////
+        //-- recursivly compute child pvss
+
         for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit, ++ i)
         {
-                //////////////////
-                //-- recursivly compute child pvss
-                UpdatePvsForEvaluation(*vit, pvsList[i]/*objPvs*/);
+                UpdatePvsForEvaluation(*vit, pvsList[i]);
         }
 
@@ -3700 +3702 @@
                         { 
                                 intersect->Mail();
-
                                 pvs.AddSampleDirty(intersect, pvsData.mSumPdf);
                         }
                 }
         }
-
-        if (0) pvs.Sort();
 
         // store pvs in this node

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

@@ -3709 +3709 @@
                                 BvhNode *parent = obj->GetParent();
 
-                                // add only entries that cannot be exchaned with the parent
+                                // add only entries that cannot be exchanged with the parent
                                 if (!parent->Mailed(1))
                                 {