Changeset 37

Timestamp:

04/01/05 17:28:57 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• TestCullingDotScene/TestCullingDotScene.vcproj (modified) (4 diffs)
• TestCullingDotScene/TestCullingDotSceneApplication.cpp (modified) (13 diffs)
• TestCullingDotScene/TestCullingDotSceneApplication.h (modified) (5 diffs)
• scripts/Plugin_OcclusionCullingSceneManager.sln (modified) (1 diff)
• scripts/Plugin_OcclusionCullingSceneManager.suo (modified) (previous)
• src/OgreOcclusionCullingDotSceneManager.cpp (modified) (3 diffs)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (2 diffs)
• src/OgreOcclusionCullingSceneManagerDll.cpp (modified) (2 diffs)
• src/OgreOcclusionCullingSceneTraverser.cpp (modified) (7 diffs)
• src/OgreOcclusionCullingTerrainSceneTraverser.cpp (modified) (3 diffs)
• tinyxml (added)
• tinyxml/tinystr.cpp (added)
• tinyxml/tinystr.h (added)
• tinyxml/tinyxml.cpp (added)
• tinyxml/tinyxml.h (added)
• tinyxml/tinyxmlerror.cpp (added)
• tinyxml/tinyxmlparser.cpp (added)

trunk/VUT/OcclusionCullingSceneManager/TestCullingDotScene/TestCullingDotScene.vcproj

@@ -13 +13 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="Debug"
-                        IntermediateDirectory="Debug"
+                        OutputDirectory="..\bin\$(ConfigurationName)"
+                        IntermediateDirectory="..\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="2">
@@ -21 +21 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;../include"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+                                PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_DEBUG;WIN32;_STLP_DEBUG"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
-                                RuntimeLibrary="5"
+                                RuntimeLibrary="2"
                                 UsePrecompiledHeader="0"
                                 WarningLevel="3"
@@ -34 +34 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="Plugin_OctreeSceneManager.lib OGREMain_d.LIB CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_DotSceneManager.lib"
-                                OutputFile="$(OutDir)/TestCullingDotScene.exe"
+                                OutputFile="$(OGRE_PATH)/Samples/Common/bin/Debug/TestCullingDotScene.exe"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\Debug&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\debug&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\Debug&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\debug&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;"
@@ -133 +133 @@
                         UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
                 </Filter>
+                <Filter
+                        Name="tinyxml"
+                        Filter="">
+                        <File
+                                RelativePath="..\tinyxml\tinystr.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\tinyxml\tinystr.h">
+                        </File>
+                        <File
+                                RelativePath="..\tinyxml\tinyxml.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\tinyxml\tinyxml.h">
+                        </File>
+                        <File
+                                RelativePath="..\tinyxml\tinyxmlerror.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\tinyxml\tinyxmlparser.cpp">
+                        </File>
+                </Filter>
         </Files>
         <Globals>

trunk/VUT/OcclusionCullingSceneManager/TestCullingDotScene/TestCullingDotSceneApplication.cpp

@@ -14 +14 @@
 
 #include "Ogre.h"
-#include "TestCullingApplication.h"
+#include "OgreLight.h"
+#include "tinyxml.h"
+#include "TestCullingDotSceneApplication.h"
 #include "OgreOcclusionCullingSceneTraverser.h"
 
@@ -20 +22 @@
 #include "windows.h"
 
-RaySceneQuery* raySceneQuery = 0;
-
 /***********************************************/
-/* TestCullingApplication implementation       */
+/* TestCullingDotSceneApplication implementation       */
 /***********************************************/
-TestCullingApplication::~TestCullingApplication()
-{
-        delete raySceneQuery;
-}
-
-void TestCullingApplication::parseDotScene( const String &SceneName, const String& groupName )
+void TestCullingDotSceneApplication::ParseDotScene( const String &SceneName, const String& groupName )
 {
         TiXmlDocument   *XMLDoc;
@@ -254 +249 @@
 }
 
