Changeset 44 for trunk

Timestamp:

04/12/05 18:32:32 (20 years ago)

Author:

mattausch

Message:

implementation for terrain + octree scenemanager

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• TestCulling/TerrainContentGenerator.cpp (added)
• TestCulling/TerrainContentGenerator.h (added)
• TestCulling/TestCulling.vcproj (modified) (2 diffs)
• TestCulling/TestCullingApplication.cpp (modified) (14 diffs)
• TestCulling/TestCullingApplication.h (modified) (5 diffs)
• include/OgreOcclusionCullingOctreeSceneManager.h (added)
• src/OgreOcclusionCullingDotSceneManager.cpp (modified) (1 diff)
• src/OgreOcclusionCullingOctreeSceneManager.cpp (added)
• src/OgreOcclusionCullingSceneTraverser.cpp (modified) (5 diffs)
• src/OgreOcclusionCullingTerrainSceneManager.cpp (modified) (6 diffs)
• src/OgreOcclusionCullingTerrainSceneTraverser.cpp (modified) (4 diffs)

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCulling.vcproj

@@ -122 +122 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
+                                RelativePath=".\TerrainContentGenerator.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\TestCullingApplication.cpp">
                         </File>
@@ -129 +132 @@
                         Filter="h;hpp;hxx;hm;inl;inc;xsd"
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+                        <File
+                                RelativePath=".\TerrainContentGenerator.h">
+                        </File>
                         <File
                                 RelativePath=".\TestCullingApplication.h">

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.cpp

@@ -20 +20 @@
 #include "windows.h"
 
-RaySceneQuery* raySceneQuery = 0;
+//RaySceneQuery* mRaySceneQuery = 0;
 
 /***********************************************/
 /* TestCullingApplication implementation       */
 /***********************************************/
-TestCullingApplication::~TestCullingApplication()
-{
-        delete raySceneQuery;
-}
+/*TestCullingApplication::~TestCullingApplication()
+{
+        delete mRaySceneQuery;
+}*/
 //-----------------------------------------------------------------------
 void TestCullingApplication::createCamera( void )
@@ -57 +57 @@
         l->setPosition(20,80,50);
 
-        // Fog
+        // --Fog
         // NB it's VERY important to set this before calling setWorldGeometry 
         // because the vertex program picked will be different
@@ -66 +66 @@
         mWindow->getViewport(0)->setBackgroundColour(fadeColour);
 
-         // Create a skybox
-     //mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox", 500, false);
-         //mSceneMgr->setSkyDome( true, "Examples/CloudySky", 5, 8, 500, false );
+        // Create a skybox
+    //mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox", 500, false);
+        //mSceneMgr->setSkyDome( true, "Examples/CloudySky", 5, 8, 500, false );
 
         std::string terrain_cfg("terrain.cfg");
@@ -94 +94 @@
         mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
 
-        raySceneQuery = mSceneMgr->createRayQuery(
-        Ray(mCamera->getPosition(), Vector3::NEGATIVE_UNIT_Y));
-
-        Entity *robotEnt = mSceneMgr->createEntity( "Robot", "robot.mesh" );
+        //mRaySceneQuery = mSceneMgr->createRayQuery(
+        //      Ray(mCamera->getPosition(), Vector3::NEGATIVE_UNIT_Y));
+
+        /*Entity *robotEnt = mSceneMgr->createEntity( "Robot", "robot.mesh" );
         SceneNode *robotNode = mSceneMgr->getRootSceneNode()->createChildSceneNode( "RobotNode", Vector3( 750, 25, 600 ));
         robotNode->attachObject( robotEnt );
@@ -113 +113 @@
     ogreNode2->attachObject( ogreEnt2 );
         ogreNode2->scale(.05,.05,.05);
-        ogreNode->yaw( Degree( 40 ) );
+        ogreNode->yaw( Degree( 40 ) );*/
 
         // CEGUI setup
