Changeset 909 for GTP/trunk

Timestamp:

05/05/06 15:19:28 (19 years ago)

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE

Files:

• include/LBBC/LBBCBillboardViewMode.h (modified) (1 diff)
• include/OBA/OBAOgreApplication.h (modified) (1 diff)
• scripts/IBRBillboardCloudTreeGeneratorCommandLine.vcproj (modified) (2 diffs)
• src/LBBCManager.cpp (modified) (1 diff)
• src/OBAOgreApplication.cpp (modified) (2 diffs)

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

@@ -25 +25 @@
                 bool frameStarted(const Ogre::FrameEvent& evt, Ogre::InputReader *inputReader)
                 {
+                        Ogre::LogManager::getSingleton().logMessage("Before reloading the textureUnitState:" + mBillboardCloudEntity->getSubEntity(0)->getMaterial()->getBestTechnique()->getPass(0)->getTextureUnitState(1)->getName());
+                        Ogre::TextureManager::getSingleton().load(mBillboardCloudEntity->getSubEntity(0)->getMaterial()->getBestTechnique()->getPass(0)->getTextureUnitState(1)->getName(), Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+                        //mBillboardCloudEntity->getSubEntity(0)->getMaterial()->getBestTechnique()->getPass(0)->getTextureUnitState(1)->_load();
+                        Ogre::LogManager::getSingleton().logMessage("After reloading the textureUnitState:" + mBillboardCloudEntity->getSubEntity(0)->getMaterial()->getBestTechnique()->getPass(0)->getTextureUnitState(1)->getName());
+                        //mWindow->setDebugText(mBillboardCloudEntity->getSubEntity(0)->getMaterial()->getBestTechnique()->getPass(0)->getTextureUnitState(1)->getName());
+
                         showDebugOverlay(true);
                         mWindow->getViewport(0)->setBackgroundColour(Ogre::ColourValue(0.0, 0.0, 0.0, 1.0));                    
-                        mEpsilonText = Ogre::String("Epsilon:") + Ogre::StringConverter::toString(epsilonX) + Ogre::String(",") + Ogre::StringConverter::toString(epsilonY);
-                        mWindow->setDebugText(mEpsilonText);
-
+                        //mEpsilonText = Ogre::String("Epsilon:") + Ogre::StringConverter::toString(epsilonX) + Ogre::String(",") + Ogre::StringConverter::toString(epsilonY);
+                        //mWindow->setDebugText(mEpsilonText);
+                        
                         return OgreFrameListenerMode::frameStarted(evt, inputReader);   
                 }

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/OBA/OBAOgreApplication.h

@@ -27 +27 @@
         OgreBase *mOgreBase;
         Ogre::Root *mRoot;
+    Ogre::SceneManager* mSceneMgr;
     Ogre::Camera* mCamera;
     OgreFrameListener* mFrameListener;

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/scripts/IBRBillboardCloudTreeGeneratorCommandLine.vcproj

@@ -24 +24 @@
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
-                                RuntimeLibrary="1"
+                                RuntimeLibrary="3"
                                 DisableLanguageExtensions="FALSE"
                                 UsePrecompiledHeader="0"
@@ -73 +73 @@
                                 AdditionalIncludeDirectories="../include;../include/OBA;../include/BBC;../include/IMG;../include/LBBC;../../../../../../../OGRE/trunk/ogrenew/OgreMain/include;../../../../../../../OGRE/trunk/ogrenew/Tools/XMLConverter/include;../../../../../../../NonGTP\Boost;../../../../../../../NonGTP\ImageDebugger\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                                RuntimeLibrary="0"
+                                RuntimeLibrary="2"
                                 DisableLanguageExtensions="FALSE"
                                 UsePrecompiledHeader="0"

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

@@ -76 +76 @@
         entityLeaves->setMesh(meshLeaves);      
         mLeaves->setEntity(entityLeaves);
-        mLeaves->getEntity()->setMesh(meshLeaves);
 }
 

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

@@ -81 +81 @@
                         // If returned true, user clicked OK so initialise
                         // Here we choose to let the system create a default rendering window by passing 'true'
-                        //mRoot->initialise(true);
+                        //mWindow = mRoot->initialise(true);
                         //mWindow->resize(512,512);
                         mRoot->initialise(false);
@@ -101 +101 @@
 void OgreApplication::createFrameListener(void)
 {
-    mFrameListener = new OgreFrameListener(mWindow);
+        OBA::OgreFrameListenerMode *defaultFrameListenerMode;
         
+    mFrameListener = new OgreFrameListener(mWindow); 
+        defaultFrameListenerMode =  mFrameListener->getFrameListenerMode(0);
+        mSceneMgr = defaultFrameListenerMode->getSceneManager();
+
     mRoot->addFrameListener(mFrameListener);
 }