Changeset 2344

Timestamp:

05/03/07 11:31:23 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/src

Files:

• CausticTest/include/CausticTest.h (modified) (4 diffs)
• CausticTest/src/CausticTest.cpp (modified) (1 diff)
• Moria/include/Moria.h (modified) (1 diff)

GTP/trunk/App/Demos/Illum/Ogre/src/CausticTest/include/CausticTest.h

@@ -55 +55 @@
                 this->app = app;
     }
+        void setAttr(SceneNode* lightNode, SceneNode* sphereNode, Light* l)
+        {
+                this->sphereNode = sphereNode;
+                this->lightNode = lightNode;
+                light = l;              
+        }
         bool processUnbufferedKeyInput(const FrameEvent& evt)
     {
@@ -137 +143 @@
         void LoadRes()
         {
-                loadResources();
+                setupResources();
+                
+                MaterialManager::getSingleton().initialise();
+                
+                ResourceGroupManager::getSingleton().initialiseResourceGroup("Bootstrap");
+                ResourceGroupManager::getSingleton().initialiseResourceGroup("General");
+                ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Basic");
+                ResourceGroupManager::getSingleton().initialiseResourceGroup("PostProc");
+                ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_EnvMap");
+                ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Caustic");
+
+                ResourceGroupManager::getSingleton().loadResourceGroup("Bootstrap");
+                ResourceGroupManager::getSingleton().loadResourceGroup("General");
+                ResourceGroupManager::getSingleton().loadResourceGroup("GTP_Basic");
+                ResourceGroupManager::getSingleton().loadResourceGroup("PostProc");
+                ResourceGroupManager::getSingleton().loadResourceGroup("GTP_EnvMap");
+                ResourceGroupManager::getSingleton().loadResourceGroup("GTP_Caustic");
+
         }
         void setupScene()
@@ -190 +213 @@
         mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());              
         }
+        setFrameListenerAttr()
+        {
+                ((RaytraceDemoListener*) mFrameListener)->setAttr(mainLightNode, sphereNode, light);
+        }
+        void clearResources(void)
+        {
+                ResourceGroupManager::getSingleton().destroyResourceGroup("Bootstrap");
+                ResourceGroupManager::getSingleton().destroyResourceGroup("General");
+                ResourceGroupManager::getSingleton().destroyResourceGroup("GTP_Basic");
+                ResourceGroupManager::getSingleton().destroyResourceGroup("PostProc");
+                ResourceGroupManager::getSingleton().destroyResourceGroup("GTP_EnvMap");
+                ResourceGroupManager::getSingleton().destroyResourceGroup("GTP_Caustic");
+
+
+        }
 
 protected:
@@ -203 +241 @@
         void loadResources(void)
         {
-                
                 // Initialise, parse scripts etc
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("Bootstrap");

GTP/trunk/App/Demos/Illum/Ogre/src/CausticTest/src/CausticTest.cpp

@@ -49 +49 @@
                    Root::getSingleton().removeFrameListener(&OgreIlluminationManager::getSingleton());
                    Root::getSingleton()._getCurrentSceneManager()->clearScene();
+                   Root::getSingleton()._getCurrentSceneManager()->destroyAllParticleSystems();
                    TextureManager::getSingleton().removeAll();
                    MeshManager::getSingleton().removeAll();
                    MaterialManager::getSingleton().removeAll();
-           //}
-           //if (framecount == 120)
-           //{
+                   ParticleSystemManager::getSingleton().removeAllTemplates();
+                   app->clearResources();
+           }
+           if (framecount == 120)
+           {
                    app->LoadRes();
                    app->setupScene();
+                   app->setFrameListenerAttr();
            }
       return result;     

GTP/trunk/App/Demos/Illum/Ogre/src/Moria/include/Moria.h

@@ -126 +126 @@
                 //mSceneMgr->setWorldGeometry(occlusion_cfg);
                 
-                //createPostproc();
+                createPostproc();
 
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);