Changeset 51 for trunk

Timestamp:

04/19/05 09:12:55 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• TestCulling/TestCullingApplication.cpp (modified) (10 diffs)
• TestCulling/TestCullingApplication.h (modified) (2 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (3 diffs)
• include/OgreOcclusionCullingOctreeSceneManager.h (modified) (1 diff)
• include/OgreOcclusionCullingSceneTraverser.h (modified) (1 diff)
• include/OgreOcclusionCullingTerrainSceneManager.h (modified) (1 diff)
• include/OgreSolidHalfBoundingBox.h (modified) (1 diff)
• scripts/Plugin_OcclusionCullingSceneManager.suo (modified) (previous)
• src/OgreOcclusionCullingOctreeSceneManager.cpp (modified) (3 diffs)
• src/OgreOcclusionCullingOctreeSceneTraverser.cpp (modified) (10 diffs)
• src/OgreOcclusionCullingSceneManagerDll.cpp (modified) (2 diffs)
• src/OgreOcclusionCullingSceneTraverser.cpp (modified) (10 diffs)
• src/OgreOcclusionCullingTerrainSceneManager.cpp (modified) (2 diffs)
• src/OgreSolidHalfBoundingBox.cpp (modified) (1 diff)

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.cpp

@@ -20 +20 @@
 #include "windows.h"
 
-//RaySceneQuery* mRaySceneQuery = 0;
 
 /***********************************************/
 /* TestCullingApplication implementation       */
 /***********************************************/
-/*TestCullingApplication::~TestCullingApplication()
-{
-        delete mRaySceneQuery;
-}*/
-//-----------------------------------------------------------------------
-void TestCullingApplication::createCamera( void )
+TestCullingApplication::~TestCullingApplication()
+{
+}
+//-----------------------------------------------------------------------
+/*void TestCullingApplication::createCamera( void )
 {
         // Create the camera
@@ -42 +40 @@
     mCamera->setNearClipDistance( 1 );
     mCamera->setFarClipDistance( 1000 );
-}
+}*/
 //-----------------------------------------------------------------------
 void TestCullingApplication::createScene(void)
 {
-        Plane waterPlane;
         // Set ambient light
         mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
@@ -52 +49 @@
         // Create a light
         Light* l = mSceneMgr->createLight("MainLight");
-        // Accept default settings: point light, white diffuse, just set position
-        // NB I could attach the light to a SceneNode if I wanted it to move automatically with
-        //  other objects, but I don't
-        l->setPosition(20,80,50);
-
-        // --Fog
-        // NB it's VERY important to set this before calling setWorldGeometry 
-        // because the vertex program picked will be different
-        ColourValue fadeColour(0.93, 0.86, 0.76);
-        //mSceneMgr->setFog( FOG_LINEAR, fadeColour, .001, 500, 1000);
-    //mSceneMgr->setFog( FOG_EXP, fadeColour, 0.005 );
-
+        //l->setPosition(20,80,50);
+
+        mMinTranslation = Vector3(-70.0f, -70.0f, 0.0f);
+        mMaxTranslation = Vector3(70.0f, 70.0f, 600.0f);
+
+        mMinAngle = Vector3(0, 0, 0);
+        mMaxAngle = Vector3(360, 360, 360);
+
+        /*
         mWindow->getViewport(0)->setBackgroundColour(fadeColour);
 
+        Entity *ogreHeadEnt = mSceneMgr->createEntity("head", "ogrehead.mesh");
+        mOgreHead = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode" );
+        mOgreHead->attachObject(ogreHeadEnt);
+        */
+        generateScene(4);
         // 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");
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-        terrain_cfg = mResourcePath + terrain_cfg;
-#endif
-        mSceneMgr -> setWorldGeometry( terrain_cfg );
-        // Infinite far plane?
-        if (mRoot->getRenderSystem()->getCapabilities()->hasCapability(RSC_INFINITE_FAR_PLANE))
-        {
-                mCamera->setFarClipDistance(0);
-        }
-
-/*      // Define the required skyplane
-        Plane plane;
-        // 5000 world units from the camera
-        plane.d = 5000;
-        // Above the camera, facing down
-        plane.normal = -Vector3::UNIT_Y;
-        // Create the plane 10000 units wide, tile the texture 3 times
-    mSceneMgr->setSkyPlane(true, plane, "Examples/SpaceSkyPlane",10000,3);*/
-
-        // Set a nice viewpoint
-        mCamera->setPosition(707,2500,528);
-        mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
-
-        //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 );
-        robotNode->scale( .3, .3, .3 );
-        robotNode->yaw( Degree( 160 ) );
-
-        Entity *ogreEnt = mSceneMgr->createEntity( "Ogre", "ogrehead.mesh" );
-    SceneNode *ogreNode = mSceneMgr->getRootSceneNode()->createChildSceneNode( "Ogre", Vector3( 800, 50, 830 ) );
-    ogreNode->attachObject( ogreEnt );
-        ogreNode->scale(.2,.2,.2);
-        ogreNode->yaw( Degree( 20 ) );
-
-        Entity *ogreEnt2 = mSceneMgr->createEntity( "Ogre2", "ogrehead.mesh" );
-    SceneNode *ogreNode2 = mSceneMgr->getRootSceneNode()->createChildSceneNode( "Ogre2", Vector3( 700, 50, 730 ) );
-    ogreNode2->attachObject( ogreEnt2 );
-        ogreNode2->scale(.05,.05,.05);
-        ogreNode->yaw( Degree( 40 ) );*/
+    //mSceneMgr->setSkyBox(true, "Examples/CloudyNoonSkyBox", 1000, false);
+    ColourValue fadeColour(0.3, 0.9, 0.5);
+        mWindow->getViewport(0)->setBackgroundColour(fadeColour);
 
         // CEGUI setup
@@ -142 +97 @@
 void TestCullingApplication::chooseSceneManager(void)
 {
-    //mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
-        mSceneMgr = mRoot->getSceneManager(ST_EXTERIOR_CLOSE);
-}
-
+    mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
+}
+//-----------------------------------------------------------------------
+void TestCullingApplication::generateSceneObject(const Vector3 &translationRatio, 
+                                                                                                 const Vector3 &rotationRatio, const int idx, const String& entName)
+{
+        Vector3 rotation = mMinAngle + rotationRatio * (mMaxAngle - mMinAngle);
+        Vector3 translation = mMinTranslation + translationRatio * (mMaxTranslation - mMinTranslation);
+
+        char name[16];
+    sprintf( name, "object%d", idx );
+
+    Entity *ent = mSceneMgr->createEntity( name, entName );
+        SceneNode *node = mSceneMgr->getRootSceneNode()->createChildSceneNode( String(name) + "Node", translation);
+        node->attachObject(ent);
+        node->scale(0.1,0.1,0.1);
+
+        node->yaw(Degree(rotation.x));
+    node->pitch(Degree(rotation.y));
+        node->roll(Degree(rotation.z));
+}
+//-----------------------------------------------------------------------
+void TestCullingApplication::generateScene( int numObjects )
+{
+        srand (time (0));
+        
+        Vector3 rotationRatio;
+        Vector3 translationRatio;
+
+        for(int i=0; i < numObjects; i++)
+        {
+                rotationRatio.x = rand() / (float) RAND_MAX;
+                rotationRatio.y = rand() / (float) RAND_MAX;
+                rotationRatio.z = rand() / (float) RAND_MAX;
+
+                translationRatio.x = rand() / (float) RAND_MAX;
+                translationRatio.y = rand() / (float) RAND_MAX;
+                translationRatio.z = rand() / (float) RAND_MAX;
+
+                generateSceneObject(translationRatio, rotationRatio, i, "sphere.mesh");
+        }
+}
 /***********************************************/
 /* MouseQueryListener implementation           */
@@ -156 +149 @@
 
         // Setup default variables
-        mCurrentObject = NULL;
+        //mOgreHead = NULL;
         mLMouseDown = false;
         mRMouseDown = false;
@@ -173 +166 @@
         mEventProcessor->addKeyListener(this);
 
-        mRaySceneQuery = mSceneMgr->createRayQuery( Ray() );
-
         // show overlay
         Overlay* pOver = OverlayManager::getSingleton().getByName("Example/OcclusionCullingDemoOverlay"); 
@@ -199 +190 @@
 MouseQueryListener::~MouseQueryListener( )
 {
-        delete mRaySceneQuery;
 }
 //-----------------------------------------------------------------------
@@ -213 +203 @@
      if (e->getButtonID() & InputEvent::BUTTON0_MASK)
      {
-                 CEGUI::MouseCursor::getSingleton().hide( );
-
-                 // 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; 
+                mLMouseDown = true; 
      }
      // Right mouse button down
@@ -267 +235 @@
          if ( mLMouseDown )
      {
-                 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.
@@ -287 +246 @@
 //-----------------------------------------------------------------------
 bool MouseQueryListener::frameStarted(const FrameEvent &evt)
-{
-        // clamp to terrain
-        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 = it->worldFragment;
-
-                mCamera->setPosition(mCamera->getPosition().x, wf->singleIntersection.y + 10, 
-                        mCamera->getPosition().z);
-        }
-         
+{        
         return ExampleFrameListener::frameStarted(evt);
 }

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.h

@@ -79 +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
 };
 
@@ -95 +91 @@
         void createFrameListener(void);
         void setupGui(void);
-        virtual void createCamera(void);
+        /** generates a the scene hierarchy with random values 
+        @param number of objects to generate
+        */
+        void generateScene(int numObjects);
+
+        /** generates a new scene object 
+        @param tranlationRatio ratio between minimal and maximal possible translation
+        @param rotationRatio ratio between minimal and maximal possible rotation
+        @idx the index of the new object
+        @entName the name of the object entity
+        */
+        void generateSceneObject(const Vector3 &translationRatio, const Vector3 &rotationRatio, 
+                                                         const int idx, const String &entName);
+
+        //virtual void createCamera(void);
 
         CEGUI::OgreCEGUIRenderer *mGUIRenderer;
         CEGUI::System *mGUISystem;
+
+        Vector3 mMinTranslation;
+        Vector3 mMaxTranslation;
+
+        Vector3 mMinAngle;
+        Vector3 mMaxAngle;
 
 private:

trunk/VUT/OcclusionCullingSceneManager/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -46 +46 @@
 void TestCullingTerrainApplication::createScene(void)
 {
-        Plane waterPlane;
         // Set ambient light
         mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
@@ -61 +60 @@
         // because the vertex program picked will be different
         ColourValue fadeColour(0.93, 0.86, 0.76);
+        mWindow->getViewport(0)->setBackgroundColour(fadeColour);
         //mSceneMgr->setFog( FOG_LINEAR, fadeColour, .001, 500, 1000);
     //mSceneMgr->setFog( FOG_EXP, fadeColour, 0.005 );
 
-        mWindow->getViewport(0)->setBackgroundColour(fadeColour);
+        
 
         // Create a skybox
     //mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox", 500, false);
         //mSceneMgr->setSkyDome( true, "Examples/CloudySky", 5, 8, 500, false );
+
+        /*      // Define the required skyplane
+        Plane plane;
+        // 5000 world units from the camera
+        plane.d = 5000;
+        // Above the camera, facing down
+        plane.normal = -Vector3::UNIT_Y;
+        // Create the plane 10000 units wide, tile the texture 3 times
+    mSceneMgr->setSkyPlane(true, plane, "Examples/SpaceSkyPlane",10000,3);*/
 
         std::string terrain_cfg("terrain.cfg");
@@ -81 +90 @@
         }
 
-/*      // Define the required skyplane
-        Plane plane;
-        // 5000 world units from the camera
-        plane.d = 5000;
-        // Above the camera, facing down
-        plane.normal = -Vector3::UNIT_Y;
-        // Create the plane 10000 units wide, tile the texture 3 times
-    mSceneMgr->setSkyPlane(true, plane, "Examples/SpaceSkyPlane",10000,3);*/
-
         // Set a nice viewpoint
         mCamera->setPosition(707,2500,528);
         mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
 
-        //mRaySceneQuery = mSceneMgr->createRayQuery(
-        //      Ray(mCamera->getPosition(), Vector3::NEGATIVE_UNIT_Y));
-
-        /*Entity *robotEnt = mSceneMgr->createEntity( "Robot", "robot.mesh" );
+        /*
+        Entity *robotEnt = mSceneMgr->createEntity( "Robot", "robot.mesh" );
         SceneNode *robotNode = mSceneMgr->getRootSceneNode()->createChildSceneNode( "RobotNode", Vector3( 750, 25, 600 ));
         robotNode->attachObject( robotEnt );

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingOctreeSceneManager.h

@@ -42 +42 @@
                 bool getOptionKeys( StringVector &refKeys );
 
-                /** Renders one octant of an octree, i.e., renders current octant
-                        node and does not traverse deeper into the tree.
-                        @remark Note that OctreeNode instances are NOT part of the octree 
-                        hierarchy, instead one octant of an Octree contains many OctreeNode instances.
-                        @param octree the octree to be rendered
-                        @param cam current camera
-                */
-                void _renderOctant(Camera* cam, Octree *octree);
-
         protected:
                 /** Recursively counts octree size (i.e., number of octree instances)

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingSceneTraverser.h

@@ -170 +170 @@
                 unsigned int mNumFrustumCulledNodes;
                 unsigned int mNumRenderedGeometry;
+                unsigned int mNumRenderedNodes;
 
         private:

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneManager.h

@@ -44 +44 @@
                 bool getOptionKeys( StringVector &refKeys );
 
-                /** Renders one octant of an octree, i.e., renders current octant
-                        node and does not traverse deeper into the tree.
-                        @remark Note that OctreeNode instances are NOT part of the octree 
-                        hierarchy, instead one octant of an Octree contains many OctreeNode instances.
-                        @param octree the octree to be rendered
-                        @param cam current camera
-                */
-                void _renderOctant(Camera* cam, Octree *octree);
-
         protected:
 

trunk/VUT/OcclusionCullingSceneManager/include/OgreSolidHalfBoundingBox.h

@@ -15 +15 @@
         class SolidHalfBoundingBox : public WireBoundingBox
         {
+        public:
+
+                SolidHalfBoundingBox(bool isFirstHalf);
+                void setupBoundingBox(const AxisAlignedBox& aabb);
+                /** Override this method to prevent parent transforms (rotation,translation,scale)
+                and to make it public.
+        */
+                void getWorldTransforms( Matrix4* xform ) const;
+
     protected:
        
         /** Builds the wireframe line list.
+                @param the axis aligned bounding box for setting up the list.
         */
                 void setupBoundingBoxVertices(const AxisAlignedBox& aab);
-                
-        public:
-                
-                bool mIsFirstHalf;
-                void setupBoundingBox(const AxisAlignedBox& aabb);
-                SolidHalfBoundingBox(bool isFirstHalf);
+
+                bool mIsFirstHalf;      
         };
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingOctreeSceneManager.cpp

@@ -16 +16 @@
                 //mDisplayNodes = true;
                 //mShowBoundingBoxes = true;
-                //mShowBoxes = true;
+                mShowBoxes = true;
                 mMaxDepth = 20;
         }
