Changeset 32 for trunk/VUT/OcclusionCullingSceneManager/TestCulling

Timestamp:

03/29/05 08:21:37 (19 years ago)

Author:

gametools

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/TestCulling

Files:

• TestCulling.vcproj (modified) (1 diff)
• TestCullingApplication.cpp (modified) (5 diffs)
• TestCullingApplication.h (modified) (6 diffs)

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCulling.vcproj

@@ -34 +34 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OGREMain_d.LIB CEGUIBase_d.lib OgreGUIRenderer_d.lib"
+                                AdditionalDependencies="OGREMain_d.LIB CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_OctreeSceneManager.lib"
                                 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Debug/TestCulling.exe"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\Debug&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\Debug&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;"
+                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\Debug&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\Debug&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;"
                                 GenerateDebugInformation="TRUE"
                                 ProgramDatabaseFile="$(OutDir)/TestCulling.pdb"

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.cpp

@@ -106 +106 @@
         mRotateSpeed *= 2;
         
-                mCurrentAlgorithm = OcclusionCullingSceneManager::RENDER_COHERENT;
+                mCurrentAlgorithm = OcclusionCullingSceneTraverser::RENDER_COHERENT;
+                mThreshold = 0;
 
                 // Register this so that we get mouse events.
@@ -121 +122 @@
                 mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/QueryCulledNodesInfo");
         mTraversedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/TraversedNodesInfo");
-                
-                //mMaterialInfo = OverlayManager::getSingleton().getOverlayElement("Example/Shadows/MaterialInfo");
-        //mInfo = OverlayManager::getSingleton().getOverlayElement("Example/Shadows/Info");
-
+        
                 mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
-                mThresholdInfo->setCaption(": dfddfdffdfd0");
+                mThresholdInfo->setCaption(": 0");
                 mFrustumCulledNodesInfo->setCaption(": 0");
                 mQueryCulledNodesInfo->setCaption(": 0");
@@ -191 +189 @@
 bool MouseQueryListener::frameEnded(const FrameEvent& evt)
 {
+        if (mShutdownRequested)
+                return false;
+
     if (timeDelay >= 0) 
         timeDelay -= evt.timeSinceLastFrame;
 
-    KEY_PRESSED(KC_O, 1, changeAlgorithm());
-        //KEY_PRESSED(KC_T, 1, changeAlgorithm());
+    KEY_PRESSED(KC_SPACE, 0.3, changeAlgorithm());
+
+        KEY_PRESSED(KC_SUBTRACT, 0.3, changeThreshold(-10));
+        KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
+        //KEY_PRESSED(KC_T, 1, change);
       
         changeStats();
@@ -202 +206 @@
 }
 //-----------------------------------------------------------------------
