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

Timestamp:

04/06/06 20:48:19 (18 years ago)

Author:

igarcia

Message:

 

File:

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

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

@@ -19 +19 @@
         for (unsigned int i = 0; i < 1; i++)
         {
+                mSampleConfigFile = new LBBC::SampleConfigFile();
+                mSampleConfigFile->load(mOpts.cfg);
+
                 this->setup(false);
-                mLBBCManager = new LBBC::Manager();     
-                LBBC::SampleConfigFile *sampleConfigFile = new LBBC::SampleConfigFile();
-                sampleConfigFile->load(mOpts.cfg);
-                mLBBCManager->setSampleConfigFile(sampleConfigFile);    
+                mLBBCManager = new LBBC::LBBCManager(); 
+                mLBBCManager->setSampleConfigFile(mSampleConfigFile);   
                 //mLBBCManager->loadSampleConfigFile(mOpts.cfg);
                 mLBBCManager->runSampleConfigFile();    
@@ -33 +34 @@
                 this->setup(true);
                 this->go();     
+                for (unsigned int iFrameListenerMode = 0; iFrameListenerMode < mFrameListener->getNumFrameListenerModes(); iFrameListenerMode++)
+                {
+                        mFrameListener->getFrameListenerMode(iFrameListenerMode)->destroyScene();
+                }
                 mRoot->shutdown();      
                 mWindow->destroy();             
                 delete mRoot;
+                delete mSampleConfigFile;
         }
+
 }
 
@@ -108 +115 @@
         
         mSceneMgr = mFrameListener->getEnabledFrameListenerMode()->getSceneManager();   
+
         {
-                LBBC::ClustersViewMode *anotherFrameListenerMode;
-                anotherFrameListenerMode = new LBBC::ClustersViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
+                LBBC::ClusterViewMode *anotherFrameListenerMode;
+                anotherFrameListenerMode = new LBBC::ClusterViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
                 anotherFrameListenerMode->chooseSceneManager();
                 anotherFrameListenerMode->createCamera();
@@ -118 +126 @@
         }
 
+        //{
+        //      LBBC::BillboardViewMode *anotherFrameListenerMode;
+        //      anotherFrameListenerMode = new LBBC::BillboardViewMode(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());
+                textureAtlasFrameListenerMode->chooseSceneManager();
+                textureAtlasFrameListenerMode->createCamera();
+                textureAtlasFrameListenerMode->createViewports();
+                textureAtlasFrameListenerMode->setTextureAtlasSize(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasSize());
+                textureAtlasFrameListenerMode->setTextureAtlasBitRange(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasBitRange());
+                textureAtlasFrameListenerMode->setTextureAtlasNumSamples(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasNumSamples());
+                textureAtlasFrameListenerMode->setTextureName(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTexturePrefixName());
+                textureAtlasFrameListenerMode->setTextureAtlasName(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasPrefixName());
+                textureAtlasFrameListenerMode->setTextureAtlasFolder(mSampleConfigFile->getBillboardCloudFolder());
+
+                mFrameListener->addFrameListenerMode(textureAtlasFrameListenerMode);
+                textureAtlasFrameListenerMode->createScene();
         }
 
-        mFrameListener->setEnabledFrameListenerMode(1);
         mFrameListener->removeFrameListenerMode(0);
+        mFrameListener->setEnabledFrameListenerMode(0);
 
     mRoot->addFrameListener(mFrameListener);