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

Timestamp:

12/04/06 22:38:56 (18 years ago)

Author:

mattausch

Message:

implemented object space compression

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (1 diff)
• BvHierarchy.h (modified) (1 diff)
• HierarchyManager.cpp (modified) (3 diffs)
• HierarchyManager.h (modified) (1 diff)
• Pvs.h (modified) (2 diffs)
• VspTree.cpp (modified) (1 diff)
• VspTree.h (modified) (1 diff)

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

@@ -2692 +2692 @@
 
 
-}
+void BvHierarchy::Compress()
+{
+}
+
+
+}

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

@@ -627 +627 @@
         float GetRenderCostIncrementially(BvhNode *node) const;
 
+        void Compress();
         void CreateUniqueObjectIds();
 

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

@@ -657 +657 @@
 }
 
+
 void HierarchyManager::InitialiseObjectSpaceSubdivision(const ObjectContainer &objects)
 {
@@ -2353 +2354 @@
 
 
+void HierarchyManager::CompressObjectSpace()
+{
+        //mBvHierarchy->Compress();
+        mVspTree->CompressObjects();
+
 void HierarchyManager::CreateUniqueObjectIds()
 {
@@ -2359 +2365 @@
 
 
-
-}
+}

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

@@ -292 +292 @@
         void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects);
 
+        void CompressObjectSpace();
         void CreateUniqueObjectIds();
 

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

@@ -212 +212 @@
         bool GetSampleContribution(T sample, const float pdf, float &contribution);
 
-        /** Adds sample to PVS. 
-                @contribution contribution of sample (0 or 1)
-                @returns true if sample was not already in PVS.
-        */
-        //bool AddSample(T sample, const float pdf, float &contribution);
-
         /** Adds sample to PVS.
                 @returns contribution of sample (0 or 1)
@@ -241 +235 @@
                 @returns contribution of sample (0 or 1)
         */
-        float AddSamples(const vector<PvsEntry<T, S> > &samples);
+        //float AddSamples(const vector<PvsEntry<T, S> > &samples);
 
         /** Adds sample to PVS.

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

@@ -3388 +3388 @@
 }
 
-}
+
+void VspTree::CompressObjects(VspLeaf *leaf)
+{
+        bool compressed = true;
+
+        Intersectable::NewMail(2);
+
+        while (compressed)
+        {
+                ObjectPvsIterator oit = leaf->GetViewCell()->GetPvs().GetIterator();
+                vector<BvhNode *> parents;
+                ObjectPvs newPvs;
+
+                compressed = false;
+
+                while (oit.HasMoreEntries())
+                {
+                        const ObjectPvsEntry &entry = oit.Next();
+                        BvhNode *obj = dynamic_cast<BvhNode *>(entry.mObject);
+
+                        if (!obj->IsRoot())
+                        {
+                                BvhNode *parent = obj->GetParent();
+
+                                if (!parent->Mailed())
+                                {
+                                        parent->Mail();
+                                }
+                                else
+                                {
+                                        // sibling was already found => 
+                                        // this entry can be exchanged by the parent
+                                        parents.push_back(parent);
+                                        parent->Mail(1);
+                                        compressed = true;
+                                }
+                        }
+                }
+                
+                oit = leaf->GetViewCell()->GetPvs().GetIterator();
+
+                while (oit.HasMoreEntries())
+                {
+                        const ObjectPvsEntry &entry = oit.Next();
+                        BvhNode *obj = dynamic_cast<BvhNode *>(entry.mObject);
+
+                        if (!obj->IsRoot())
+                        {
+                                BvhNode *parent = obj->GetParent();
+
+                                // add only entries that cannot be exchaned with the parent
+                                if (parent->Mailed(1))
+                                {
+                                        newPvs.AddSampleDirty(obj, entry.mData.mSumPdf);
+                                }
+                        }
+                }
+
+                // add parents
+                vector<BvhNode *>::const_iterator bit, bit_end = parents.end();
+                for (bit = parents.begin(); bit != bit_end; ++ bit)
+                {
+                        newPvs.AddSampleDirty(*bit, 1);
+                }
+
+                leaf->GetViewCell()->SetPvs(newPvs);
+        }
+}
+
+
+void VspTree::CompressObjects()
+{
+        vector<VspLeaf *> leaves;
+        CollectLeaves(leaves);
+
+        vector<VspLeaf *>::const_iterator lit, lit_end = leaves.end();
+
+        for (lit = leaves.begin(); lit != lit_end; ++ lit)
+        {
+                CompressObjects(*lit);
+        }
+}
+
+}

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

@@ -1028 +1028 @@
                                         AxisAlignedBox3 *forcedBoundingBox);
 
+        void CompressObjects();
+
+        void CompressObjects(VspLeaf *leaf);
+
 protected: