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

Timestamp:

09/05/07 10:54:23 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• ShadowDemo/include/ShadowDemo.h (modified) (1 diff)
• SpaceStation/include/SpaceStation.h (modified) (5 diffs)
• SpaceStation/src/SpaceStation.cpp (modified) (1 diff)

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

@@ -187 +187 @@
                 OgreIlluminationManager::getSingleton().setMainViewport(mWindow->getViewport(0));
                 OgreIlluminationManager::getSingleton().setShadowMapSize(700);
-                OgreIlluminationManager::getSingleton().setShadowMapMaterialName("GTP/Basic/Depth");
+                //OgreIlluminationManager::getSingleton().setShadowMapMaterialName("GTP/Basic/Depth");
+                OgreIlluminationManager::getSingleton().setShadowMapMaterialName("GTP/Basic/CameraDepth");
                 OgreIlluminationManager::getSingleton().setFocusingSM(true);
            OgreIlluminationManager::getSingleton().setBlurShadowMap(true);

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

@@ -30 +30 @@
 bool highQuality = true;
 bool chc = false;
+bool constantTimeStep = false;
 
 Scene* NXScene = 0;
@@ -464 +465 @@
                 CompositorManager::getSingleton().setCompositorEnabled(mWindow->getViewport(0),
                                                                                                                 "GTP/SpaceStation/PostProc/DoF", true);*/
-
-                CompositorManager::getSingleton().addCompositor(mWindow->getViewport(0),
-                                                                                                                "GTP/Station/PostProc/Glow");
-                CompositorManager::getSingleton().setCompositorEnabled(mWindow->getViewport(0),
+                if(highQuality)
+                {
+                        CompositorManager::getSingleton().addCompositor(mWindow->getViewport(0),
+                                                                                                                        "GTP/Station/PostProc/Glow");
+                        CompositorManager::getSingleton().setCompositorEnabled(mWindow->getViewport(0),
                                                                                                                 "GTP/Station/PostProc/Glow", true);
-                
-                CompositorManager::getSingleton().addCompositor(mWindow->getViewport(0),
-                                                                                                                "GTP/PostProc/ToneMap");
-                CompositorManager::getSingleton().setCompositorEnabled(mWindow->getViewport(0),
-                                                                                                                "GTP/PostProc/ToneMap", true);  
+                }
+                
+                        CompositorManager::getSingleton().addCompositor(mWindow->getViewport(0),
+                                                                                                                        "GTP/PostProc/ToneMap");
+                        CompositorManager::getSingleton().setCompositorEnabled(mWindow->getViewport(0),
+                                                                                                                        "GTP/PostProc/ToneMap", true);  
+                
                 /*              
                 CompositorManager::getSingleton().addCompositor(mWindow->getViewport(0),
@@ -500 +504 @@
                 //Overlay* mainOverlay = OverlayManager::getSingleton().getByName("MORIA/MainOverlay");
                 //mainOverlay->show();
-
+                
+                //if(highQuality)
                 createPostproc();
 
@@ -538 +543 @@
                 s.setWorld(NXWorld);
                 s.parseScript(inputStream, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+                if(highQuality)
                 s.parseEntryPoints("StationPrmEntryPoints.text");
         
@@ -673 +679 @@
         void createFrameListener(void)
     {
-                // This is where we instantiate our own frame listener
+                if(constantTimeStep)
+                {
+                        // This is where we instantiate our own frame listener
+                        class constantTimeStep : public FrameListener
+                        {
+                        public:
+                                bool frameStarted(const FrameEvent &evt)
+                                {
+                                        FrameEvent* event = (FrameEvent*) &evt;
+                                        event->timeSinceLastFrame = 1000 / 20;
+                                        return true;
+                                }
+                        };
+                        constantTimeStep* ct = new constantTimeStep;
+                        ct->setPriority(1);
+                        mRoot->addFrameListener(ct);
+                }
+
                 mFrameListener= new SpaceStationFrameListener(mWindow,
                         mCamera, roomLightNode, roomLight, hallLight, pSysNode  );
+
         mFrameListener->setPriority(10);        
                 mRoot->addFrameListener(mFrameListener);

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

@@ -43 +43 @@
 #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
         String args = strCmdLine;
-        if(StringUtil::match(args, "low"))
-                highQuality = false;
-        if(StringUtil::match(args, "chc"))
-                chc = true;
+        std::vector<String> arguments = StringUtil::split(args);
+        for(std::vector<String>::iterator it = arguments.begin(); it != arguments.end(); it++)
+        {
+                if(StringUtil::match(*it, "low"))
+                        highQuality = false;
+                if(StringUtil::match(*it, "chc"))
+                        chc = true;
+                if(StringUtil::match(*it, "cts"))
+                        constantTimeStep = true;
+        }
 #endif
     // Create application object