Changeset 2168 for GTP/trunk/App/Demos/Vis

Timestamp:

02/26/07 18:49:46 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE

Files:

• TerrainFrameListener.cpp (modified) (7 diffs)
• TerrainFrameListener.h (modified) (1 diff)
• TestCullingTerrain.vcproj (modified) (1 diff)
• TestCullingTerrainApplication.cpp (modified) (1 diff)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp

@@ -570 +570 @@
                                                                                                 bool relativeVisibility, 
                                                                                                 bool useItemBuffer)
-{
+{Ogre::LogManager::getSingleton().logMessage("here225");
         int itemBufferMode = useItemBuffer ? mItemBufferMode : 0;
         
@@ -581 +581 @@
         GtpVisibility::VisibilityManager *visManager = NULL;
         
-        if (!mSceneMgr->getOption("VisibilityManager", visManager))
+        if (!mSceneMgr->getOption("VisibilityManager", &visManager))
+        {
+                Ogre::LogManager::getSingleton().logMessage("no vismanager found");
                 return;
-
+        }
         GtpVisibility::HierarchyInterface *hierarchyInterface = NULL;
-        if (!mSceneMgr->getOption("HierarchyInterface", hierarchyInterface))
+        if (!mSceneMgr->getOption("HierarchyInterface", &hierarchyInterface))
+        {
+                Ogre::LogManager::getSingleton().logMessage("no hierarchy interface found");
                 return;
-
+        }
+Ogre::LogManager::getSingleton().logMessage("here663");
         mQueryManager = new OcclusionQueriesQueryManager(hierarchyInterface,
                         mWindow->getViewport(0), queryModes, itemBufferMode);
-
+Ogre::LogManager::getSingleton().logMessage("here6699");
         //mQueryManager = new PlatformQueryManager(sm->GetHierarchyInterface(), mWindow->getViewport(0), false);
 
@@ -599 +604 @@
         GtpVisibility::MeshInfoContainer visibleGeometry;
         GtpVisibility::PatchInfoContainer visiblePatches;
-
+Ogre::LogManager::getSingleton().logMessage("here999");
 
         if (fromPoint)
-        {
+        {Ogre::LogManager::getSingleton().logMessage("her11e5");
                 mQueryManager->
                         ComputeFromPointVisibility(mCamNode->getPosition(), &visibleNodes, 
@@ -609 +614 @@
         else
         {
+                Ogre::LogManager::getSingleton().logMessage("here995");
                 mQueryManager->ComputeCameraVisibility(*mCamera,
                             &visibleNodes, &visibleGeometry, &visiblePatches, relativeVisibility);
@@ -1520 +1526 @@
 
         case KC_F5:
-                applyVisibilityQuery(false, mShiftPressed, mUseItemBuffer);
-                break;
+                {
+                        const bool fromPoint = false;
+                        applyVisibilityQuery(fromPoint, mShiftPressed, mUseItemBuffer);
+                        break;
+                }
 
         case KC_F6:
-                applyVisibilityQuery(true, mShiftPressed, mUseItemBuffer);
-                break;
-        
+                {
+                        const bool fromPoint = true;
+                        applyVisibilityQuery(fromPoint, mShiftPressed, mUseItemBuffer);
+                        break;
+                }       
         case KC_F7:
                 ++ mCurrentObjectType;
@@ -1534 +1545 @@
 
         case KC_F8:
-                {       // generate new objects
+                {       
+                        // generate new objects
                         const int objNum = 500;
                         mApplication->generateScene(objNum, mCurrentObjectType);
@@ -1550 +1562 @@
                 break;
         
-        
+        case KC_F12:
+                break;
         //KEY_PRESSED(KC_F3, 0.3, writeFrames());
         //KEY_PRESSED(KC_F4, 0.3, loadFrames());

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.h

@@ -373 +373 @@
         bool mStatsOn;
         bool mLMouseDown;
-        bool mRMouseDown;     // True if the mouse buttons are down
+        // True if the mouse buttons are down
+        bool mRMouseDown;    
         bool mShutdownRequested;
         bool mDisplayCameraDetails;

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj

@@ -98 +98 @@
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"..\..\..\..\..\Lib\Vis\Preprocessing\lib\$(ConfigurationName)""
-                                GenerateDebugInformation="FALSE"
+                                GenerateDebugInformation="TRUE"
                                 SubSystem="2"
                                 OptimizeReferences="2"

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp

@@ -530 +530 @@
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
                 
-        if (!msShowHillyTerrain)
-                return;
-
         // if no objects in file, we generate new objects
-        if (!mTerrainContentGenerator->LoadObjects("objects.out"))
+        if (msShowHillyTerrain && !mTerrainContentGenerator->LoadObjects("objects.out"))
         {
                 // the objects are generated randomly distributed over the terrain