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

Timestamp:

03/19/07 16:53:58 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• CausticTest/include/CausticTest.h (modified) (2 diffs)
• GameToolsRaytraceDemo/include/GameToolsRaytraceDemo.h (modified) (4 diffs)
• PRMDemo/include/PRMDemo.h (modified) (2 diffs)

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

@@ -183 +183 @@
                 std::string occlusion_cfg("OcclusionCulling.cfg");
                 mSceneMgr->setWorldGeometry(occlusion_cfg);
+
                 //createPostproc();
                 OgreIlluminationManager::getSingleton().setBlurShadowMap(true);
@@ -210 +211 @@
         //      Material* newMat = mat->clone(mat->getName() + "_new").getPointer();
 
-                sphere->setMaterialName("GTP/Caustic/Glass");
+                sphere->setMaterialName("GTP/Caustic/Glass_PointSprite");
                 sphereNode = rootNode->createChildSceneNode();
                 //sphereNode->setScale(0.1, 0.1, 0.1);//sphere

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

@@ -192 +192 @@
         void chooseSceneManager()
         {
-                //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
-                mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
+                mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
+                //mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
         }
 
         void createScene(void)
     {
-                createPostproc();
+                //createPostproc();
                 
                 std::string occlusion_cfg("OcclusionCulling.cfg");
-                mSceneMgr->setWorldGeometry(occlusion_cfg);
+                //mSceneMgr->setWorldGeometry(occlusion_cfg);
                 
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);
@@ -227 +227 @@
                 Entity* centerHead = mSceneMgr->createEntity("centerHead", "head.mesh");
                 Entity* goldHead = mSceneMgr->createEntity("goldHead", "head.mesh");
-                Entity* silverHead = mSceneMgr->createEntity("silverHeade", "head.mesh");
+                Entity* silverHead = mSceneMgr->createEntity("silverHead", "head.mesh");
                 Entity* copperHead = mSceneMgr->createEntity("copperHead", "head.mesh");
                 Entity* aluHead = mSceneMgr->createEntity("aluHead", "head.mesh");
@@ -237 +237 @@
                 
                 //init nodes
+                centerSphereNode = rootNode->createChildSceneNode("centerSphere");
+                centerSphereNode->setPosition(0, 100,0);
+                centerSphereNode->attachObject(centerHead);
+                centerSphereNode->setScale(3.2, 3.2, 3.2);
+                
+                goldSphereNode = rootNode->createChildSceneNode( "goldSphere" );
+                goldSphereNode->scale(2.4, 2.4, 2.4);
+                goldSphereNode->attachObject(goldHead);
+                
+                silverSphereNode = rootNode->createChildSceneNode( "silverSphere" );
+                silverSphereNode->scale(2.4, 2.4, 2.4);
+                silverSphereNode->attachObject(silverHead);
+                
+                aluSphereNode = rootNode->createChildSceneNode( "aluSphere" );
+                aluSphereNode->scale(2.4, 2.4, 2.4);
+                aluSphereNode->attachObject(aluHead);
+                
+                copperSphereNode = rootNode->createChildSceneNode( "copperSphere" );
+                copperSphereNode->scale(2.4, 2.4, 2.4);
+                copperSphereNode->attachObject(copperHead);
+                
+                goldSphereNode->_updateBounds();
+                silverSphereNode->_updateBounds();
+                aluSphereNode->_updateBounds();
+                copperSphereNode->_updateBounds();
+
+                
                 kupolaNode = rootNode->createChildSceneNode( "kupola" );
                 kupolaNode->rotate(Vector3(0,1,0),Radian(Degree(90)));
@@ -243 +270 @@
                 //kupolaNode->scale(2,2,2);             
                 //kupolaNode->setPosition(0,100,0);
-
-                centerSphereNode = rootNode->createChildSceneNode("centerSphere");
-                centerSphereNode->setPosition(0, 100,0);
-                centerSphereNode->attachObject(centerHead);
-                centerSphereNode->setScale(3.2, 3.2, 3.2);
-                
-                goldSphereNode = rootNode->createChildSceneNode( "goldSphere" );
-                goldSphereNode->scale(2.4, 2.4, 2.4);
-                goldSphereNode->attachObject(goldHead);
-                
-                silverSphereNode = rootNode->createChildSceneNode( "silverSphere" );
-                silverSphereNode->scale(2.4, 2.4, 2.4);
-                silverSphereNode->attachObject(silverHead);
-                
-                aluSphereNode = rootNode->createChildSceneNode( "aluSphere" );
-                aluSphereNode->scale(2.4, 2.4, 2.4);
-                aluSphereNode->attachObject(aluHead);
-                
-                copperSphereNode = rootNode->createChildSceneNode( "copperSphere" );
-                copperSphereNode->scale(2.4, 2.4, 2.4);
-                copperSphereNode->attachObject(copperHead);
-                
-                goldSphereNode->_updateBounds();
-                silverSphereNode->_updateBounds();
-                aluSphereNode->_updateBounds();
-                copperSphereNode->_updateBounds();
-
-                
                 kupolaNode->_updateBounds();
                 centerSphereNode->_updateBounds();

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

@@ -100 +100 @@
         void chooseSceneManager()
         {
-                //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
-                mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
+                mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
+                //mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
         }
 
@@ -220 +220 @@
     {
                 std::string occlusion_cfg("OcclusionCulling.cfg");
-                mSceneMgr->setWorldGeometry(occlusion_cfg);
+                //mSceneMgr->setWorldGeometry(occlusion_cfg);
                 
                 //createPostproc();