Changeset 751 for GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/IBRBillboardCloudTreeApplication.cpp

Timestamp:

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

Author:

igarcia

Message:

 

File:

• GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/IBRBillboardCloudTreeApplication.cpp (modified) (3 diffs)

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

@@ -59 +59 @@
                 //mLBBCManager->loadSampleConfigFile(mOpts.cfg);
                 mLBBCManager->initialize();
-                mLBBCManager->loadBillboardCloudMergedXML();
+                //mLBBCManager->loadBillboardCloudMergedXML();
+                mLBBCManager->loadBillboardCloudGroupedXML();
                 this->go();     
                 for (unsigned int iFrameListenerMode = 0; iFrameListenerMode < mFrameListener->getNumFrameListenerModes(); iFrameListenerMode++)
@@ -147 +148 @@
 
         {
-                LBBC::BillboardCloudTextureViewMode *anotherFrameListenerMode;
-                anotherFrameListenerMode = new LBBC::BillboardCloudTextureViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
-                anotherFrameListenerMode->chooseSceneManager();
-                anotherFrameListenerMode->createCamera();
-                anotherFrameListenerMode->createViewports();
-                anotherFrameListenerMode->setTextureAtlasSize(mSampleConfigFile->getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasSize());
-                anotherFrameListenerMode->setTextureSize(mSampleConfigFile->getBillboardCloudDiffuseColorMergedBillboardsTextureSize());
-                anotherFrameListenerMode->setTextureAtlasBitRange(mSampleConfigFile->getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasBitRange());
-                anotherFrameListenerMode->setTextureAtlasName(mSampleConfigFile->getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasName());
-                anotherFrameListenerMode->setTextureAtlasFolder(mSampleConfigFile->getBillboardCloudFolder());
-                anotherFrameListenerMode->setEntityName(mSampleConfigFile->getEntityClustersMergedMeshName());
-                anotherFrameListenerMode->createScene();
-                mFrameListener->addFrameListenerMode(anotherFrameListenerMode);
-        }
-
-        {
-                LBBC::ClusterViewMode *anotherFrameListenerMode;
-                anotherFrameListenerMode = new LBBC::ClusterViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
-                anotherFrameListenerMode->chooseSceneManager();
-                anotherFrameListenerMode->createCamera();
-                anotherFrameListenerMode->createViewports();
-                anotherFrameListenerMode->createScene();
-                mFrameListener->addFrameListenerMode(anotherFrameListenerMode);
-        }
-
-        {
-                LBBC::BillboardViewMode *anotherFrameListenerMode;
-                anotherFrameListenerMode = new LBBC::BillboardViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
-                anotherFrameListenerMode->chooseSceneManager();
-                anotherFrameListenerMode->createCamera();
-                anotherFrameListenerMode->createViewports();
-                anotherFrameListenerMode->createScene();
-                mFrameListener->addFrameListenerMode(anotherFrameListenerMode);
-        }
-
-        {
                 LBBC::EntityTextureAtlasViewMode *textureAtlasFrameListenerMode;
                 textureAtlasFrameListenerMode = new LBBC::EntityTextureAtlasViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
@@ -199 +164 @@
         }
 
+        {
+                LBBC::BillboardCloudTextureViewMode *anotherFrameListenerMode;
+                anotherFrameListenerMode = new LBBC::BillboardCloudTextureViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
+                anotherFrameListenerMode->chooseSceneManager();
+                anotherFrameListenerMode->createCamera();
+                anotherFrameListenerMode->createViewports();
+                anotherFrameListenerMode->setTextureAtlasSize(mSampleConfigFile->getBillboardCloudDiffuseColorGroupedBillboardsTextureAtlasSize());
+                anotherFrameListenerMode->setTextureSize(mSampleConfigFile->getBillboardCloudDiffuseColorGroupedBillboardsTextureSize());
+                anotherFrameListenerMode->setTextureAtlasBitRange(mSampleConfigFile->getBillboardCloudDiffuseColorGroupedBillboardsTextureAtlasBitRange());
+                anotherFrameListenerMode->setTextureAtlasName(mSampleConfigFile->getBillboardCloudDiffuseColorGroupedBillboardsTextureAtlasName());
+                anotherFrameListenerMode->setTextureName(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureName());
+                anotherFrameListenerMode->setTextureAtlasFolder(mSampleConfigFile->getBillboardCloudFolder());
+                anotherFrameListenerMode->setEntityClustersGroupedName(mSampleConfigFile->getEntityClustersGroupedMeshName());
+                //anotherFrameListenerMode->setBillboardCloudSplittedName(mSampleConfigFile->getBillboardCloudSplittedMeshName());
+                anotherFrameListenerMode->setBillboardCloudSplittedName(mSampleConfigFile->getBillboardCloudIndirectPointMeshName());
+                anotherFrameListenerMode->setBillboardCloudGroupedTextureAtlasDebug(mSampleConfigFile->getBillboardCloudDiffuseColorGroupedBillboardsTextureAtlasDebug());
+                anotherFrameListenerMode->createScene();
+                mFrameListener->addFrameListenerMode(anotherFrameListenerMode);
+        }
+
+        {
+                LBBC::BillboardViewMode *anotherFrameListenerMode;
+                anotherFrameListenerMode = new LBBC::BillboardViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
+                anotherFrameListenerMode->chooseSceneManager();
+                anotherFrameListenerMode->createCamera();
+                anotherFrameListenerMode->createViewports();
+                //anotherFrameListenerMode->setBillboardCloudMeshName(mSampleConfigFile->getBillboardCloudGroupedMeshName());
+                anotherFrameListenerMode->createScene();
+                mFrameListener->addFrameListenerMode(anotherFrameListenerMode);
+        }
+
+        {
+                LBBC::ClusterViewMode *anotherFrameListenerMode;
+                anotherFrameListenerMode = new LBBC::ClusterViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
+                anotherFrameListenerMode->chooseSceneManager();
+                anotherFrameListenerMode->createCamera();
+                anotherFrameListenerMode->createViewports();
+                //anotherFrameListenerMode->setEntityClustersMeshName(mSampleConfigFile->getEntityClustersGroupedMeshName());
+                anotherFrameListenerMode->createScene();
+                mFrameListener->addFrameListenerMode(anotherFrameListenerMode);
+        }
+
         mFrameListener->removeFrameListenerMode(0);
         mFrameListener->setEnabledFrameListenerMode(0);