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

Timestamp:

03/01/07 18:04:37 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• CausticTest/include/CausticTest.h (modified) (2 diffs)
• DiffuseTest/include/DiffuseTest.h (modified) (3 diffs)
• HierarchicalSystem/include/HierarchicalSystem.h (modified) (2 diffs)
• PRMDemo/include/PRMDemo.h (modified) (2 diffs)

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

@@ -149 +149 @@
         void chooseSceneManager()
         {
-                mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
-                //mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
+                //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
+                mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
         }
 
@@ -181 +181 @@
         void createScene(void)
     {
-        //      std::string terrain_cfg("terrainCulling.cfg");
-        //      mSceneMgr->setWorldGeometry(terrain_cfg);
+                std::string occlusion_cfg("OcclusionCulling.cfg");
+                mSceneMgr->setWorldGeometry(occlusion_cfg);
                 //createPostproc();
                 OgreIlluminationManager::getSingleton().setBlurShadowMap(true);

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

@@ -361 +361 @@
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("PostProc");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Basic");
-                ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Diffuse");
+        //      ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Diffuse");
         }
 
@@ -654 +654 @@
            OgreIlluminationManager::getSingleton().setShadowMapSize(512);
            OgreIlluminationManager::getSingleton().setBlurShadowMap(true);
-           OgreIlluminationManager::getSingleton().setShadowMapMaterialName("GameTools/ShadowMapDistance");
+           OgreIlluminationManager::getSingleton().setShadowMapMaterialName("GTP/Basic/Distance_Normalized");//GameTools/ShadowMapDistance
             mSceneMgr->setAmbientLight(ColourValue(0.505 * 0.2, 0.897 * 0.2, 0.914 * 0.2));
                 
@@ -660 +660 @@
 
         Entity* object = mSceneMgr->createEntity("object", "buddha.mesh");
-                object->setMaterialName("GTP/Diffuse/Disc2Point");
+                //object->setMaterialName("GTP/Diffuse/Disc2Point");
                 //object->setMaterialName("GameTools/DiffuseP2P");
                 objectNode = rootNode->createChildSceneNode();

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

@@ -99 +99 @@
                 if(scene == 1)
                 {
-                  mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
-                  //mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
+                 // mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
+                  mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
                 }
                 else if(scene == 2)
@@ -109 +109 @@
     {
                 //createPostproc();
-
+                //std::string occlusion_cfg("OcclusionCulling.cfg");
+                //mSceneMgr->setWorldGeometry(occlusion_cfg);
+                
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);
                 OgreIlluminationManager::getSingleton().setMainViewport(mWindow->getViewport(0));

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

@@ -96 +96 @@
         void createScene(void)
     {
-                createPostproc();
+                //std::string occlusion_cfg("OcclusionCulling.cfg");
+                //mSceneMgr->setWorldGeometry(occlusion_cfg);
+                
+                //createPostproc();
 
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);
                 OgreIlluminationManager::getSingleton().setMainViewport(mWindow->getViewport(0));
                 OgreIlluminationManager::getSingleton().setShadowMapSize(512);
+                OgreIlluminationManager::getSingleton().setShadowMapMaterialName("GameTools/ShadowMapDistance");
+                OgreIlluminationManager::getSingleton().setFocusingSM(true);
+           OgreIlluminationManager::getSingleton().setShadowMapSize(512);
+           OgreIlluminationManager::getSingleton().setBlurShadowMap(false);
+           OgreIlluminationManager::getSingleton().setUseLISPSM(false);
                                 
                 Root::getSingleton()._setCurrentSceneManager(mSceneMgr);
@@ -113 +121 @@
                 mSceneMgr->setSkyBox(true, "Examples/EveningSkyBox", 500);
                 
-                SceneNode* rootNode = mSceneMgr->getRootSceneNode();    
+                SceneNode* rootNode = mSceneMgr->getRootSceneNode();
 
                 
                 SceneSerializer s(mSceneMgr);
                 DataStreamPtr inputStream;                              
-                inputStream = ResourceGroupManager::getSingleton().openResource("towers2.level");               
+                inputStream = ResourceGroupManager::getSingleton().openResource("level.txt");   //towers2.level 
                 s.parseScript(inputStream, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-                
-        /*      Entity* tower = mSceneMgr->createEntity("tower","tower.mesh");
-                SceneNode* tNode = rootNode->createChildSceneNode("tower");
-                tNode->setScale(10,10,10);
-                tNode->attachObject(tower);
-
-                Entity* tower2 = mSceneMgr->createEntity("tower2","tower.mesh");
-                tower2->setMaterialName("towermaterialBump");
-                SceneNode* tNode2 = rootNode->createChildSceneNode("tower2");
-                tNode2->setScale(10,10,10);
-                tNode2->setPosition(0,0,100);
-                tNode2->attachObject(tower2);*/
-
-        /*      Entity* tower3 = mSceneMgr->createEntity("tower3","tower.mesh");
-                tower3->setMaterialName("towermaterialNoBump");
-                SceneNode* tNode3 = rootNode->createChildSceneNode("tower3");
-                tNode3->setPosition(0,0,-50);
-                tNode3->setScale(10,10,10);
-                tNode3->attachObject(tower3);*/
-
-/*              Entity* lepcso = mSceneMgr->createEntity("lepcso","stairs.mesh");
-                SceneNode* lNode = rootNode->createChildSceneNode("l");
-                lNode->attachObject(lepcso);*/
-        
-                //createPlane("p","lambert1",Vector3(0,-20,0),Vector2(100,100));
+                        
+                createPlane("p","GTP/Basic/ShadowReciever/Depth",Vector3(0,0,0),Vector2(1000,1000));
 
                 Light* mainLight = mSceneMgr->createLight("MainLight");
                 mainLight->setType(Light::LT_DIRECTIONAL);
+                mainLight->setCastShadows(true);
         mainLight->setDiffuseColour(ColourValue::White);
                 mainLight->setSpecularColour(ColourValue::White);
                 mainLightNode = rootNode->createChildSceneNode();
                 
-                mainLightNode->setPosition(10,10,0);            
-                mainLight->setPosition(10,10,0);
+                mainLightNode->setPosition(1000,1000,1000);             
+                mainLight->setPosition(1000,1000,1000);
                 mainLight->setPowerScale(5);
                 mainLight->setDirection(-1,-1, -1);