@@ -57 +57 @@
                 // must be empty because objects are found and rendered in an interleaved fashion
                 // in _renderVisibibleObjects 
-                //char *msg = "now finding visible objects\n"; OutputDebugString(msg);
         }
         //-----------------------------------------------------------------------
@@ -92 +91 @@
                 return mOcclusionCullingOctreeSceneTraverser->getOptionKeys ( refKeys ) || OctreeSceneManager::getOptionKeys( refKeys );
         }
-        //-----------------------------------------------------------------------
-        void OcclusionCullingOctreeSceneManager::_renderOctant(Camera *cam, Octree *octant)
-        {
-                //Add stuff to be rendered;
-        NodeList::iterator it = octant->mNodes.begin();
-         
-        while(it != octant->mNodes.end())
-        {
-            OctreeNode *sn = *it;
-
-            mNumObjects++;
-
-                        // check bounding box visibility of scene nodes
-                        if (cam->isVisible(sn->_getWorldAABB()))
-                        {
-                                sn->_addToRenderQueue(cam, getRenderQueue(), false);
-                                //node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
-                                mVisible.push_back(sn);
-
-                                if (mDisplayNodes)
-                                        getRenderQueue()->addRenderable(sn);
-
-                                // check if the scene manager or this node wants the bounding box shown.
-                                if (sn->getShowBoundingBox() || mShowBoundingBoxes)
-                                        sn->_addBoundingBoxToQueue(getRenderQueue());
-
-                                if (mShowBoxes)
-                                        getRenderQueue()->addRenderable(octant->getWireBoundingBox());
-                        }
-            ++it;
-        }
-
-                SceneManager::_renderVisibleObjects();
-        
-                // delete all rendered objects from renderqueue
-                _deleteRenderedQueueGroups();
-        }
 }       

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingOctreeSceneTraverser.cpp

