Changeset 747 for GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include

Timestamp:

04/11/06 16:43:19 (18 years ago)

Author:

igarcia

Message:

 

Location:

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

Files:

• LBBCBillboardCloudTextureViewMode.h (modified) (2 diffs)
• LBBCSampleConfigFile.h (modified) (9 diffs)

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCBillboardCloudTextureViewMode.h

@@ -110 +110 @@
                 unsigned int mTextureSize;
 
-                Ogre::PixelFormat mTexturePixelFormat;
-
-                Ogre::String mEntityName;
-
                 unsigned int mBitRange;
 
@@ -124 +120 @@
                 Ogre::String mTextureAtlasFolder;
 
+                Ogre::String mEntityName;
+
         public:
+
                 BillboardCloudTextureViewMode(Ogre::RenderWindow* win, unsigned int ogreFrameListenerModeHandle, bool useBufferedInputKeys = false, bool useBufferedInputMouse = false);
 

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCSampleConfigFile.h

@@ -12 +12 @@
     virtual ~SampleConfigFile();
 
-        Ogre::String getEntitySampleMaterialPrefixName();
+        Ogre::String getEntitySampleMaterialName();
 
         bool getEntityDistributionMerged();
 
-        Ogre::String getEntityDistributionSplittedMaterialPrefixName();
+        Ogre::String getEntityDistributionSplittedMeshName();
 
-        Ogre::String getEntityDistributionMergedMaterialPrefixName();
+        Ogre::String getEntityDistributionSplittedMaterialName();
+
+        Ogre::String getEntityDistributionMergedMeshName();
+
+        Ogre::String getEntityDistributionMergedMaterialName();
 
         bool getEntityDistributionSplitted();
 
-        Ogre::String getEntitySampleMeshPrefixName();
+        Ogre::String getEntitySampleMeshName();
 
         bool getEntityDistributionGeneration();
@@ -28 +32 @@
         Ogre::String getEntityDistributionFolder();
 
-        Ogre::String getEntityDistributionXMLPrefixName();
+        Ogre::String getEntityDistributionXMLName();
 
         Ogre::String getEntitiesFolder();
@@ -34 +38 @@
         bool getEntitySampleMeshGeneration();
 
-        Ogre::String getEntitiesMeshPrefixName();
+        Ogre::String getEntitiesMeshName();
 
         bool getEntityClustersGeneration();
@@ -50 +54 @@
         bool getEntityClustersSplittedClusters();
 
-        Ogre::String getEntityClustersMeshPrefixName();
+        Ogre::String getEntityClustersMergedMeshName();
 
-        Ogre::String getEntityClustersMergedMaterialPrefixName();
+        Ogre::String getEntityClustersSplittedMeshName();
 
-        Ogre::String getEntityClustersSplittedMaterialPrefixName();
+        Ogre::String getEntityClustersMergedMaterialName();
+
+        Ogre::String getEntityClustersSplittedMaterialName();
 
         bool getBillboardCloudMergedBillboards();
@@ -64 +70 @@
         Ogre::String getBillboardCloudFolder();
 
-        Ogre::String getBillboardCloudMeshPrefixName();
+        Ogre::String getBillboardCloudMergedMeshName();
 
-        Ogre::String getBillboardCloudBillboardMaterialPrefixName();
+        Ogre::String getBillboardCloudGroupedMeshName();
 
-        Ogre::String getBillboardCloudBillboardGroupMaterialPrefixName();
+        Ogre::String getBillboardCloudSplittedMeshName();
 
-        Ogre::String getBillboardCloudBillboardTextureUnit0PrefixName();
+        Ogre::String getBillboardCloudMergedMaterialName();
 
-        Ogre::String getBillboardCloudBillboardGroupTextureUnit0PrefixName();
+        Ogre::String getBillboardCloudSplittedMaterialName();
 
-        Ogre::String getBillboardCloudXMLPrefixName();
+        Ogre::String getBillboardCloudGroupedMaterialName();
+
+        Ogre::String getBillboardCloudSplittedTextureUnit0Name();
+
+        Ogre::String getBillboardCloudMergedTextureUnit0Name();
+
+        Ogre::String getBillboardCloudGroupedTextureUnit0Name();
+
+        Ogre::String getBillboardCloudGroupedXMLName();
+
+        Ogre::String getBillboardCloudSplittedXMLName();
+
+        Ogre::String getBillboardCloudMergedXMLName();
 
         unsigned int getBillboardCloudGroups();
@@ -82 +100 @@
         bool getBillboardCloudDiffuseColorEntityTextureAtlasGeneration();
 
-        Ogre::String getBillboardCloudDiffuseColorEntityTexturePrefixName();
+        Ogre::String getBillboardCloudDiffuseColorEntityTextureName();
 
-        Ogre::String getBillboardCloudDiffuseColorEntityTextureAtlasPrefixName();
+        Ogre::String getBillboardCloudDiffuseColorEntityTextureAtlasName();
 
         unsigned int getBillboardCloudDiffuseColorEntityTextureAtlasBitRange();
@@ -94 +112 @@
         bool getBillboardCloudIndirectBillboardGroupTextureAtlasGeneration();
 
-        Ogre::String getBillboardCloudIndirectBillboardGroupTextureAtlasPrefixName();
+        Ogre::String getBillboardCloudIndirectBillboardGroupTextureAtlasName();
 
         unsigned int getBillboardCloudIndirectBillboardGroupTextureAtlasBitRange();
@@ -106 +124 @@
         bool getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasGeneration();
 
-        Ogre::String getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasPrefixName();
+        Ogre::String getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasName();
 
         unsigned int getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasBitRange();
@@ -120 +138 @@
         bool getBillboardCloudIndirectMergedBillboardsTextureAtlasGeneration();
 
-        Ogre::String getBillboardCloudIndirectMergedBillboardsTextureAtlasPrefixName();
+        Ogre::String getBillboardCloudIndirectMergedBillboardsTextureAtlasName();
 
         unsigned int getBillboardCloudIndirectMergedBillboardsTextureAtlasBitRange();