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

Timestamp:

04/19/06 00:27:14 (18 years ago)

Author:

igarcia

Message:

 

Location:

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

Files:

• BBCBillboardCloudGenerator.h (modified) (1 diff)
• BBCBillboardCloudUVMapper.h (modified) (1 diff)
• BBCBillboardClusterData.h (modified) (2 diffs)
• BBCManager.h (modified) (2 diffs)
• BBCSubEntity.h (modified) (1 diff)
• BBCUtil.h (modified) (2 diffs)

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

@@ -2 +2 @@
 #define _BBCBILLBOARDCLOUDGENERATOR_H
 
-#include <BBCUtil.h>
 #include <BBCEntity.h>
 #include <BBCEntityDistribution.h>

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, unsigned int iBillboard);
+        void addTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards, unsigned int numGeneratedBillboardClouds, unsigned int iBillboardGroup, unsigned int iBillboard, unsigned int iBillboardInGroup);
 
     void setBillboardCloud(BillboardCloud *billboardCloud);

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

@@ -77 +77 @@
         Ogre::Vector2 getBillboardUVMapMin(unsigned int iBillboardGroup);
 
-        void addBillboardUVMapMin(Ogre::Vector2 min);
+        void addBillboardUVMapMin(Ogre::Vector2 minVec);
 
         void removeBillboardUVMapMin(unsigned int iBillboardGroup);
@@ -83 +83 @@
         Ogre::Vector2 getBillboardUVMapMax(unsigned int iBillboardGroup);
 
-        void addBillboardUVMapMax(Ogre::Vector2 max);
+        void addBillboardUVMapMax(Ogre::Vector2 maxVec);
 
         void removeBillboardUVMapMax(unsigned int iBillboardGroup);

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

@@ -3 +3 @@
 
 #include <BBCPrerequisites.h>
+#include <BBCUtil.h>
 #include <BBCSingleton.h>
 
@@ -31 +32 @@
         void shutdown(void);
 
-        Ogre::MeshSerializer* getMeshSerializer(void);
-
-        Ogre::XMLMeshSerializer* getXMLMeshSerializer(void);
-
-  protected:
-
 };
 

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

@@ -130 +130 @@
         void setMaterialName(Ogre::String value);
 
-        //void createUniqueVertices();
-
         UniqueVertexList* getUniqueVertices();
 

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

@@ -5 +5 @@
 
 namespace BBC {
+
+class _BBCExport Util
+{
+public:
+        static Ogre::String getBaseName(Ogre::String fileName)
+        {
+                Ogre::String baseName;
+                size_t pos = fileName.find_last_of(".");
+                baseName = fileName.substr(0, pos);
+                return baseName;
+        }
+
+        static Ogre::String getExtensionName(Ogre::String fileName)
+        {
+                Ogre::String ext;
+                size_t pos = fileName.find_last_of(".");
+                ext = fileName.substr(pos+1);
+                return ext;
+        }
+
+        static unsigned int nextPowerOf2(unsigned int nPlanes)
+        {
+                unsigned int depth = 1;
+                while (depth < nPlanes)
+                {
+                        depth = depth << 1;
+                }
+                return depth;
+        }
+
+};
+
 /*
 extern "C" _BBCExport double fround(double n, unsigned d)
@@ -15 +47 @@
       return (int)floor(x + 0.5);
 }
-
-extern "C" _BBCExport unsigned int getUpperPowerOfTwo(unsigned int powerOfTwo)
-{
-        unsigned int icount = 0;
-        unsigned int depth = 1;
-        while (icount < powerOfTwo)
-        {
-                depth = depth << 1;
-                icount++;
-        }
-        return depth;
-}
 */
 }