@@ -28 +28 @@
                 {
                         Octree *nextChild = octant->mChildren[(i & 4) >> 2][(i & 2) >> 1][i & 1];
-                
+
+                        /*char msg[100];
+                        sprintf(msg, "node number: %d %d %d\n", (i & 4) >> 2, (i & 2) >> 1, i & 1);
+                        OutputDebugString(msg);*/
+
                         if(nextChild)
                                 mOctreeDistanceQueue->push(nextChild);
@@ -44 +48 @@
         
                         // interesting for visualization purpose
-                        //TODO: octree->setNodeVisible(false);
+                        octant->setOctreeVisible(false);
                         octant->_getCullBounds(&box);
                         
@@ -81 +85 @@
                         bool intersects = false;
 
-                        //if(vis == OctreeCamera::NONE)
                         if(!cam->isVisible(box, intersects))
                         {
@@ -100 +103 @@
                         // wait if result not available
                         query->pullOcclusionQuery(&visiblePixels);
-                        
+//visiblePixels = 1;
                         // node visible
                         if(visiblePixels > mVisibilityThreshold)
@@ -108 +111 @@
                         else
                         {
+                                char msg[100];
+                                Vector3 min = box.getMinimum();
+                                Vector3 max = box.getMaximum();
+
+                                sprintf(msg, "culling box: %3.3f %3.3f %3.3f %3.3f %3.3f %3.3f\n", min.x, min.y, min.z, max.x, max.y, max.z);
+                                OutputDebugString(msg);
+
                                 mNumQueryCulledNodes ++;
                         }
@@ -133 +143 @@
                                 unsigned int visiblePixels;
                                 query->pullOcclusionQuery(&visiblePixels);
-
+//visiblePixels = 1;
                                 if(visiblePixels > mVisibilityThreshold)
                                 {
@@ -164 +174 @@
                                 if(intersects)
                                 {
-                                        // update node's visited flag
+                                        // update octant's visited flag
                                         octant->setLastVisited(mFrameId);
                                         pullUpVisibility(cam, octant);                  
@@ -174 +184 @@
                                 // identify previously visible nodes
                                 bool wasVisible = octant->isOctreeVisible() && (octant->lastVisited() == mFrameId - 1);
-                                        
+                                
+                                /* char msg[100];
+                                if(wasVisible) sprintf(msg, "yes, was visible, %d\n", mFrameId);
+                                else sprintf(msg, "no was invisible, %d\n", mFrameId);
+                                OutputDebugString(msg);*/
+
                                 // identify nodes that we cannot skip queries for
                                 bool leafOrWasInvisible = !wasVisible || isLeaf(octant);
@@ -196 +211 @@
                                         traverseOctant(cam, octant);
                                 }
-                                else
-                                {
-                                        mNumFrustumCulledNodes ++;
-                                }
                         }
                 }
@@ -218 +229 @@
         void OcclusionCullingOctreeSceneTraverser::renderOctant( Camera *cam, Octree *octant )
         {
-                //if(octant->numNodes() > 0)
+                if(octant->numNodes() == 0) return;
                 if(octant->lastVisited() != octant->lastRendered())
                 {
-                        //setRenderingMode(MODE_RENDER);
+                        //TODO: does nothing useful
+                        setRenderingMode(MODE_RENDER);
+                        mNumRenderedNodes ++;
 
                         octant->setLastRendered(octant->lastVisited());
-                        ((OcclusionCullingOctreeSceneManager *)mSceneManager)->_renderOctant(cam, octant);
-                }
-                else OutputDebugString("already rendered");
+                        ((OctreeSceneManager *)mSceneManager)->_renderOctant(cam, octant);
+                }
+                //else OutputDebugString("already rendered");
         }
         //-----------------------------------------------------------------------

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -34 +34 @@
 namespace Ogre {
 
-   // OcclusionCullingDotSceneManager *occlusionDotPlugin;
+        // OcclusionCullingDotSceneManager *occlusionDotPlugin;
         OcclusionCullingOctreeSceneManager *occlusionOctreePlugin;
         OcclusionCullingTerrainSceneManager *occlusionTerrainPlugin;
@@ -54 +54 @@
                 Root::getSingleton().setSceneManager( ST_GENERIC, occlusionOctreePlugin );
                 Root::getSingleton().setSceneManager( ST_EXTERIOR_CLOSE, occlusionTerrainPlugin );
-                
-                // MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
     }
     extern "C" void dllStopPlugin(void)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -16 +16 @@
         mQueryMode(MODE_RENDER), mNumSceneNodes(0), mCurrentAlgorithm(RENDER_COHERENT),
         mNumQueries(0), mNumTraversedNodes(0), mNumQueryCulledNodes(0), mNumFrustumCulledNodes(0), 
