Changeset 29 for trunk/VUT

Timestamp:

03/24/05 12:15:20 (19 years ago)

Author:

gametools

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• TestCulling/TestCulling.vcproj (modified) (1 diff)
• TestCulling/TestCullingApplication.cpp (modified) (8 diffs)
• TestCulling/TestCullingApplication.h (modified) (8 diffs)
• include/OgreOcclusionCullingSceneManager.h (modified) (3 diffs)
• scripts/OcclusionDemo.overlay (added)
• scripts/Plugin_OcclusionCullingSceneManager.suo (modified) (previous)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (3 diffs)

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCulling.vcproj

@@ -41 +41 @@
                                 ProgramDatabaseFile="$(OutDir)/TestCulling.pdb"
                                 SubSystem="2"
+                                ImportLibrary=""
                                 TargetMachine="1"/>
                         <Tool

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.cpp

@@ -6 +6 @@
 */
 
-#pragma warning (push)
-#pragma warning( disable : 4267 )
+//#pragma warning (push)
+//#pragma warning( disable : 4267 )
 
 #include <OgreNoMemoryMacros.h>
@@ -15 +15 @@
 #include <../CEGUIRenderer/include/OgreCEGUITexture.h>
 #include <OgreMemoryMacros.h>
-#pragma warning (pop)
+//#pragma warning (pop)
 /*
 #include <CEGUI/CEGUIImageset.h>
@@ -39 +39 @@
 #include "windows.h"
 
+/***********************************************/
+/* TestCullingApplication implementation       */
+/***********************************************/
+
+
+//-----------------------------------------------------------------------
 void TestCullingApplication::createScene(void)
 {
@@ -67 +73 @@
      mGUISystem->setGUISheet(sheet);*/
 }
-
-
-/* MouseMotionListener callbacks */
+//-----------------------------------------------------------------------
+void TestCullingApplication::createFrameListener(void)
+{
+        mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, mGUIRenderer, mShipNode);
+        mFrameListener->showDebugOverlay(true);
+        mRoot->addFrameListener(mFrameListener);
+}
+//-----------------------------------------------------------------------
+void TestCullingApplication::chooseSceneManager(void)
+{
+    mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
+}
+
+/***********************************************/
+/* MouseQueryListener implementation           */
+/***********************************************/
+
+//-----------------------------------------------------------------------
+MouseQueryListener::MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, CEGUI::Renderer *renderer,
+                                           SceneNode* shipNode)
+        : ExampleFrameListener(win, cam, false, true), mGUIRenderer(renderer), mShipNode(shipNode)//,  mShutdownRequested(false)
+{
+
+                // Setup default variables
+        mCurrentObject = NULL;
+        mLMouseDown = false;
+        mRMouseDown = false;
+        mSceneMgr = sceneManager;
+
+        // Reduce move speed
+        mMoveSpeed = 50;
+        mRotateSpeed *= 2;
+        
+                mCurrentAlgorithm = OcclusionCullingSceneManager::RENDER_COHERENT;
+
+                // Register this so that we get mouse events.
+        mEventProcessor->addMouseListener(this);
+        mEventProcessor->addMouseMotionListener(this);
+                mEventProcessor->addKeyListener(this);
+
+                // show overlay
+        Overlay* pOver = OverlayManager::getSingleton().getByName("Example/OcclusionDemoOverlay");    
+        mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/OcclusionTechniqueInfo");
+        //mMaterialInfo = OverlayManager::getSingleton().getOverlayElement("Example/Shadows/MaterialInfo");
+        //mInfo = OverlayManager::getSingleton().getOverlayElement("Example/Shadows/Info");
+
+                mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
+        //mMaterialInfo->setCaption(": " + mAtheneMaterials[mCurrentAtheneMaterial]);
+        pOver->show();
+} // MouseQueryListener
+//-----------------------------------------------------------------------
 void MouseQueryListener::mouseMoved (MouseEvent *e)
 {
@@ -75 +129 @@
     CEGUI::System::getSingleton().injectMouseMove(e->getRelX() * mGUIRenderer->getWidth(), e->getRelY() * mGUIRenderer->getHeight());
 }
-
-
+//-----------------------------------------------------------------------
 void MouseQueryListener::mousePressed(MouseEvent* e)
 {
@@ -93 +146 @@
 } // mousePressed
 
