Changeset 311 for trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h

Timestamp:

10/06/05 02:53:00 (19 years ago)

Author:

mattausch

Message:

removed sampling prep bug

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h

@@ -12 +12 @@
 template<typename T>
 struct LtSample {
-    bool operator()(const T *a, const T *b) const
+    bool operator()(const T a, const T b) const
     {
                 return a < b;
@@ -24 +24 @@
   int mVisibleSamples;
   PvsData<T>() {}
-  PvsData<T>(const int samples):mVisibleSamples(samples) {}
+  PvsData<T>(const int samples): mVisibleSamples(samples) {}
 };
 
 template<typename T>
-class mypvs 
+class Pvs
 {
 public:
-    mypvs(): mSamples(0), mEntries() {}
+    Pvs(): mSamples(0), mEntries() {}
         int mSamples;
 
-        //int Compress() {return 0;}
+        int Compress() {return 0;}
         int GetSize() {return (int)mEntries.size();}
 
@@ -48 +48 @@
 
 template <typename T>
-PvsData<T> *mypvs<T>::Find(T sample)
+PvsData<T> *Pvs<T>::Find(T sample)
 {
-  /*std::map<T *, PvsData<T>, LtSample<T> >::iterator i = mEntries.find(sample);
+  std::map<T, PvsData<T>, LtSample<T> >::iterator i = mEntries.find(sample);
   if (i != mEntries.end()) {
     return &(*i).second;
-  } else*/
+  } else
     return NULL;
 }
 
 template <typename T>
-void mypvs<T>::GetData(const int index,
+void Pvs<T>::GetData(const int index,
                T &entry,
                PvsData<T> &data)
 {
-  /*PvsMap<typename T>::iterator i = mEntries.begin();
+  std::map<T, PvsData<T>, LtSample<T> >::iterator i = mEntries.begin();
   for (int k = 0; k != index && i != mEntries.end(); i++, k++);
 
   entry = (*i).first;
-  data = (*i).second;*/
+  data = (*i).second;
 }
 
-struct LtKdNode
+template <typename T>
+int Pvs<T>::AddSample(T sample)
 {
-  bool operator()(const KdNode *a,
-                  const KdNode *b) const
-  {
-    return a < b;
-  }
-  
+        int result;
+        PvsData<T> *data = Find(sample);
+
+        if (data) 
+        {
+                data->mVisibleSamples ++;
+                result = 0;
+        
+        } 
+        else 
+        {
+                mEntries[sample] = PvsData<T>(1);
+                result = 1;
+        }
+
+        return  result;
+}
+
+/** Class instantiating the Pvs template for kd tree nodes.
+*/
+class KdPvs: public Pvs<KdNode *>
+{
+        int Compress();
 };
 
-/** Superclass for all types of PVS data.
-*/
-class Pvs {
-public:
-        Pvs(): mSamples(0) {}
-        int mSamples;
+typedef std::map<KdNode *, PvsData<KdNode *>, LtSample<KdNode *> > KdPvsMap;
+typedef PvsData<KdNode *> KdPvsData;
 
-        virtual int Compress() = 0;
-        virtual int GetSize() = 0;
-};
-
-struct KdPvsData {
-  int mVisibleSamples;
-  KdPvsData() {}
-  KdPvsData(const int samples):mVisibleSamples(samples) {}
-};
-
-typedef std::map<KdNode *, KdPvsData, LtKdNode> KdPvsMap;
-
-
-class KdPvs: public Pvs {
-public:
- 
-  KdPvsMap mEntries;
-  
-  KdPvs():mEntries() {}
-  
-  KdPvsData *Find(KdNode *node);
-  int AddNodeSample(KdNode *node);
-  int Compress() {return 0;}
-  int GetSize() { return (int)mEntries.size(); }
-  void GetData(const int index,
-               KdNode *&node,
-               KdPvsData &data
-               );
-  
-};
-
-struct LtBspNode
-{
-  bool operator()(const BspNode *a,
-                  const BspNode *b) const
-  {
-          return a < b;
-  }
-};
-
-struct BspPvsData {
-  int mVisibleSamples;
-  BspPvsData() {}
-  BspPvsData(const int samples): mVisibleSamples(samples) {}
-};
-
-typedef std::map<BspNode *, BspPvsData, LtBspNode> BspPvsMap;
-
-class BspPvs: public Pvs 
-{
-public:
-        BspPvs(): mEntries() {}
-
-        BspPvsMap mEntries;
- 
-        BspPvsData *Find(BspNode *node);
-        int AddNodeSample(BspNode *node);
-        
-        int Compress() {return 0;}
-        
-        int GetSize() {return (int)mEntries.size();}
-        
-        void GetData(const int index,
-                                 BspNode *&node,
-                                 BspPvsData &data);
-};
-
-
-struct LtIntersectable
-{
-  bool operator()(const Intersectable *a,
-                  const Intersectable *b) const
-  {
-          return a < b;
-  }
-};
-
-struct ViewCellPvsData {
-  int mVisibleSamples;
-  ViewCellPvsData() {}
-  ViewCellPvsData(const int samples): mVisibleSamples(samples) {}
-};
-
-typedef std::map<Intersectable *, ViewCellPvsData, LtIntersectable> ViewCellPvsMap;
-
-class ViewCellPvs 
-{
-public:
-        ViewCellPvs(): mEntries() {}
-
-        ViewCellPvsMap mEntries;
- 
-        int Compress() {return 0;}
-        int GetSize() {return (int)mEntries.size();}
-
-        ViewCellPvsData *Find(Intersectable *obj);
-        int AddObject(Intersectable *obj);
-
-        void GetData(const int index, 
-                                 Intersectable *&obj,
-                                 ViewCellPvsData &data);
-
-};
+//typedef Pvs<KdNode *> KdPvs;
+typedef Pvs<Intersectable *> ViewCellPvs;
 
 #endif