-        mNumRenderedGeometry(0), mSceneManager(sm), mRenderSystem(rsys), mSceneRoot(NULL)
+        mNumRenderedNodes(0),mNumRenderedGeometry(0), mSceneManager(sm), mRenderSystem(rsys), mSceneRoot(NULL)
         {               
                 mHalfBoundingBox[0] = mHalfBoundingBox[1] = 0;
@@ -39 +39 @@
                 mNumFrustumCulledNodes = 0;
                 mNumRenderedGeometry = 0;
-                
+                mNumRenderedNodes = 0;
+
                 mCurrentTestIdx = 0;
 
                 initDistanceQueue(cam);
 
-//mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
+                //deleteQueries();
+                //char *msg = "deleting queries\n"; OutputDebugString(msg);
+        //for(unsigned int i=0; i < 1000; i++)
+                //mOcclusionQueries.push_back(mRenderSystem->createHardwareOcclusionQuery());
+            //mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
+
                 switch(mCurrentAlgorithm)
                 {
@@ -54 +60 @@
                                 break;
                         case RENDER_COHERENT:
-                                //renderCoherentWithQueue(cam);
-renderStopAndWait(cam);
+                                renderCoherentWithQueue(cam);
                                 break;
                         default:
@@ -209 +214 @@
                         // wait if result not available
                         query->pullOcclusionQuery(&visiblePixels);
-                                
+        
                         // node visible
                         if(visiblePixels > mVisibilityThreshold)
@@ -229 +234 @@
                 // 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
@@ -251 +256 @@
                 //{
                         bool enabled = (mode == MODE_RENDER);
-                        
+//if(mode == MODE_QUERY){
                         mRenderSystem->_setColourBufferWriteEnabled(enabled, 
                                 enabled, enabled, enabled);
                         mRenderSystem->_setDepthBufferWriteEnabled(enabled);
                         mRenderSystem->setLightingEnabled(enabled);
-
+//}
                         mQueryMode = mode;
                 //}
@@ -346 +351 @@
         void OcclusionCullingSceneTraverser::deleteQueries( void )
         {
-                for(unsigned int i=0; i < (unsigned int)mOcclusionQueries.size(); i++)
+                for(unsigned int i=0; i < (unsigned int)mOcclusionQueries.size(); ++i)
                         delete mOcclusionQueries[i];
 
@@ -357 +362 @@
                 for(int half = 0; half < 2; half ++)
                 {
-                        //static Matrix4 xform[256];
-                        //TODO: this should be full boudning box
+                        static Matrix4 xform[256];
+                        //TODO: this should be full bounding box
                         SolidHalfBoundingBox *halfbox = getSolidHalfBoundingBox(half);
                         halfbox->setupBoundingBox(*box);
-
-                        mRenderSystem->_setWorldMatrix(Matrix4::IDENTITY);
                         
+                        //mRenderSystem->_setWorldMatrix(Matrix4::IDENTITY);
+                        // Set world transformation
+                        /*halfbox->getWorldTransforms(xform);
+
+                        int numMatrices = halfbox->getNumWorldTransforms();
+                        if (numMatrices > 1)
+                        {
+                                mRenderSystem->_setWorldMatrices(xform, numMatrices);
+                        }
+                        else
+                        {
+                                mRenderSystem->_setWorldMatrix(*xform);
+                        }
+                        mRenderSystem->setClipPlanes(halfbox->getClipPlanes());
+
                         static RenderOperation ro;
 
@@ -369 +387 @@
                         halfbox->getRenderOperation(ro);
                         ro.srcRenderable = halfbox; 
-                        mRenderSystem->_render(ro);
-
-                        //mSceneManager->renderSingleObject(getSolidHalfBoundingBox(half), 
-                        //      getSolidHalfBoundingBox(half)->getTechnique()->getPass(0), false);
+                        mRenderSystem->_render(ro);*/
+
+                        mSceneManager->myrenderSingleObject(getSolidHalfBoundingBox(half), 
+                                getSolidHalfBoundingBox(half)->getTechnique()->getPass(0), false);
                 }
         }
@@ -410 +428 @@
                 {
                         mOcclusionQueries.push_back(mRenderSystem->createHardwareOcclusionQuery());
+                        //char *msg = "creating query!!\n"; OutputDebugString(msg);
                 }
                 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -18 +18 @@
                 //mDisplayNodes = true;
                 //mShowBoundingBoxes = true;
-                //mShowBoxes = true;
+                mShowBoxes = true;
                 mMaxDepth = 20;
         }
@@ -95 +95 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneManager::_renderOctant(Camera *cam, Octree *octant)
-        {
-                //Add stuff to be rendered;
-        NodeList::iterator it = octant->mNodes.begin();
-         
-        while(it != octant->mNodes.end())
-        {
-            OctreeNode *sn = *it;
-
-            mNumObjects++;
-
-                        // check bounding box visibility of scene nodes
-                        if (cam->isVisible(sn->_getWorldAABB()))
-                        {
-                                sn->_addToRenderQueue(cam, getRenderQueue(), false);
-                                //node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
-                                mVisible.push_back(sn);
-
-                                if (mDisplayNodes)
-                                        getRenderQueue()->addRenderable(sn);
-
-                                // check if the scene manager or this node wants the bounding box shown.
-                                if (sn->getShowBoundingBox() || mShowBoundingBoxes)
-                                        sn->_addBoundingBoxToQueue(getRenderQueue());
-
-                                if (mShowBoxes)
-                                        getRenderQueue()->addRenderable(octant->getWireBoundingBox());
-                        }
-            ++it;
-        }
-
-                SceneManager::_renderVisibleObjects();
-        
-                // delete all rendered objects from renderqueue
-                _deleteRenderedQueueGroups();
-        }
-        //-----------------------------------------------------------------------
         /*unsigned int OcclusionCullingTerrainSceneManager::countNumOctrees(Octree *root)
         {

trunk/VUT/OcclusionCullingSceneManager/src/OgreSolidHalfBoundingBox.cpp

@@ -89 +89 @@
                 setBoundingBox(aabb);
         }
+        // Override this method to prevent parent transforms (rotation,translation,scale)
+    void SolidHalfBoundingBox::getWorldTransforms( Matrix4* xform ) const
+    {
+                // return identity matrix to prevent parent transforms
+        *xform = Matrix4::IDENTITY;
+    }
 }