- 
+ //-----------------------------------------------------------------------
 void MouseQueryListener::mouseReleased(MouseEvent* e)
 {
@@ -109 +162 @@
     } // else if
 } // mouseReleased
-
-
- // This is when the mouse is clicked, held and dragged.
+//-----------------------------------------------------------------------
 void MouseQueryListener::mouseDragged (MouseEvent *e)
  {
@@ -127 +178 @@
     } // else if
 } // mouseDragged
-
+//-----------------------------------------------------------------------
+bool MouseQueryListener::frameEnded(const FrameEvent& evt)
+{
+    if (timeDelay >= 0) 
+        timeDelay -= evt.timeSinceLastFrame;
+
+    KEY_PRESSED(KC_O, 1, changeAlgorithm());
+      
+    return ExampleFrameListener::frameStarted(evt) && ExampleFrameListener::frameEnded(evt);        
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::changeAlgorithm()
+{
+    mCurrentAlgorithm = ++mCurrentAlgorithm % OcclusionCullingSceneManager::NUM_RENDERMODES;
+    mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
+
+        mSceneMgr->setOption("Algorithm", &mCurrentAlgorithm);
+}
 
 INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.h

@@ -17 +17 @@
 }
 
-String mAlgorithmTypeCaptions[OcclusionCullingSceneManager::NUM_RENDERMODES] = 
+String mCurrentAlgorithmCaptions[OcclusionCullingSceneManager::NUM_RENDERMODES] = 
 {
     "Cull Frustum", 
@@ -29 +29 @@
 
     MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, CEGUI::Renderer *renderer,
-                                           SceneNode* shipNode)
-        : ExampleFrameListener(win, cam, false, true), mGUIRenderer(renderer), mShipNode(shipNode)//,  mShutdownRequested(false)
-    {
+                                           SceneNode* shipNode);
 
-                // Setup default variables
-        mCurrentObject = NULL;
-        mLMouseDown = false;
-        mRMouseDown = false;
-        mSceneMgr = sceneManager;
-
-        // Reduce move speed
-        mMoveSpeed = 50;
-        mRotateSpeed *= 2;
-        
-                mAlgorithmType = OcclusionCullingSceneManager::RENDER_COHERENT;
-
-                // Register this so that we get mouse events.
-        mEventProcessor->addMouseListener(this);
-        mEventProcessor->addMouseMotionListener(this);
-                mEventProcessor->addKeyListener(this);
-
-                // show overlay
-        Overlay* pOver = OverlayManager::getSingleton().getByName("Example/ShadowsOverlay");    
-        mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Shadows/ShadowTechniqueInfo");
-        //mMaterialInfo = OverlayManager::getSingleton().getOverlayElement("Example/Shadows/MaterialInfo");
-        //mInfo = OverlayManager::getSingleton().getOverlayElement("Example/Shadows/Info");
-
-                mAlgorithmInfo->setCaption("Algorithm: " + mAlgorithmTypeCaptions[mAlgorithmType]);
-        //mMaterialInfo->setCaption("Current: " + mAtheneMaterials[mCurrentAtheneMaterial]);
-        pOver->show();
-    } // MouseQueryListener
 
     ~MouseQueryListener( )
@@ -65 +36 @@
     }
 
-   bool frameEnded(const FrameEvent& evt)
-    {
-        if (timeDelay >= 0) 
-            timeDelay -= evt.timeSinceLastFrame;
-
-        KEY_PRESSED(KC_O, 1, changeAlgorithm());
-      
-        return ExampleFrameListener::frameStarted(evt) && ExampleFrameListener::frameEnded(evt);        
-    }
-
+        bool frameEnded(const FrameEvent& evt);
     /* MouseListener callbacks. */
     virtual void mouseClicked(MouseEvent* e) { }
@@ -125 +87 @@
     }
 */
-         void changeAlgorithm()
-    {
-        mAlgorithmType = ++mAlgorithmType % OcclusionCullingSceneManager::NUM_RENDERMODES;
-        mAlgorithmInfo->setCaption("Algorithm: " + mAlgorithmTypeCaptions[mAlgorithmType]);
-    }
+        void changeAlgorithm();
 
 
@@ -139 +97 @@
         SceneNode* mShipNode;
 //      bool mShutdownRequested;