@@ -131 +131 @@
 
          CEGUI::MouseCursor::getSingleton().show( );
-     
-        /* CEGUI::Window* sheet = 
-            CEGUI::WindowManager::getSingleton().loadWindowLayout(
-                (CEGUI::utf8*)"ogregui.layout"); 
-
-     mGUISystem->setGUISheet(sheet);*/
 }
 //-----------------------------------------------------------------------
@@ -155 +149 @@
 /* MouseQueryListener implementation           */
 /***********************************************/
-
 //-----------------------------------------------------------------------
 MouseQueryListener::MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, CEGUI::Renderer *renderer)
@@ -163 +156 @@
 
         // Setup default variables
-//      mCurrentObject = NULL;
+        mCurrentObject = NULL;
         mLMouseDown = false;
         mRMouseDown = false;
@@ -180 +173 @@
         mEventProcessor->addKeyListener(this);
 
+        mRaySceneQuery = mSceneMgr->createRayQuery( Ray() );
+
         // show overlay
         Overlay* pOver = OverlayManager::getSingleton().getByName("Example/OcclusionCullingDemoOverlay"); 
@@ -200 +195 @@
 
     pOver->show();
-} // MouseQueryListener
+} 
+//-----------------------------------------------------------------------
+MouseQueryListener::~MouseQueryListener( )
+{
+        delete mRaySceneQuery;
+}
 //-----------------------------------------------------------------------
 void MouseQueryListener::mouseMoved (MouseEvent *e)
@@ -214 +214 @@
      {
                  CEGUI::MouseCursor::getSingleton().hide( );
-                 mLMouseDown = true;
-     } // if
+
+                 // Setup the ray scene query
+         Ray mouseRay = mCamera->getCameraToViewportRay( e->getX(), e->getY() );
+         mRaySceneQuery->setRay( mouseRay );
+
+         // Execute query
+         RaySceneQueryResult &result = mRaySceneQuery->execute();
+         RaySceneQueryResult::iterator itr = result.begin( );
+
+         // Get results, create a node/entity on the position
+         if ( itr != result.end() && itr->worldFragment )
+         {
+                         char name[16];
+             sprintf( name, "Robot%d", mCount++ );
+
+             Entity *ent = mSceneMgr->createEntity( name, "robot.mesh" );
+             mCurrentObject = mSceneMgr->getRootSceneNode( )->createChildSceneNode( String(name) + "Node", itr->worldFragment->singleIntersection );
+             mCurrentObject->attachObject( ent );
+             mCurrentObject->setScale( 0.1f, 0.1f, 0.1f );
+         }
+
+         mLMouseDown = true; 
+     }
      // Right mouse button down
      else if (e->getButtonID() & InputEvent::BUTTON1_MASK)
