Changeset 55 for trunk/VUT

Timestamp:

04/21/05 19:33:56 (19 years ago)

Author:

mattausch

Message:

added TerrainContentGenerator?

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• TestCulling/TestCullingApplication.h (modified) (2 diffs)
• TestCullingTerrain/TerrainContentGenerator.cpp (modified) (1 diff)
• TestCullingTerrain/TerrainContentGenerator.h (modified) (1 diff)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (7 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.h (modified) (5 diffs)
• src/OgreOcclusionCullingOctreeSceneTraverser.cpp (modified) (1 diff)
• src/OgreOcclusionCullingTerrainSceneManager.cpp (modified) (1 diff)

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.h

@@ -6 +6 @@
 #include "ExampleApplication.h"
 #include "OgreOcclusionCullingSceneTraverser.h"
+
 
 Real timeDelay = 0;
@@ -28 +29 @@
 public:
 
-    MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, CEGUI::Renderer *renderer);
+    MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, 
+                        CEGUI::Renderer *renderer);
 
 

trunk/VUT/OcclusionCullingSceneManager/TestCullingTerrain/TerrainContentGenerator.cpp

@@ -5 +5 @@
         Creates content for the terrain,
 */
-
 #include "TerrainContentGenerator.h"
 
 //-----------------------------------------------------------------------
-TerrainContentGenerator::TerrainContentGenerator( void )
+TerrainContentGenerator::TerrainContentGenerator( SceneManager *sm, RayQueryExecutor *rayQueryEx )
 {
+        mSceneMgr = sm;
+        mRayQueryExecutor = rayQueryEx;
+
+        mMinTranslation = Vector3(-70.0f, -70.0f, 0.0f);
+        mMaxTranslation = Vector3(70.0f, 70.0f, 600.0f);
+
+        mMinAngle = 0;
+        mMaxAngle = 360;
+
+        mCount = 0;
 }
+//-----------------------------------------------------------------------
+void TerrainContentGenerator::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");
+        }
+}
+//-----------------------------------------------------------------------
+void TerrainContentGenerator::generateSceneObject(const Vector3 &translationRatio, 
+                                         const Vector3 &rotationRatio, const int idx, const String& entName)
+{
+        // Setup the ray scene query
+        Real rotation = mMinAngle + rotationRatio.x * (mMaxAngle - mMinAngle);
+        Vector3 translation = mMinTranslation + translationRatio * (mMaxTranslation - mMinTranslation);
+
+        translation.y = 5000;
+    
+        Vector3 queryResult;
+
+        if(mRayQueryExecutor->executeRayQuery(&queryResult, translation, Vector3::NEGATIVE_UNIT_Y))
+        {
+                char name[16];
+                sprintf( name, "%s%d", entName.c_str(), mCount++);
+
+                Entity *ent = mSceneMgr->createEntity(name, entName);
+                SceneNode *currentObject = mSceneMgr->getRootSceneNode( )->createChildSceneNode( String(name) + "Node", queryResult);
+                currentObject->attachObject(ent);
+                currentObject->setScale(0.1f, 0.1f, 0.1f);
+        }
+}
+//-----------------------------------------------------------------------
+RayQueryExecutor::RayQueryExecutor( SceneManager *sm )
+{
+        mRaySceneQuery = sm->createRayQuery(Ray());
+}
+//-----------------------------------------------------------------------
+RayQueryExecutor::~RayQueryExecutor()
+{
+        delete mRaySceneQuery;
+}
+//-----------------------------------------------------------------------
+bool RayQueryExecutor::executeRayQuery( Vector3 *result, const Vector3 &pos, const Vector3 &dir )
+{
+        Ray ray(pos, dir);
+    mRaySceneQuery->setRay(ray);
+
+    // Perform the scene query
+    RaySceneQueryResult &queryResult = mRaySceneQuery->execute();
+    RaySceneQueryResult::iterator it = queryResult.begin( );
+
+        if (it != queryResult.end() && it->worldFragment)
+        {
+                SceneQuery::WorldFragment* wf = it->worldFragment;
+
+                *result = wf->singleIntersection; 
+                return true;
+        }
+
+        return false;
+}

