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

Timestamp:

12/11/06 16:30:08 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• Common/include/FrameCapture.h (modified) (1 diff)
• DiffuseTest/include/DiffuseTest.h (modified) (3 diffs)
• HierarchicalSystem/include/HierarchicalSystem.h (modified) (9 diffs)
• ReflectionTest/include/ReflectionTest.h (modified) (2 diffs)

GTP/trunk/App/Demos/Illum/Ogre/src/Common/include/FrameCapture.h

@@ -79 +79 @@
          isRecording = false;
          isSaving = false;
-         framerate = 20;
+         framerate = 15;
          frameTime = 1000 / framerate;
          lastTime = 0;

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

@@ -368 +368 @@
         }
     
+        void createCamera(void)
+    {
+        // Create the camera
+        mCamera = mSceneMgr->createCamera("PlayerCam");
+                
+                SceneNode* camNode = mSceneMgr->getRootSceneNode()->createChildSceneNode("mainCameraNode");
+                camNode->attachObject(mCamera);
+       //camNode->setPosition(Vector3(0,1,0));
+        // Position it at 500 in Z direction
+        //mCamera->setPosition(Vector3(0,0,500));
+        // Look back along -Z
+        //mCamera->lookAt(Vector3(0,0,-300));
+        mCamera->setNearClipDistance(5);
+
+    }
 
         void createScene(void)
     {
 
-                createPostproc();
+                //createPostproc();
                 
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);
@@ -381 +396 @@
                 Root::getSingleton()._setCurrentSceneManager(mSceneMgr);
 
-                mCamera->setPosition(0,1,0);            
+                //mCamera->setPosition(0,1,0);          
                 mCamera->setFOVy(Radian(Degree(80)));
                 mCamera->setFarClipDistance(200);
@@ -643 +658 @@
                 SceneNode* roomNode = rootNode->createChildSceneNode();
                 roomNode->attachObject(room);
-                roomNode->_updateBounds();              
+                roomNode->_updateBounds();      
+
+
+                capture->addAnimableNode(objectNode);
+                capture->addAnimableNode(mCamera->getParentSceneNode());
 
                 mSceneMgr->setShadowTechnique(SHADOWTYPE_NONE);

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

@@ -27 +27 @@
 
 
+int scene = 2;
+
 // Listener class for frame updates
 class ParticleDemoFrameListener : public ExampleFrameListener
@@ -32 +34 @@
 protected:
         
-        unsigned long framecount;
         SceneNode* lightNode;
 
@@ -40 +41 @@
                                  
     {
-                this->lightNode = lightNode;
-                framecount = 0;         
+                this->lightNode = lightNode;            
     }
 
@@ -48 +48 @@
                 bool result = ExampleFrameListener::frameStarted(evt);
                 
-                Timer* timer = Root::getSingleton().getTimer();
-                
-                float t = (float) timer->getMilliseconds() / 2000.0;
-                float r = 150;
-                lightNode->setPosition( r * sin(t), r * sin(5 * t) + 200 , r * cos(t));
-
-       framecount++;
+                if(scene == 1)
+                {
+                        Timer* timer = Root::getSingleton().getTimer();
+                        
+                        float t = (float) timer->getMilliseconds() / 2000.0;
+                        float r = 150;
+                        lightNode->setPosition( r * sin(t), r * sin(5 * t) + 200 , r * cos(t));
+                }      
         return result;     
     }
@@ -82 +83 @@
          virtual void chooseSceneManager(void)
     {
-                ExampleApplication::chooseSceneManager();
-        // Get the SceneManager, in this case a generic one
-       // mSceneMgr = mRoot->createSceneManager("TerrainSceneManager");
+                if(scene == 1)
+                 ExampleApplication::chooseSceneManager();
+                else if(scene == 2)
+         mSceneMgr = mRoot->createSceneManager("TerrainSceneManager");
     }
 
@@ -94 +96 @@
                 OgreIlluminationManager::getSingleton().setMainViewport(mWindow->getViewport(0));
                 
-                //std::string terrain_cfg("terrain.cfg");
-                //mSceneMgr -> setWorldGeometry( terrain_cfg );
-
+                
                 Root::getSingleton()._setCurrentSceneManager(mSceneMgr);
-                mCamera->setPosition(0,150,100);
-                mCamera->setDirection(0,0,-1);
+                
                 mCamera->setFOVy(Radian(Degree(80)));
-                mCamera->setFarClipDistance(1000);
+                mCamera->setFarClipDistance(5000);
                 // Set ambient light
         mSceneMgr->setAmbientLight(ColourValue(1, 1, 1));
@@ -107 +106 @@
                 // Skybox
         mSceneMgr->setSkyBox(true, "Examples/EveningSkyBox", 10);
-                SceneNode* rootNode = mSceneMgr->getRootSceneNode();
-                                        
-      /*
-                //init objects
-                Entity* kupola = mSceneMgr->createEntity("kupola", "kupola.mesh");              
-                                
-                //init nodes
-                kupolaNode = rootNode->createChildSceneNode( "kupola" );
-                kupolaNode->rotate(Vector3(0,1,0),Radian(Degree(90)));
-                //kupolaNode->setPosition(0, -150, 0);
-                kupolaNode->attachObject( kupola );
-                kupolaNode->scale(50,50,50);            
-                kupolaNode->_updateBounds();
-                MeshPtr kmesh = kupola->getMesh();
-                kmesh->buildTangentVectors(0,1);*/
+                
+                
 