@@ -243 +264 @@
 void MouseQueryListener::mouseDragged (MouseEvent *e)
  {
-         /*
-         // If we are dragging the left mouse button.    
+         // If we are dragging the left mouse button.            
          if ( mLMouseDown )
-         {
-                mShipNode->translate(-e->getRelX() * 200, -e->getRelY() * 200, 0.0);
+     {
+                 Ray mouseRay = mCamera->getCameraToViewportRay( e->getX(), e->getY() );
+                 mRaySceneQuery->setRay( mouseRay );
+
+                 RaySceneQueryResult &result = mRaySceneQuery->execute();
+                 RaySceneQueryResult::iterator itr = result.begin( );
+
+                 if ( itr != result.end() && itr->worldFragment )
+                 {
+                         mCurrentObject->setPosition( itr->worldFragment->singleIntersection );
+                 } 
      }
-         */
-         
          // If we are dragging the right mouse button.
          if ( mRMouseDown )
@@ -262 +289 @@
 {
         // clamp to terrain
-        static Ray updateRay;
-        updateRay.setOrigin(mCamera->getPosition());
-        updateRay.setDirection(Vector3::NEGATIVE_UNIT_Y);
-        raySceneQuery->setRay(updateRay);
-        RaySceneQueryResult& qryResult = raySceneQuery->execute();
-        RaySceneQueryResult::iterator i = qryResult.begin();
-         
-        if (i != qryResult.end() && i->worldFragment)
+        Vector3 camPos = mCamera->getPosition( );
+    Ray cameraRay( Vector3(camPos.x, 5000.0f, camPos.z), Vector3::NEGATIVE_UNIT_Y );
+    mRaySceneQuery->setRay( cameraRay );
+
+    // Perform the scene query
+    RaySceneQueryResult &queryResult = mRaySceneQuery->execute();
+    RaySceneQueryResult::iterator it = queryResult.begin( );
+
+        if (it != queryResult.end() && it->worldFragment)
         {
-                SceneQuery::WorldFragment* wf = i->worldFragment;
-                mCamera->setPosition(mCamera->getPosition().x, 
-                        i->worldFragment->singleIntersection.y + 10, 
+                SceneQuery::WorldFragment* wf = it->worldFragment;
+
+                mCamera->setPosition(mCamera->getPosition().x, wf->singleIntersection.y + 10, 
                         mCamera->getPosition().z);
         }
@@ -290 +318 @@
     KEY_PRESSED(KC_SPACE, 0.3, changeAlgorithm());
 
-        KEY_PRESSED(KC_SUBTRACT, 0.3, changeThreshold(-10));
+        KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
         KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
         //KEY_PRESSED(KC_T, 1, change);

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.h

@@ -5 +5 @@
 #include "CEGUIForwardRefs.h"
 #include "ExampleApplication.h"
-//#include "OgreOcclusionCullingSceneManager.h"
 #include "OgreOcclusionCullingSceneTraverser.h"
 
@@ -32 +31 @@
 
 
-    ~MouseQueryListener( )
-    {
-    }
+    ~MouseQueryListener( );
 
         bool frameStarted(const FrameEvent& evt);
@@ -82 +79 @@
         OverlayElement *mHierarchyNodesInfo;
         OverlayElement *mSceneNodesInfo;
+
+        SceneNode *mCurrentObject;         // The newly created object
+        int mCount;                        // The number of robots on the screen
+        RaySceneQuery *mRaySceneQuery;     // The ray scene query pointer
 };
 
@@ -88 +89 @@
 {
 public:
-        ~TestCullingApplication();
+        //~TestCullingApplication();
 
 protected:
@@ -101 +102 @@
 private:
         void chooseSceneManager(void);
-
-        //Entity* mShip;
-        //SceneNode* mShipNode;
 };
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingDotSceneManager.cpp

@@ -5 +5 @@
 #include "OgreCamera.h"
 #include "OgreHardwareOcclusionQuery.h"
-//#include "OgreWireBoundingBox.h"
 #include "OgreSolidHalfBoundingBox.h"
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -4 +4 @@
 #include "OgreCamera.h"
 #include "OgreHardwareOcclusionQuery.h"
-//#include "OgreWireBoundingBox.h"
 #include "OgreSolidHalfBoundingBox.h"
 
@@ -55 +54 @@
                                 break;
                         case RENDER_COHERENT:
-                                renderCoherentWithQueue(cam);
+                                //renderCoherentWithQueue(cam);
+renderStopAndWait(cam);
                                 break;
                         default:
@@ -228 +228 @@
                 // change state so the bounding box gets not actually rendered on the screen
                 // TODO: in rendervisibleobjects, the rendermode is changed by ogre itself => change this!!
-                setRenderingMode(MODE_QUERY);
-                //setRenderingMode(MODE_RENDER);
+                
+                //setRenderingMode(MODE_QUERY);
+                setRenderingMode(MODE_RENDER);
 
                 // get next available test id
@@ -247 +248 @@
         {       
                 // avoid unnecessary state changes
-                if(mode != mQueryMode)
-                {
+                //if(mode != mQueryMode)
+                //{
                         bool enabled = (mode == MODE_RENDER);
                         
@@ -257 +258 @@
 
                         mQueryMode = mode;
-                }
+                //}
         }
         //-----------------------------------------------------------------------

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -5 +5 @@
 #include "OgreCamera.h"
 #include "OgreHardwareOcclusionQuery.h"
-//#include "OgreWireBoundingBox.h"
 #include "OgreSolidHalfBoundingBox.h"
 
@@ -19 +18 @@
                 //mDisplayNodes = true;
                 //mShowBoundingBoxes = true;
-                mShowBoxes = true;
-                //mMaxDepth = 20;
+                //mShowBoxes = true;
+                mMaxDepth = 20;
         }
         //-----------------------------------------------------------------------
@@ -66 +65 @@
         {
                 //char *msg = "now updating scenegraph\n"; OutputDebugString(msg);
+                //mOcclusionCullingTerrainSceneTraverser->preprocess();
+
         mOcclusionCullingTerrainSceneTraverser->setNumSceneNodes((int)mSceneNodes.size());
                 mOcclusionCullingTerrainSceneTraverser->setRenderSystem(mDestRenderSystem);
-        //mOcclusionCullingTerrainSceneTraverser->preprocess();
+        
                 mOcclusionCullingTerrainSceneTraverser->setNumOctreeNodes(mNumOctreeNodes);
 
@@ -99 +100 @@
         NodeList::iterator it = octant->mNodes.begin();
          
-        while ( it != octant->mNodes.end() )
+        while(it != octant->mNodes.end())
         {
             OctreeNode *sn = *it;
@@ -106 +107 @@
 
                         // check bounding box visibility of scene nodes
-                        if( cam->isVisible( sn->_getWorldAABB() ) )
+                        if (cam->isVisible(sn->_getWorldAABB()))
                         {
-                                sn->_addToRenderQueue(cam, getRenderQueue(), false );
+                                sn->_addToRenderQueue(cam, getRenderQueue(), false);
                                 //node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
-                                mVisible.push_back( sn );
+                                mVisible.push_back(sn);
 
-                                if ( mDisplayNodes )
-                                        getRenderQueue()->addRenderable( sn );
+                                if (mDisplayNodes)
+                                        getRenderQueue()->addRenderable(sn);
 
                                 // check if the scene manager or this node wants the bounding box shown.
@@ -119 +120 @@
                                         sn->_addBoundingBoxToQueue(getRenderQueue());
 
-                                if ( mShowBoxes )
+                                if (mShowBoxes)
                                         getRenderQueue()->addRenderable(octant->getWireBoundingBox());
                         }

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneTraverser.cpp

@@ -23 +23 @@
         
                 // if we come across some renderable geometry => render it
-                if(octant->numNodes() > 0)
-                {
-                        renderOctant(cam, octant);
-                }
-
+                renderOctant(cam, octant);
+                
                 for(int i=0; i<8; i++)
                 {
@@ -90 +87 @@
                                 continue;
                         }
-                        // if intersects near plane => skip occlusion query because wrong results possible
+                        //if intersects near plane => skip occlusion query because wrong results possible
                         if(intersects)
                         {
@@ -212 +209 @@
                 {
                         // if we come across some renderable geometry => render it
-                        if(octant->numNodes() > 0)
-                        {
-                                renderOctant(cam, octant);
-                        }
-
+                        renderOctant(cam, octant);
+                        
                         octant->setOctreeVisible(true);
                         octant = octant->getParent();
@@ -224 +218 @@
         void OcclusionCullingTerrainSceneTraverser::renderOctant( Camera *cam, Octree *octant )
         {
+                //if(octant->numNodes() > 0)
                 if(octant->lastVisited() != octant->lastRendered())
                 {
-                        setRenderingMode(MODE_RENDER);
+                        //setRenderingMode(MODE_RENDER);
 
                         octant->setLastRendered(octant->lastVisited());