-Light* LoadLight( TiXmlElement *XMLLight )
+Light* TestCullingDotSceneApplication::LoadLight( TiXmlElement *XMLLight )
 {
         TiXmlElement *XMLDiffuse, *XMLSpecular, *XMLAttentuation, *XMLPosition;
 
         // Create a light (point | directional | spot | radPoint)
-        Light* l = mSceneMgr->createLight( XMLLight->Attribute("name") );
+        Light* light = mSceneMgr->createLight( XMLLight->Attribute("name") );
         if( !XMLLight->Attribute("type") || String(XMLLight->Attribute("type")) == "point" )
-                l->setType( Light::LT_POINT );
+                light->setType( Light::LT_POINT );
         else if( String(XMLLight->Attribute("type")) == "directional")
-                l->setType( Light::LT_DIRECTIONAL );
+                light->setType( Light::LT_DIRECTIONAL );
         else if( String(XMLLight->Attribute("type")) == "spot")
-                l->setType( Light::LT_SPOTLIGHT );
+                light->setType( Light::LT_SPOTLIGHT );
         else if( String(XMLLight->Attribute("type")) == "radPoint")
-                l->setType( Light::LT_POINT );
+                light->setType( Light::LT_POINT );
 
         XMLDiffuse = XMLLight->FirstChildElement("colourDiffuse");
@@ -277 +272 @@
                 Diffuse.b = Ogre::StringConverter::parseReal( XMLDiffuse->Attribute("b") );
                 Diffuse.a = 1;
-                l->setDiffuseColour(Diffuse);
+                light->setDiffuseColour(Diffuse);
         }
         
@@ -289 +284 @@
                 Specular.b = Ogre::StringConverter::parseReal( XMLSpecular->Attribute("b") );
                 Specular.a = 1;
-                l->setSpecularColour(Specular);
+                light->setSpecularColour(Specular);
         }
 
@@ -297 +292 @@
                 //get defaults incase not all values specified
                 Real range, constant, linear, quadratic;
-                range = l->getAttenuationRange();
-                constant = l->getAttenuationConstant();
-                linear = l->getAttenuationLinear();
-                quadratic = l->getAttenuationQuadric();
+                range = light->getAttenuationRange();
+                constant = light->getAttenuationConstant();
+                linear = light->getAttenuationLinear();
+                quadratic = light->getAttenuationQuadric();
                         
                 if( XMLAttentuation->Attribute("range") )
@@ -310 +305 @@
                 if( XMLAttentuation->Attribute("quadratic") )
                         quadratic = StringConverter::parseReal( XMLAttentuation->Attribute("quadratic") );
-                        l->setAttenuation( range, constant, linear, quadratic );
+                        light->setAttenuation( range, constant, linear, quadratic );
         }
 
@@ -324 +319 @@
                         p.z = StringConverter::parseReal( XMLPosition->Attribute("z") );
             
-                l->setPosition( p );
+                light->setPosition( p );
         }
 
         //castShadows           (true | false) "true"
-        l->setCastShadows( true );
+        light->setCastShadows( true );
         if( XMLLight->Attribute("visible") )
                 if( String(XMLLight->Attribute("visible")) == "false" )
-                                l->setCastShadows( false );
+                                light->setCastShadows( false );
                         
         //visible                       (true | false) "true"           
-        l->setVisible( true );
+        light->setVisible( true );
         if( XMLLight->Attribute("visible") )
                 if( String(XMLLight->Attribute("visible")) == "false" )
