Changeset 1487 for GTP/trunk/App/Demos/Illum/Ogre/src

Timestamp:

09/26/06 09:47:54 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• CausticTest/include/CausticTest.h (modified) (4 diffs)
• GameToolsParticleDemo/include/GameToolsParticleDemo.h (modified) (4 diffs)
• GameToolsRaytraceDemo/include/GameToolsRaytraceDemo.h (modified) (5 diffs)

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

@@ -113 +113 @@
 
 public:
-        virtual void go(void)
-    {
-        if (!setup())
-            return;
-
-        renderScene();
-                
-        // clean up
-        destroyScene();
-    }
-
 
 protected:
         SceneNode* mainLightNode;
         SceneNode* sphereNode;
-
-void renderScene(){
-                
-                mWindow->resetStatistics();
-                while(true){            
-
-                        
-                        #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32            
-                        // Pump events on Win32
-                MSG  msg;
-                        while( PeekMessage( &msg, NULL, 0U, 0U, PM_REMOVE ) )
-                        {
-                                TranslateMessage( &msg );
-                                DispatchMessage( &msg );
-                        }
-                        
-                        #endif
-                        
-                        if(!mRoot->_fireFrameStarted()){
-                                break;
-                        }
-                        unsigned long framenum = mRoot->getCurrentFrameNumber();
-                        
-                        OgreIlluminationManager::getSingleton().update(framenum, mWindow);
-                        
-                        //mRoot->renderOneFrame();
-                        mRoot->_updateAllRenderTargets();
-
-                        mRoot->_fireFrameEnded();       
-                        
-                }
-        }
 
         void createPostproc()
@@ -191 +148 @@
                 // Skybox
         mSceneMgr->setSkyBox(true, "Examples/MorningSkyBox");
-
+/*
                 SceneNode* rootNode = mSceneMgr->getRootSceneNode();
 
@@ -219 +176 @@
 
                 createPlane("ground", "TestPlane", Vector3(0,0,0), Vector2(500,500));
-        
+        */
                 OgreIlluminationManager::getSingleton().initTechniques();
                 
@@ -253 +210 @@
                                                                                         sphereNode
                                                                                         );
-        mRoot->addFrameListener(mFrameListener);
-                //mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());
-
+        mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());
+                mRoot->addFrameListener(mFrameListener);
+        
     }
 

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

@@ -58 +58 @@
 
 public:
-        virtual void go(void)
+/*      virtual void go(void)
     {
         if (!setup())
@@ -67 +67 @@
         // clean up
         destroyScene();
-    }
+    }*/
 
 protected:
         SceneNode* kupolaNode;
         SceneNode* mainLightNode;
-                
+        /*      
         void renderScene(){
                 
@@ -103 +103 @@
                         
                 }
-        }
+        }*/
 
         void createPostproc()
@@ -200 +200 @@
                 mFrameListener= new ParticleDemoFrameListener(mWindow,
                                                                                         mCamera );
-        mRoot->addFrameListener(mFrameListener);
-
-    }
+    mRoot->addFrameListener(mFrameListener);
+        mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());
+   }
 
 };

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

@@ -145 +145 @@
 
 public:
-        virtual void go(void)
+/*      virtual void go(void)
     {
         if (!setup())
@@ -155 +155 @@
         destroyScene();
     }
-
+*/
 
 protected:
@@ -164 +164 @@
         SceneNode* copperSphereNode;
         SceneNode* aluSphereNode;
-
+/*
 void renderScene(){
                 
@@ -195 +195 @@
                         
                 }
-        }
+        }*/
 
         void createPostproc()
@@ -342 +342 @@
                                                                                         aluSphereNode);
         mRoot->addFrameListener(mFrameListener);
-                //mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());
+                mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());
 
     }