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

Timestamp:

04/11/06 09:20:23 (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

@@ -21 +21 @@
                 mSampleConfigFile = new LBBC::SampleConfigFile();
                 mSampleConfigFile->load(mOpts.cfg);
-
-                this->setup(false);
+                //this->setup(false);
+                //mLBBCManager = new LBBC::LBBCManager();       
+                //mLBBCManager->setSampleConfigFile(mSampleConfigFile);
+                ////mLBBCManager->loadSampleConfigFile(mOpts.cfg);
+                //mLBBCManager->initialize();
+
+                //if (mSampleConfigFile->getEntityDistributionGeneration())
+                //{
+                //      mLBBCManager->generateEntityDistribution();
+                //}
+                //else
+                //{
+                //      mLBBCManager->loadEntityDistribution();
+                //}
+                //if (mSampleConfigFile->getEntitySampleMeshGeneration())
+                //{
+                //      mLBBCManager->saveSingleEntity();
+                //}
+                //if (mSampleConfigFile->getEntityClustersGeneration())
+                //{
+                //      mLBBCManager->generateEntityClusters();
+                //}
+                //if (mSampleConfigFile->getBillboardCloudGeneration())
+                //{
+                //      mLBBCManager->generateBillboardCloud();
+                //}
+
+                //mLBBCManager->shutdown();
+                //delete mLBBCManager;
+                //mOgreBase->shutdown();                
+                //delete mOgreBase;
+                //----------------------------------------------------------------------------
+                this->setup(true);
                 mLBBCManager = new LBBC::LBBCManager(); 
                 mLBBCManager->setSampleConfigFile(mSampleConfigFile);   
                 //mLBBCManager->loadSampleConfigFile(mOpts.cfg);
-                mLBBCManager->runSampleConfigFile();    
-                mLBBCManager->shutdown();
-                delete mLBBCManager;
-                mOgreBase->shutdown();          
-                delete mOgreBase;
-                //----------------------------------------------------------------------------
-                this->setup(true);
+                mLBBCManager->initialize();
+                mLBBCManager->loadBillboardCloudMergedXML();
                 this->go();     
                 for (unsigned int iFrameListenerMode = 0; iFrameListenerMode < mFrameListener->getNumFrameListenerModes(); iFrameListenerMode++)
@@ -39 +65 @@
                 }
                 mRoot->shutdown();      
-                mWindow->destroy();             
+                mWindow->destroy();     
                 delete mRoot;
                 delete mSampleConfigFile;
         }
+
 
 }
@@ -117 +144 @@
 
         {
-                LBBC::ClusterViewMode *anotherFrameListenerMode;
-                anotherFrameListenerMode = new LBBC::ClusterViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
+                LBBC::BillboardCloudTextureViewMode *anotherFrameListenerMode;
+                anotherFrameListenerMode = new LBBC::BillboardCloudTextureViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
                 anotherFrameListenerMode->chooseSceneManager();
                 anotherFrameListenerMode->createCamera();
                 anotherFrameListenerMode->createViewports();
+                //anotherFrameListenerMode->setEntityName(Ogre::String(mSampleConfigFile->getEntityClustersMeshPrefixName() + "Merged.mesh"));
+                anotherFrameListenerMode->setTextureAtlasSize(mSampleConfigFile->getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasSize());
+                anotherFrameListenerMode->setTextureSize(mSampleConfigFile->getBillboardCloudDiffuseColorMergedBillboardsTextureSize());
+                anotherFrameListenerMode->setTextureAtlasBitRange(mSampleConfigFile->getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasBitRange());
+                anotherFrameListenerMode->setTextureAtlasName(mSampleConfigFile->getBillboardCloudDiffuseColorMergedBillboardsTextureAtlasPrefixName());
+                anotherFrameListenerMode->setTextureAtlasFolder(mSampleConfigFile->getBillboardCloudFolder());
                 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);
+        //}
 
         //{