Changeset 745 for GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC

Timestamp:

04/11/06 09:20:23 (18 years ago)

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC

Files:

• BBC.h (modified) (1 diff)
• BBCBillboard.h (modified) (1 diff)
• BBCBillboardCloudSerializer.h (modified) (1 diff)
• BBCBillboardCloudUVMapper.h (modified) (1 diff)
• BBCBillboardClusterData.h (modified) (4 diffs)
• BBCBillboardGroup.h (modified) (1 diff)

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBC.h

@@ -11 +11 @@
 #include <BBCBillboard.h>
 #include <BBCBillboardCloud.h>
+#include <BBCBillboardGroup.h>
+#include <BBCBillboardClusterData.h>
 #include <BBCBillboardCloudGenerator.h>
 #include <BBCEntityDistributionGenerator.h>

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboard.h

@@ -31 +31 @@
   protected:
     unsigned int mBillboardHandle;
-
 
   public:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboardCloudSerializer.h

@@ -30 +30 @@
         BillboardCloud * getBillboardCloud();
 
-        virtual void writeBillboardCloud(TiXmlDocument *document);
+        virtual void writeBillboardCloud(TiXmlDocument *document, bool groupedBillboards);
+
+        virtual void readBillboardCloud(TiXmlDocument *document, bool groupedBillboards);
 
 };

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboardCloudUVMapper.h

@@ -46 +46 @@
     void generateTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards = false, unsigned int numberGroups = 1);
 
-        void addTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards, unsigned int numGeneratedBillboardClouds, unsigned int iBillboardGroup);
+        void addTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards, unsigned int numGeneratedBillboardClouds, unsigned int iBillboardGroup, unsigned int iBillboard);
 
     void setBillboardCloud(BillboardCloud *billboardCloud);

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboardClusterData.h

@@ -39 +39 @@
         void setEntityCluster(EntityClusterPtr value);
 
-        virtual void readBillboardClusterData(TiXmlNode *parentNode);
+        virtual void readBillboardClusterData(TiXmlNode *parentNode, int iBillboardGroup);
 
-        virtual void writeBillboardClusterData(TiXmlNode *parentNode);
+        virtual void writeBillboardClusterData(TiXmlNode *parentNode, int iBillboardGroup);
 
         virtual void generateBillboardBoundingQuad();
+
+        unsigned int getNumUVMapGroups();
 
         Ogre::Vector3 getQuadTopLeftCorner();
@@ -53 +55 @@
         Ogre::Vector3 getQuadBottomRightCorner();
 
+        void setQuadTopLeftCorner(Ogre::Vector3 topLeft);
+
+        void setQuadTopRightCorner(Ogre::Vector3 topRight);
+
+        void setQuadBottomLeftCorner(Ogre::Vector3 bottomLeft);
+
+        void setQuadBottomRightCorner(Ogre::Vector3 bottomRight);
+
         Ogre::Vector3 getAxisX();
 
@@ -59 +69 @@
         Ogre::Vector3 getAxisZ();
 
+        void setAxisX(Ogre::Vector3 axisX);
+
+        void setAxisY(Ogre::Vector3 axisY);
+
+        void setAxisZ(Ogre::Vector3 axisZ);
+
+        Ogre::Vector2 getBillboardUVMapMin(unsigned int iBillboardGroup);
+
+        void addBillboardUVMapMin(Ogre::Vector2 min);
+
+        void removeBillboardUVMapMin(unsigned int iBillboardGroup);
+
+        Ogre::Vector2 getBillboardUVMapMax(unsigned int iBillboardGroup);
+
+        void addBillboardUVMapMax(Ogre::Vector2 max);
+
+        void removeBillboardUVMapMax(unsigned int iBillboardGroup);
 
 
@@ -80 +107 @@
 
         Ogre::Vector3 mNormal;
+
+        std::vector<Ogre::Vector2> mGroupedBillboardUVMapMinList;
+
+        std::vector<Ogre::Vector2> mGroupedBillboardUVMapMaxList;
 
         float mD;

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboardGroup.h

@@ -5 +5 @@
 
 namespace BBC {
-
-typedef struct
-{
-        unsigned int billboardHandle;
-        unsigned int width;
-        unsigned int height;
-        Ogre::Vector2 min;
-        Ogre::Vector2 max; 
-} BillboardGroupedInfo;
 
 // Forward declarations