Changeset 33 for trunk/VUT/OcclusionCullingSceneManager/TestCulling

Timestamp:

03/30/05 11:36:07 (20 years ago)

Author:

Mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/TestCulling

Files:

• TestCulling.vcproj (modified) (2 diffs)
• TestCullingApplication.cpp (modified) (4 diffs)
• TestCullingApplication.h (modified) (1 diff)

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCulling.vcproj

@@ -21 +21 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include""
-                                PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_DEBUG;WIN32;_STLP_DEBUG"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";../include"
+                                PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_DEBUG;WIN32;_STLP_DEBUG;PLUGIN_TERRAIN_IMPORTS"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -34 +34 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OGREMain_d.LIB CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_OctreeSceneManager.lib"
+                                AdditionalDependencies="Plugin_OctreeSceneManager.lib OGREMain_d.LIB CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_DotSceneManager.lib"
                                 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Debug/TestCulling.exe"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\Debug&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\Debug&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;"
+                                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;"
                                 GenerateDebugInformation="TRUE"
                                 ProgramDatabaseFile="$(OutDir)/TestCulling.pdb"

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.cpp

@@ -6 +6 @@
 */
 
-//#pragma warning (push)
-//#pragma warning( disable : 4267 )
-
 #include <OgreNoMemoryMacros.h>
 #include <CEGUI/CEGUI.h>
@@ -15 +12 @@
 #include <../CEGUIRenderer/include/OgreCEGUITexture.h>
 #include <OgreMemoryMacros.h>
-//#pragma warning (pop)
-/*
-#include <CEGUI/CEGUIImageset.h>
-#include <CEGUI/CEGUISystem.h>
-#include <CEGUI/CEGUISchemeManager.h>
-#include <CEGUI/CEGUIWindowManager.h>
-#include <CEGUI/CEGUIWindow.h>
-#include <CEGUI/CEGUILogger.h>
-#include <CEGUI/elements/CEGUICombobox.h>
-#include <CEGUI/elements/CEGUIListbox.h>
-#include <CEGUI/elements/CEGUIListboxTextItem.h>
-#include <CEGUI/elements/CEGUIPushButton.h>
-#include <CEGUI/elements/CEGUIScrollbar.h>
-#include <CEGUI/elements/CEGUIStaticImage.h>
-
-#include "OgreCEGUIRenderer.h"
-#include "OgreCEGUIResourceProvider.h"
-*/
+
 #include "Ogre.h"
 #include "TestCullingApplication.h"
+#include "OgreOcclusionCullingSceneTraverser.h"
 
 #define WIN32_LEAN_AND_MEAN
@@ -83 +64 @@
 void TestCullingApplication::chooseSceneManager(void)
 {
-    mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
+    //mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
+        mSceneMgr = mRoot->getSceneManager(ST_EXTERIOR_CLOSE);
 }
 
@@ -96 +78 @@
 {
 
-                // Setup default variables
-        mCurrentObject = NULL;
-        mLMouseDown = false;
-        mRMouseDown = false;
-        mSceneMgr = sceneManager;
-
-        // Reduce move speed
-        mMoveSpeed = 50;
-        mRotateSpeed *= 2;
-        
-                mCurrentAlgorithm = OcclusionCullingSceneTraverser::RENDER_COHERENT;
-                mThreshold = 0;
-
-                // 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/AlgorithmInfo");
-                mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/ThresholdInfo");
-                mFrustumCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/FrustumCulledNodesInfo");
-                mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/QueryCulledNodesInfo");
-        mTraversedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/TraversedNodesInfo");
-        
-                mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
-                mThresholdInfo->setCaption(": 0");
-                mFrustumCulledNodesInfo->setCaption(": 0");
-                mQueryCulledNodesInfo->setCaption(": 0");
-                mTraversedNodesInfo->setCaption(": 0");
-
-        pOver->show();
+        // Setup default variables
+        mCurrentObject = NULL;
+        mLMouseDown = false;
+        mRMouseDown = false;
+        mSceneMgr = sceneManager;
+
+    // Reduce move speed
+        mMoveSpeed = 50;
+        mRotateSpeed *= 2;
+
+        mCurrentAlgorithm = OcclusionCullingSceneTraverser::RENDER_COHERENT;
+        mThreshold = 0;
+    
+        // 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/AlgorithmInfo");
+        mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/ThresholdInfo");
+        mFrustumCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/FrustumCulledNodesInfo");
+        mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/QueryCulledNodesInfo");
+    mTraversedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/TraversedNodesInfo");
+
+        mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
+        mThresholdInfo->setCaption(": 0");
+        mFrustumCulledNodesInfo->setCaption(": 0");
+        mQueryCulledNodesInfo->setCaption(": 0");
+        mTraversedNodesInfo->setCaption(": 0");
+
+    pOver->show();
 } // MouseQueryListener
 //-----------------------------------------------------------------------

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.h

@@ -5 +5 @@
 #include "CEGUIForwardRefs.h"
 #include "ExampleApplication.h"
-#include "OgreOcclusionCullingSceneManager.h"
+//#include "OgreOcclusionCullingSceneManager.h"
 #include "OgreOcclusionCullingSceneTraverser.h"