-                Entity* head = mSceneMgr->createEntity("head", "athene.mesh");
-                SceneNode* headNode = rootNode->createChildSceneNode("head");
-                head->setMaterialName("GameTools/Standard");
-                headNode->attachObject(head);
-                //headNode->setScale(1.5,1.5,1.5);
-                AxisAlignedBox bbox = head->getBoundingBox();
-                headNode->setPosition(0,80,20);         
-                headNode->_updateBounds();
+                
 
-                ParticleSystem* pSys1 = mSceneMgr->createParticleSystem("psys1", "GameTools/Big");
-                pSys1->setKeepParticlesInLocalSpace(false);
-                SceneNode *pSysNode = rootNode->createChildSceneNode("psys1");
-                pSysNode->attachObject(pSys1);
-                pSysNode->setPosition(0,0,0);
+        //      OgreIlluminationManager::getSingleton().createGlobalRun(ILLUMRUN_PHASE_TEXTURE);
+        //      OgreIlluminationManager::getSingleton().updateGlobalRun(ILLUMRUN_PHASE_TEXTURE, 1);
+        //      OgreIlluminationManager::getSingleton().savePhaseTextureToFile("phase.dds");
+
+                
+                if(scene == 1)
+                        createScene1();
+                else if(scene == 2)
+                        createScene2();
+
+
+                OgreIlluminationManager::getSingleton().initTechniques();
+
+   }
+        
+   void createScene1()
+   {
+           mCamera->setPosition(0,150,100);
+           mCamera->setDirection(0,0,-1);
+
+           SceneNode* rootNode = mSceneMgr->getRootSceneNode(); 
+
+           Entity* head = mSceneMgr->createEntity("head", "athene.mesh");
+           SceneNode* headNode = rootNode->createChildSceneNode("head");
+           head->setMaterialName("GameTools/Standard");
+           headNode->attachObject(head);
+           //headNode->setScale(1.5,1.5,1.5);
+           AxisAlignedBox bbox = head->getBoundingBox();
+           headNode->setPosition(0,80,20);              
+           headNode->_updateBounds();
+
+
+       ParticleSystem* pSys1 = mSceneMgr->createParticleSystem("psys1", "GameTools/Big");
+           pSys1->setKeepParticlesInLocalSpace(false);
+           SceneNode *pSysNode = rootNode->createChildSceneNode("psys1");
+           pSysNode->attachObject(pSys1);
+           pSysNode->setPosition(0,0,0);
                 
                 //Init lights
@@ -151 +162 @@
                 bbs->setMaterialName("Flare");
                 mainLightNode->attachObject(bbs);
+   }
 
-        //      OgreIlluminationManager::getSingleton().createGlobalRun(ILLUMRUN_PHASE_TEXTURE);
-        //      OgreIlluminationManager::getSingleton().updateGlobalRun(ILLUMRUN_PHASE_TEXTURE, 1);
-        //      OgreIlluminationManager::getSingleton().savePhaseTextureToFile("phase.dds");
+   void createScene2()
+   {
+        mCamera->setPosition(0,150,100);
+           mCamera->setDirection(0,0,-1);
 
-                OgreIlluminationManager::getSingleton().initTechniques();
+           SceneNode* rootNode = mSceneMgr->getRootSceneNode();
+           std::string terrain_cfg("terrain.cfg");
+           mSceneMgr -> setWorldGeometry( terrain_cfg );
+
+           ParticleSystem* pSys1 = mSceneMgr->createParticleSystem("psys1", "GameTools/FogBig");
+           pSys1->setKeepParticlesInLocalSpace(false);
+           SceneNode *pSysNode = rootNode->createChildSceneNode("psys1");
+           pSysNode->attachObject(pSys1);
+           pSysNode->setPosition(600,-50,600);
                 
    }
@@ -169 +190 @@
                  mRoot->addFrameListener(mFrameListener);
                  mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());
+
+                 
                 
     }

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

@@ -30 +30 @@
 #include "FrameCapture.h"
 
-int scene = 3;
+int scene = 1;
 FrameCapture* capture;
 
@@ -311 +311 @@
         SceneNode* rootNode = mSceneMgr->getRootSceneNode();
                 
-                mCamera->setPosition(0.532,1.232,1.529);
-                mCamera->lookAt(Vector3(0,1.2,0.0));
-                
-                Entity* object = mSceneMgr->createEntity("object", "teapot.mesh");
+                mCamera->getParentSceneNode()->translate(1.1,0.8,1.0);
+                //mCamera->lookAt(Vector3(0,1.2,0.0));
+                
+                bool teapot = true;
+                Entity* object;
+                if(teapot)
+                object = mSceneMgr->createEntity("object", "teapot.mesh");
+                else
+          object = mSceneMgr->createEntity("object", "sphere.mesh");
+
                 object->setMaterialName("MetalTeapotMultipleBounce");
                 objectNode = rootNode->createChildSceneNode("objectNode");
                 objectNode->attachObject(object);
+                if(teapot)
                 objectNode->scale(0.5,0.5,0.5);
+                else
+                objectNode->scale(0.005,0.005,0.005);
                 //objectNode->scale(0.005,0.005,0.005);
                 objectNode->setPosition(0,1.2,0);