trunk/VUT/OcclusionCullingSceneManager/TestCullingTerrain/TerrainContentGenerator.h

@@ -3 +3 @@
         TerrainContentGenerator.h
 */
+#include "ExampleApplication.h"
+
+class RayQueryExecutor
+{
+public:
+        RayQueryExecutor( SceneManager *sm );
+        ~RayQueryExecutor( );
+        bool executeRayQuery( Vector3 *result, const Vector3 &pos, const Vector3 &dir );
+protected:
+        RaySceneQuery *mRaySceneQuery;
+};
 
 class TerrainContentGenerator
 {
 public:
-        TerrainContentGenerator();
+        TerrainContentGenerator(  SceneManager *sm, RayQueryExecutor *rayQueryEx );
+        /** 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 );
 
 protected:
 
+        Real mMinAngle;
+        Real mMaxAngle;
+        Vector3 mMaxTranslation;
+        Vector3 mMinTranslation;
+
+        RayQueryExecutor *mRayQueryExecutor;
+        SceneManager *mSceneMgr;
+        int mCount;             // The number of objects on the screen
 };
 

trunk/VUT/OcclusionCullingSceneManager/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -20 +20 @@
 #include "windows.h"
 
-//RaySceneQuery* mRaySceneQuery = 0;
-
-/***********************************************/
-/* TestCullingTerrainApplication implementation       */
-/***********************************************/
-/*TestCullingTerrainApplication::~TestCullingTerrainApplication()
-{
-        delete mRaySceneQuery;
-}*/
+
+/************************************************/
+/* TestCullingTerrainApplication implementation */
+/************************************************/
+TestCullingTerrainApplication::~TestCullingTerrainApplication()
+{
+        delete mRayQueryExecutor;
+        delete mTerrainContentGenerator;
+}
+
 //-----------------------------------------------------------------------
 void TestCullingTerrainApplication::createCamera( void )
@@ -40 +41 @@
         // Look back along -Z
     mCamera->lookAt(Vector3(0,0,-300));
-    mCamera->setNearClipDistance( 1 );
-    mCamera->setFarClipDistance( 1000 );
-}
-//-----------------------------------------------------------------------
-void TestCullingTerrainApplication::createScene(void)
-{
+    mCamera->setNearClipDistance(1);
+    mCamera->setFarClipDistance(1000);
+}
+//-----------------------------------------------------------------------
+void TestCullingTerrainApplication::generateSceneObject(const Vector3 &translationRatio, 
+                                         const Vector3 &rotationRatio, const int idx, const String& entName)
+{
+        // Setup the ray scene query
+        /*Vector3 rotation = mMinAngle + rotationRatio * (mMaxAngle - mMinAngle);
+        Vector3 translation = mMinTranslation + translationRatio * (mMaxTranslation - mMinTranslation);
+
+        translation.y = 5000;
+    Ray ray(translation, Vector3::NEGATIVE_UNIT_Y);
+    mRaySceneQuery->setRay(ray);
+
+    // 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, "%s%d", entName.c_str(), mCount++ );
+
+                Entity *ent = mSceneMgr->createEntity( name, entName );
+                SceneNode currentObject = mSceneMgr->getRootSceneNode( )->createChildSceneNode( String(name) + "Node", itr->worldFragment->singleIntersection );
+                currentObject->attachObject( ent );
+                currentObject->setScale( 0.1f, 0.1f, 0.1f );
+        }*/
+}
+
+//-----------------------------------------------------------------------
+void TestCullingTerrainApplication::createScene( void )
+{
+        mRayQueryExecutor = new RayQueryExecutor(mSceneMgr);
+        mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr, mRayQueryExecutor);
         // Set ambient light
         mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