-                        l->setVisible( false );
-
-        return l;
-}
-//-----------------------------------------------------------------------
-void TestCullingApplication::createCamera( void )
-{
-        // Create the camera
-        mCamera = mSceneMgr->createCamera("PlayerCam");
-
-        // Position it at 500 in Z direction
-        mCamera->setPosition(Vector3(128,25,128));
-
-        // Look back along -Z
-    mCamera->lookAt(Vector3(0,0,-300));
-    mCamera->setNearClipDistance( 1 );
-    mCamera->setFarClipDistance( 1000 );
-}
-//-----------------------------------------------------------------------
-void TestCullingApplication::createScene(void)
-{
-        Plane waterPlane;
-        // Set ambient light
-        mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
-        
-        // 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);
-        mWindow->getViewport(0)->setBackgroundColour(fadeColour);
-
-        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;
-
-        // Set a nice viewpoint
-        mCamera->setPosition(707,2500,528);
-        mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
-
-        raySceneQuery = mSceneMgr->createRayQuery(
-        Ray(mCamera->getPosition(), Vector3::NEGATIVE_UNIT_Y));
-
-     // Create a skybox
-  //   mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox");
-
-         // CEGUI setup
-         setupGui();
-}
-//-----------------------------------------------------------------------
-void TestCullingApplication::setupGui( void )
-{
-         mGUIRenderer = new CEGUI::OgreCEGUIRenderer(mWindow, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, ST_EXTERIOR_CLOSE);
+                        light->setVisible( false );
+
+        return light;
+}
+//-----------------------------------------------------------------------
+void TestCullingDotSceneApplication::createScene(void)
+{
+        mSceneMgr->setAmbientLight(ColourValue(0.09f, 0.09f, 0.09f));
+        mSceneMgr->setSkyBox(true, "Examples/MorningSkyBox" );
+                
+        //This is default, though, set it anyway :)
+        ResourceGroupManager::getSingleton().setWorldResourceGroupName("General");
+        mSceneMgr->setWorldGeometry( "MyScene.scene" );
+        //mSceneMgr->SetOctreeVisible( 1 );
+                
+        ParseDotScene( "MyScene.scene", "General" );
+        // CEGUI setup
+        setupGui();
+}
+//-----------------------------------------------------------------------
+void TestCullingDotSceneApplication::setupGui( void )
+{
+         mGUIRenderer = new CEGUI::OgreCEGUIRenderer(mWindow, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, ST_GENERIC);
      mGUISystem = new CEGUI::System(mGUIRenderer);
 
@@ -428 +372 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingApplication::createFrameListener(void)
+void TestCullingDotSceneApplication::createFrameListener(void)
 {
         mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, mGUIRenderer);
@@ -435 +379 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingApplication::chooseSceneManager(void)
-{
-    //mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
-        mSceneMgr = mRoot->getSceneManager(ST_EXTERIOR_CLOSE);
+void TestCullingDotSceneApplication::chooseSceneManager(void)
+{
+        mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
+
+}
+//-----------------------------------------------------------------------
+void TestCullingDotSceneApplication::createViewports(void)
+{
+        // Create one viewport, entire window
+        Viewport* vp = mWindow->addViewport(mCamera);
+        // Look back along -Z
+    mCamera->lookAt(Vector3(0, 0, -300));
+        mCamera->setPosition(0 , 100, 600);
 }
 
@@ -544 +497 @@
 }
 //-----------------------------------------------------------------------
-bool MouseQueryListener::frameStarted(const FrameEvent &evt)
-{
-        // 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)
-        {
-                SceneQuery::WorldFragment* wf = i->worldFragment;
-                mCamera->setPosition(mCamera->getPosition().x, 
-                        i->worldFragment->singleIntersection.y + 10, 
-                        mCamera->getPosition().z);
-        }
-         
-        return ExampleFrameListener::frameStarted(evt);
-}
-//-----------------------------------------------------------------------
 bool MouseQueryListener::frameEnded(const FrameEvent& evt)
 {
@@ -575 +507 @@
     KEY_PRESSED(KC_SPACE, 0.3, changeAlgorithm());
 
-        KEY_PRESSED(KC_SUBTRACT, 0.3, changeThreshold(-10));
+        KEY_PRESSED(KC_SUBTRACT, 0.0, changeThreshold(-10));
         KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
         //KEY_PRESSED(KC_T, 1, change);
@@ -646 +578 @@
 {
     // Create application object
-    TestCullingApplication app;
+    TestCullingDotSceneApplication app;
 
         try 

trunk/VUT/OcclusionCullingSceneManager/TestCullingDotScene/TestCullingDotSceneApplication.h

@@ -5 +5 @@
 #include "CEGUIForwardRefs.h"
 #include "ExampleApplication.h"
-//#include "OgreOcclusionCullingSceneManager.h"
+#include "OgreLight.h"
 #include "OgreOcclusionCullingSceneTraverser.h"
 
@@ -36 +36 @@
     }
 
-        bool frameStarted(const FrameEvent& evt);
+//      bool frameStarted(const FrameEvent& evt);
         bool frameEnded(const FrameEvent& evt);
 
@@ -83 +83 @@
 
 
-class TestCullingApplication : public ExampleApplication
+class TestCullingDotSceneApplication : public ExampleApplication
 {
 public:
-        ~TestCullingApplication();
+        //~TestCullingDotSceneApplication();
 
 protected:
@@ -92 +92 @@
         void createFrameListener(void);
         void setupGui(void);
-        void parseDotScene( const String &SceneName, const String& groupName );
-        void Light* LoadLight( TiXmlElement *XMLLight );
+        void ParseDotScene( const String &SceneName, const String& groupName );
+        Light* LoadLight( TiXmlElement *XMLLight );
 
-        virtual void createCamera(void);
+        virtual void createViewports(void);
 
         CEGUI::OgreCEGUIRenderer *mGUIRenderer;
@@ -103 +103 @@
         void chooseSceneManager(void);
 
+        //SceneManager* mSceneMgr;
         //Entity* mShip;
         //SceneNode* mShipNode;

trunk/VUT/OcclusionCullingSceneManager/scripts/Plugin_OcclusionCullingSceneManager.sln

@@ -10 +10 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCullingDotScene", "..\TestCullingDotScene\TestCullingDotScene.vcproj", "{BE13944C-D05E-467F-B0AC-8A65A3B5FE60}"
         ProjectSection(ProjectDependencies) = postProject
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}
         EndProjectSection
 EndProject

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingDotSceneManager.cpp

@@ -15 +15 @@
         {
                 mOcclusionCullingSceneTraverser = new OcclusionCullingSceneTraverser(this, mDestRenderSystem);
+                //mDisplayNodes = true;
+                mShowBoundingBoxes = true;
+                //mShowBoxes = true;
         }
         //-----------------------------------------------------------------------
@@ -24 +27 @@
         void OcclusionCullingDotSceneManager::_renderVisibleObjects(void)
         {
+                DotSceneManager::_renderVisibleObjects( );
+                getRenderQueue()->clear();
+
                 mOcclusionCullingSceneTraverser->renderScene(mCameraInProgress, mSceneRoot);
         }
@@ -35 +41 @@
         void OcclusionCullingDotSceneManager::_updateSceneGraph(Camera* cam)
         {
+                mOcclusionCullingSceneTraverser->setNumSceneNodes(mSceneNodes.size());
+                mOcclusionCullingSceneTraverser->setRenderSystem(mDestRenderSystem);
+
         mOcclusionCullingSceneTraverser->preprocess();
-
+                
                 DotSceneManager::_updateSceneGraph(cam);
         }

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManager.cpp

@@ -31 +31 @@
         {
                 mOcclusionCullingSceneTraverser->renderScene(mCameraInProgress, mSceneRoot);
+                SceneManager::_renderVisibleObjects( );
         }
         //-----------------------------------------------------------------------
@@ -41 +42 @@
         {
                 mOcclusionCullingSceneTraverser->setNumSceneNodes(mSceneNodes.size());
-                mOcclusionCullingSceneTraverser->preprocess();
+                mOcclusionCullingSceneTraverser->setRenderSystem(mDestRenderSystem);
+
+        mOcclusionCullingSceneTraverser->preprocess();
                 
                 SceneManager::_updateSceneGraph(cam);

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -34 +34 @@
 namespace Ogre {
 
-    OcclusionCullingSceneManager *occlusionPlugin;
+    OcclusionCullingDotSceneManager *occlusionPlugin;
         OcclusionCullingTerrainSceneManager *occlusionTerrainPlugin;
         HeightmapTerrainPageSource* heightmapTerrainPageSource;
@@ -42 +42 @@
     {
                 // Create new scene manager
-                occlusionPlugin = new OcclusionCullingSceneManager();
+                occlusionPlugin = new OcclusionCullingDotSceneManager();
                 occlusionTerrainPlugin = new OcclusionCullingTerrainSceneManager();
                 heightmapTerrainPageSource = new HeightmapTerrainPageSource();

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -42 +42 @@
                 mCurrentTestIdx = 0;
 
-                mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
+                //mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
                 switch(mCurrentAlgorithm)
                 {
@@ -145 +145 @@
                         node->setNodeVisible(false);
                                 
-                        if(!cam->isVisible(node->_getWorldAABB()))
+                        if(cam->isVisible(node->_getWorldAABB()))
                         {
                                 // update node's visited flag 
@@ -152 +152 @@
                                 traverseNode(cam, node);
                         }
-                        //else
-                                if(cam->isVisible(node->_getWorldAABB()))
-                                {
-                                        mNumQueryCulledNodes ++;
-                                }else
+                        else
                         {                       
                                 mNumFrustumCulledNodes ++;
@@ -203 +199 @@
                 // change state so the bounding box gets not actually rendered on the screen
                 setRenderingMode(MODE_QUERY);
+                //setRenderingMode(MODE_RENDER);
 
                 // get next available test id
@@ -257 +254 @@
                 //HACK (too slow)
                 mSceneManager->_renderSceneNode(cam, node);
-                //MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
         }
         //-----------------------------------------------------------------------
@@ -265 +261 @@
                 deleteQueries();
                 
+                //char str[100];sprintf(str, "num nodes: %d", mNumSceneNodes);
+                //MessageBox( NULL, str, "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+
                 for(unsigned int i=0; i < mNumSceneNodes; i++)
                 {
@@ -312 +311 @@
         void OcclusionCullingSceneTraverser::deleteQueries( void )
         {
-                for(unsigned int i=0; i < mNumSceneNodes; i++)
+                for(unsigned int i=0; i < mOcclusionQueries.size(); i++)
                         delete mOcclusionQueries[i];
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneTraverser.cpp

@@ -22 +22 @@
                 }
         }
-        //-----------------------------------------------------------------------
+/*      //-----------------------------------------------------------------------
         void OcclusionCullingTerrainSceneTraverser::renderSceneNode( Camera *cam, SceneNode *node )
         {
@@ -31 +31 @@
                 //MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
         }
-        //-----------------------------------------------------------------------
-        /*unsigned int OcclusionCullingSceneManager::countSceneNodes(SceneNode *node)
-        {
-                unsigned int result = 1;
-                
-                Node::ChildNodeIterator it = node->getChildIterator();
-                
-                while (it.hasMoreElements())
-                { 
-                        SceneNode* sceneChild = static_cast<SceneNode*>(it.getNext());
-                        result += countSceneNodes(sceneChild);
-        }
-
-                return result;
-        }*/
         //-----------------------------------------------------------------------
         bool OcclusionCullingTerrainSceneTraverser::isLeaf( SceneNode *node )
@@ -79 +64 @@
                         //      getSolidHalfBoundingBox(half)->getTechnique()->getPass(0), false);
                 }
-        }
+        }*/
 }