Changeset 967 for GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src

Timestamp:

05/16/06 18:27:50 (19 years ago)

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src

Files:

• IBRBillboardCloudTreeApplication.cpp (modified) (1 diff)
• LBBCManager.cpp (modified) (2 diffs)
• LBBCSampleConfigFile.cpp (modified) (1 diff)

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/IBRBillboardCloudTreeApplication.cpp

@@ -177 +177 @@
                 anotherFrameListenerMode->setTextureAtlasName(mSampleConfigFile->getBillboardCloudIndirectGroupedBillboardsTextureAtlasName());
                 anotherFrameListenerMode->setTextureAtlasFolder(mSampleConfigFile->getBillboardCloudFolder());
-                anotherFrameListenerMode->setBillboardCloudPointClustersName(mSampleConfigFile->getBillboardCloudIndirectPointMeshName());
+                anotherFrameListenerMode->setBillboardCloudPointClustersName(mSampleConfigFile->getBillboardCloudDiffuseColorPointClustersMeshName());
                 anotherFrameListenerMode->setBillboardCloudSplittedName(mSampleConfigFile->getBillboardCloudSplittedMeshName());
                 anotherFrameListenerMode->setEntityClustersGroupedName(mSampleConfigFile->getEntityClustersGroupedMeshName());

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/LBBCManager.cpp

@@ -512 +512 @@
         entity = BBC::EntityPtr(new BBC::Entity());
         mDiffuseColorPointClusterGenerator->setEntity(entity);
-        mDiffuseColorPointClusterGenerator->setMaterialName(mSampleConfigFile->getBillboardCloudIndirectPointMaterialName());
+        mDiffuseColorPointClusterGenerator->setMaterialName(mSampleConfigFile->getBillboardCloudDiffuseColorPointClustersMaterialName());
         mDiffuseColorPointClusterGenerator->setNumSamples(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasNumSamples());
         mDiffuseColorPointClusterGenerator->setBillboardCloud(getLeaves()->getBillboardCloud());
@@ -522 +522 @@
 {
         mOgreMeshSerializer->setEntity(mDiffuseColorPointClusterGenerator->getEntity());
-        mOgreMeshSerializer->exportMesh(mSampleConfigFile->getBillboardCloudFolder() + mSampleConfigFile->getBillboardCloudIndirectPointMeshName(), false, false);
-        OBA::OgreBase::getSingleton().getMeshSerializer()->exportMesh(mDiffuseColorPointClusterGenerator->getEntity()->getMesh()->get(), mSampleConfigFile->getEntityDistributionFolder() + mSampleConfigFile->getBillboardCloudIndirectPointMeshName());
+        mOgreMeshSerializer->exportMesh(mSampleConfigFile->getBillboardCloudFolder() + mSampleConfigFile->getBillboardCloudDiffuseColorPointClustersMeshName(), false, false);
+        OBA::OgreBase::getSingleton().getMeshSerializer()->exportMesh(mDiffuseColorPointClusterGenerator->getEntity()->getMesh()->get(), mSampleConfigFile->getEntityDistributionFolder() + mSampleConfigFile->getBillboardCloudDiffuseColorPointClustersMeshName());
         //OBA::OgreBase::getSingleton().getXMLMeshSerializer()->exportMesh(entity->getMesh()->get(), mSampleConfigFile->getEntityDistributionFolder() + mSampleConfigFile->getBillboardCloudIndirectPointMeshName() + ".xml");  
 }

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/LBBCSampleConfigFile.cpp

@@ -127 +127 @@
 }
 
-Ogre::String SampleConfigFile::getBillboardCloudIndirectPointMeshName()
-{
-        return getSetting("Billboard Cloud Indirect Point Mesh Name");
-}
-
-Ogre::String SampleConfigFile::getBillboardCloudIndirectPointMaterialName()
-{
-        return getSetting("Billboard Cloud Indirect Point Material Name");
+Ogre::String SampleConfigFile::getBillboardCloudDiffuseColorPointClustersMeshName()
+{
+        return getSetting("Billboard Cloud Diffuse Color Point Clusters Mesh Name");
+}
+
+Ogre::String SampleConfigFile::getBillboardCloudDiffuseColorPointClustersMaterialName()
+{
+        return getSetting("Billboard Cloud Diffuse Color Point Clusters Material Name");
 }