+void MouseQueryListener::changeThreshold(int incr)
+{
+        mThreshold += incr; if(mThreshold < 0) mThreshold = 0;
+        
+        char str[100]; sprintf(str,": %d", mThreshold);
+
+        mSceneMgr->setOption("Threshold", &mThreshold); 
+        mThresholdInfo->setCaption(str);
+}
+//-----------------------------------------------------------------------
 void MouseQueryListener::changeAlgorithm()
 {
-    mCurrentAlgorithm = ++mCurrentAlgorithm % OcclusionCullingSceneManager::NUM_RENDERMODES;
+    mCurrentAlgorithm = ++mCurrentAlgorithm % OcclusionCullingSceneTraverser::NUM_RENDERMODES;
 
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
@@ -214 +228 @@
         unsigned int opt = 0;
         char str[100];
-        mSceneMgr->getOption("Threshold", &opt); sprintf(str,"%d",opt);mThresholdInfo->setCaption(str);
-        mSceneMgr->getOption("NumFrustumCulledNodes", &opt); sprintf(str,"%d",opt); mFrustumCulledNodesInfo->setCaption(str);
-        mSceneMgr->getOption("NumQueryCulledNodes", &opt); sprintf(str,"%d",opt);mQueryCulledNodesInfo->setCaption(str);
-        mSceneMgr->getOption("NumTraversedNodes", &opt); sprintf(str,"%d",opt);mTraversedNodesInfo->setCaption(str);
+        
+        mSceneMgr->getOption("NumFrustumCulledNodes", &opt); sprintf(str,": %d", opt); 
+        mFrustumCulledNodesInfo->setCaption(str);
+        
+        mSceneMgr->getOption("NumQueryCulledNodes", &opt); sprintf(str,": %d", opt); 
+        mQueryCulledNodesInfo->setCaption(str);
+        
+        mSceneMgr->getOption("NumTraversedNodes", &opt); sprintf(str,": %d", opt); 
+        mTraversedNodesInfo->setCaption(str);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::keyPressed(KeyEvent* e)
+{
+        if(e->getKey() == KC_ESCAPE)
+    {
+                mShutdownRequested = true;
+                e->consume();
+                return;
+        }
+
+        CEGUI::System::getSingleton().injectKeyDown(e->getKey());
+        CEGUI::System::getSingleton().injectChar(e->getKeyChar());
+        e->consume();
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::keyReleased(KeyEvent* e)
+{
+        CEGUI::System::getSingleton().injectKeyUp(e->getKey());
+        e->consume();
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::keyClicked(KeyEvent* e) 
+{
+        // Do nothing
+        e->consume();
 }
 //-----------------------------------------------------------------------

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.h

@@ -6 +6 @@
 #include "ExampleApplication.h"
 #include "OgreOcclusionCullingSceneManager.h"
+#include "OgreOcclusionCullingSceneTraverser.h"
 
 Real timeDelay = 0;
@@ -17 +18 @@
 }
 
-String mCurrentAlgorithmCaptions[OcclusionCullingSceneManager::NUM_RENDERMODES] = 
+String mCurrentAlgorithmCaptions[OcclusionCullingSceneTraverser::NUM_RENDERMODES] = 
 {
     "Cull Frustum", 
@@ -53 +54 @@
     // This is when the mouse is clicked, held and dragged.
     virtual void mouseDragged (MouseEvent *e);
-/*
-    void keyPressed(KeyEvent* e)
-    {
-        if(e->getKey() == KC_ESCAPE)
-        {
-            mShutdownRequested = true;
-            e->consume();
-            return;
-        }
 
-        CEGUI::System::getSingleton().injectKeyDown(e->getKey());
-                CEGUI::System::getSingleton().injectChar(e->getKeyChar());
-        e->consume();
-    }
+    void keyPressed(KeyEvent* e);
 
-        void keyReleased(KeyEvent* e)
-        {
-                CEGUI::System::getSingleton().injectKeyUp(e->getKey());
-                e->consume();
-        }
-        void keyClicked(KeyEvent* e) 
-        {
-                // Do nothing
-                e->consume();
-        }
+        void keyReleased(KeyEvent* e);
+        void keyClicked(KeyEvent* e);
 
-    bool frameEnded(const FrameEvent& evt)
-    {
-        if (mShutdownRequested)
-            return false;
-        else
-            return ExampleFrameListener::frameEnded(evt);
-    }
-*/
         void changeAlgorithm();
+        void changeThreshold(int incr);
         void changeStats();
 
@@ -96 +70 @@
     CEGUI::Renderer *mGUIRenderer;     // cegui renderer
         SceneNode* mShipNode;
-//      bool mShutdownRequested;
+        bool mShutdownRequested;
         int mCurrentAlgorithm;
-        
+        int mThreshold;
+
         OverlayElement *mAlgorithmInfo;
         OverlayElement *mThresholdInfo;
@@ -113 +88 @@
     /*TestCullingApplication()
     {
-
     }*/
 
@@ -148 +122 @@
 
     }*/
-    
-
-        
 };