-        int mAlgorithmType;
+        int mCurrentAlgorithm;
         OverlayElement *mAlgorithmInfo;
 };
@@ -154 +112 @@
 protected:
         void createScene(void);
-
-        void createFrameListener(void)
-    {
-                mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, mGUIRenderer, mShipNode);
-                mFrameListener->showDebugOverlay(true);
-                mRoot->addFrameListener(mFrameListener);
-    }
+        void createFrameListener(void);
 
         CEGUI::OgreCEGUIRenderer *mGUIRenderer;
@@ -166 +118 @@
 
 private:
+        void chooseSceneManager(void);
+
         Entity* mShip;
         SceneNode* mShipNode;
@@ -189 +143 @@
     }*/
     // Override scene manager (use indoor instead of generic)
-    void chooseSceneManager(void)
-    {
-        mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
-    }
+    
+
         
 };

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingSceneManager.h

@@ -53 +53 @@
                 void _updateSceneGraph(Camera* cam);
 
+                /** Sets the given option for the SceneManager
+                               @remarks
+                        Options are:
+                        "Algorithm", int *;                     
+                */
+                virtual bool setOption( const String &, const void * );
+                /** Gets the given option for the Scene Manager.
+                @remarks
+                    See setOption
+                */
+                virtual bool getOption( const String &, void * );
+
+                bool getOptionValues( const String & key, StringVector &refValueList );
+                bool getOptionKeys( StringVector &refKeys );
+
         protected:
                 enum {MODE_QUERY, MODE_RENDER};
@@ -85 +100 @@
                 */
                 SolidHalfBoundingBox *getSolidHalfBoundingBox(int half);
-                /** sets the type of the algorithm
-                @param algorithm type
-                */
-                void setAlgorithmType(int type);
-        
-                int getAlgorithmType();
+                
 
                 // we use a priority queue rather than a renderstack
@@ -104 +114 @@
                 // two halfes of a aabb
                 SolidHalfBoundingBox *mHalfBoundingBox[2];      
-                int mAlgorithmType;
+                int mCurrentAlgorithm;
         };
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManager.cpp

@@ -15 +15 @@
         OcclusionCullingSceneManager::OcclusionCullingSceneManager(): 
         mFrameId(1), mDistanceQueue(NULL), mVisibilityThreshold(0), mCurrentTestIdx(0),
-        mQueryMode(MODE_RENDER), mNumSceneNodes(0), mAlgorithmType(RENDER_COHERENT)
+        mQueryMode(MODE_RENDER), mNumSceneNodes(0), mCurrentAlgorithm(RENDER_COHERENT)
         {               
                 mHalfBoundingBox[0] = mHalfBoundingBox[1] = 0;
@@ -44 +44 @@
                 //renderZPass();
 
-                switch(mAlgorithmType)
+                switch(mCurrentAlgorithm)
                 {
                         case RENDER_CULL_FRUSTUM:
@@ -346 +346 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingSceneManager::setAlgorithmType(int type)
-        {
-                mAlgorithmType = type;
-        }
-        //-----------------------------------------------------------------------
-        int OcclusionCullingSceneManager::getAlgorithmType()
-        {
-                return mAlgorithmType;
+        bool OcclusionCullingSceneManager::setOption( const String & key, const void * val )
+        {
+                if ( key == "Algorithm" )
+                {
+                        mCurrentAlgorithm = * static_cast < const int * > ( val );
+                        return true;
+                }
+        
+                return SceneManager::setOption( key, val );
+        }
+        //-----------------------------------------------------------------------
+        bool OcclusionCullingSceneManager::getOption( const String & key, void *val )
+        {
+                if ( key == "Algorithm" )
+                {
+                        * static_cast < int * > ( val ) = mCurrentAlgorithm;
+                        return true;
+                }
+
+                return SceneManager::getOption( key, val );
+        }
+        //-----------------------------------------------------------------------
+        bool OcclusionCullingSceneManager::getOptionValues( const String & key, StringVector  &refValueList )
+        {
+                return SceneManager::getOptionValues( key, refValueList );
+        }
+        //-----------------------------------------------------------------------
+        bool OcclusionCullingSceneManager::getOptionKeys( StringVector & refKeys )
+        {
+                SceneManager::getOptionKeys( refKeys );
+                refKeys.push_back( "Algorithm" );
+        
+                return true;
         }
 }