@@ -62 +94 @@
         mWindow->getViewport(0)->setBackgroundColour(fadeColour);
         //mSceneMgr->setFog( FOG_LINEAR, fadeColour, .001, 500, 1000);
-    //mSceneMgr->setFog( FOG_EXP, fadeColour, 0.005 );
-
-        
 
         // Create a skybox
@@ -94 +123 @@
         mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
 
-        /*
-        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 ) );*/
-
         // CEGUI setup
         setupGui();
@@ -133 +143 @@
 void TestCullingTerrainApplication::createFrameListener(void)
 {
-        mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, mGUIRenderer);
+        mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, mGUIRenderer, mRayQueryExecutor);
         mFrameListener->showDebugOverlay(true);
         mRoot->addFrameListener(mFrameListener);
@@ -148 +158 @@
 /***********************************************/
 //-----------------------------------------------------------------------
-MouseQueryListener::MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, CEGUI::Renderer *renderer)
-        : ExampleFrameListener(win, cam, false, true), mGUIRenderer(renderer), 
-                mShutdownRequested(false)
+MouseQueryListener::MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, CEGUI::Renderer *renderer, RayQueryExecutor *rqe)
+        : ExampleFrameListener(win, cam, false, true), mGUIRenderer(renderer), mShutdownRequested(false), mRayQueryExecutor(rqe)
 {
 
@@ -171 +180 @@
         mEventProcessor->addKeyListener(this);
 
-        mRaySceneQuery = mSceneMgr->createRayQuery( Ray() );
+        mRaySceneQuery = mSceneMgr->createRayQuery(Ray());
 
         // show overlay

trunk/VUT/OcclusionCullingSceneManager/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -6 +6 @@
 #include "ExampleApplication.h"
 #include "OgreOcclusionCullingSceneTraverser.h"
+#include "TerrainContentGenerator.h"
 
 Real timeDelay = 0;
@@ -28 +29 @@
 public:
 
-    MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, CEGUI::Renderer *renderer);
+    MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, 
+                CEGUI::Renderer *renderer, RayQueryExecutor *rqe);
 
 
@@ -82 +84 @@
 
         SceneNode *mCurrentObject;         // The newly created object
+        RaySceneQuery *mRaySceneQuery;     // The ray scene query pointer
         int mCount;                        // The number of robots on the screen
-        RaySceneQuery *mRaySceneQuery;     // The ray scene query pointer
+
+        RayQueryExecutor *mRayQueryExecutor;
 };
 
@@ -90 +94 @@
 {
 public:
-        //~TestCullingTerrainApplication();
+        ~TestCullingTerrainApplication();
 
 protected:
@@ -98 +102 @@
         virtual void createCamera(void);
 
+        /** 
+                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);
+
         CEGUI::OgreCEGUIRenderer *mGUIRenderer;
         CEGUI::System *mGUISystem;
+        RayQueryExecutor *mRayQueryExecutor;
+        TerrainContentGenerator *mTerrainContentGenerator;
+
+        Vector3 mMinTranslation;
+        Vector3 mMaxTranslation;
+
+        Vector3 mMinAngle;
+        Vector3 mMaxAngle;
 
 private:

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingOctreeSceneTraverser.cpp

@@ -114 +114 @@
                         else
                         {
-                                /*
-                                char msg2[100];
-                                Vector3 min = box.getMinimum();
-                                Vector3 max = box.getMaximum();
-
-                                sprintf(msg2, "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(msg2);
-                                */
-
                                 mNumQueryCulledNodes ++;
                         }

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -16 +16 @@
                         new OcclusionCullingOctreeSceneTraverser(this, mDestRenderSystem);
 
-                mShowBoxes = true;
+                //mShowBoxes = true;
                 //mDisplayNodes = true;
-                mShowBoundingBoxes = true;
+                //mShowBoundingBoxes = true;
                 mMaxDepth = 20;
         }