Changeset 721 for GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/IMG/IMGCluster.h

Timestamp:

03/31/06 17:29:32 (19 years ago)

Author:

igarcia

Message:

 

File:

• GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/IMG/IMGCluster.h (modified) (6 diffs)

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/IMG/IMGCluster.h

@@ -2 +2 @@
 #define _IMGCLUSTER_H
 
-#include "IMGPrerequisites.h"
-#include "IMGBBox.h"
-#include "IMGBox2d.h"
-#include "IMGPlane3.h"
+#include <IMGPrerequisites.h>
+#include <IMGBBox.h>
+#include <IMGBox2d.h>
+#include <IMGPlane3.h>
+#include <IMGCluster2d.h>
 
-namespace IMG { class Cluster2d; } 
+namespace IMG 
+{
 
-namespace IMG {
-
-class Cluster {
+class Cluster 
+{
   public:
     Cluster();
@@ -19 +20 @@
     Cluster(const Cluster & p);
 
-    // Gametools -- Isma 17/08/2005
-    //void Insert (Triangle *t);
-    // Gametools -- Isma 17/08/2005
-    //* return the patchs that the point is in
-    //int CalculaPatch (Vector3 &point);
-        inline void SetNormal(Ogre::Vector3* n) { normal = *n; };
+        void SetNormal(Ogre::Vector3* n);
 
-        inline Ogre::Vector3* GetNormal() { return &normal; };
+        Ogre::Vector3* GetNormal();
 
-    inline BBox* GetBound() { return bound; };
+    BBox* GetBound();
 
-    inline Box2d* GetBspNodeBound() { return bspnodebound; };
+    Box2d* GetBspNodeBound();
 
-    inline void SetBspNodeBound(Box2d* box) {
-                bspnodebound = box;
-        };
+    void SetBspNodeBound(Box2d* box);
 
     void Print();
@@ -41 +35 @@
     int AxisProjected();
 
-    inline int GetId() const { return id; };
+    int GetId() const;
 
-    inline void SetId(int id_) { id = id;};
+    void SetId(int id_);
 
-    //Vector3 * GetVector3s() const{ return Vector3s;}
-    //Vector3 * GetVector3s();
-    //Vector3 * GetVector3s() { return Vector3s_triangle_text; }
-        inline std::vector<Ogre::Vector3>* GetVector3sVector() { return &Vector3s_vector; };
+        std::vector<Ogre::Vector3>* GetVector3sVector();
 
-        inline Ogre::Vector3* GetVector3sTex() const { return Vector3s_triangle_text;};
+        Ogre::Vector3* GetVector3sTex() const;
 
-    // Gametools -- Isma 17/08/2005
-    //bool CreatePatches(bool dinamic = false);
-    // Gametools -- Isma 17/08/2005
-    //Listid *GetPatchList() { return &patchlistid;}
-    //Listid *GetTriangleList(){ return &trianglelistid; }
-    // Gametools -- Isma 17/08/2005
-    //int GetIdPatch (unsigned int i)
-    //{
-    //  if (i > patchlistid.GetSize()) return -1;
-    //  
-    //  return patchlistid.Get(i);
-    //}
-    // Gametools -- Isma 17/08/2005
-    //int GetIdTriangle  (unsigned int i)
-    //{
-    //  if (i > trianglelistid.GetSize()) return -1;
-    //  
-    //  return trianglelistid.Get(i);
-    //}
     void Finish();
 
-        inline void SetPlane(Ogre::Vector3* normal, Ogre::Vector3 * point) {
-                plane.normal = *normal;
-                plane.normal = -plane.normal;
-                plane.d = -normal->dotProduct (*point);         
-                //plane.d = normal->dotProduct (*point);                
-        };
+        void SetPlane(Ogre::Vector3* normal, Ogre::Vector3 * point);
 
-    inline Plane3 * GetPlane() { return &plane; };
+    Plane3 * GetPlane();
 
     //* Return the increment in U (lumel increment in x). For patchs calculation 
@@ -91 +58 @@
         Ogre::Vector3 GetOrigin();
 
-    //
-    //  void CreateVector3s()
-    //  { 
-    //          
-    //          //Vector3s = new Vector3[4];
-    //          //Vector3s_triangle_text = new Vector3[4];
-    //  }
-    //  
         bool PointIn(Ogre::Vector3 & point);
 
-        Ogre::Real *pointeru[4]; //coordentate u for obscurancemap
-        Ogre::Real *pointerv[4]; //coordentate v for obscurancemap
-        Ogre::Vector2 *uv;      //Vector3 coordenates for the original texture
+        Ogre::Real *pointeru[4]; 
+
+        Ogre::Real *pointerv[4]; 
+
+        Ogre::Vector2 *uv;
 
   private:
-    BBox * bound;
+    BBox bound;
 
-    Box2d * bspnodebound;
+    Box2d bspnodebound;
 
     static unsigned int ID_CLUSTER;
@@ -117 +78 @@
 
         std::vector<Ogre::Vector3> Vector3s_vector;
+
         Ogre::Vector3 *Vector3s;
+
         Ogre::Vector3 *Vector3s_triangle_text;
 
@@ -130 +93 @@
     Plane3 plane;
 
-    // Gametools -- Isma 17/08/2005
-    //Listid patchlistid;
-    //Listid trianglelistid;
-        int CalcPatch(Ogre::Vector3 & point);
-
-
   public:
-    ~Cluster();
+    virtual ~Cluster();
 
 };