Changeset 2168
- Timestamp:
- 02/26/07 18:49:46 (17 years ago)
- Location:
- GTP/trunk
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp
r2145 r2168 570 570 bool relativeVisibility, 571 571 bool useItemBuffer) 572 { 572 {Ogre::LogManager::getSingleton().logMessage("here225"); 573 573 int itemBufferMode = useItemBuffer ? mItemBufferMode : 0; 574 574 … … 581 581 GtpVisibility::VisibilityManager *visManager = NULL; 582 582 583 if (!mSceneMgr->getOption("VisibilityManager", visManager)) 583 if (!mSceneMgr->getOption("VisibilityManager", &visManager)) 584 { 585 Ogre::LogManager::getSingleton().logMessage("no vismanager found"); 584 586 return; 585 587 } 586 588 GtpVisibility::HierarchyInterface *hierarchyInterface = NULL; 587 if (!mSceneMgr->getOption("HierarchyInterface", hierarchyInterface)) 589 if (!mSceneMgr->getOption("HierarchyInterface", &hierarchyInterface)) 590 { 591 Ogre::LogManager::getSingleton().logMessage("no hierarchy interface found"); 588 592 return; 589 593 } 594 Ogre::LogManager::getSingleton().logMessage("here663"); 590 595 mQueryManager = new OcclusionQueriesQueryManager(hierarchyInterface, 591 596 mWindow->getViewport(0), queryModes, itemBufferMode); 592 597 Ogre::LogManager::getSingleton().logMessage("here6699"); 593 598 //mQueryManager = new PlatformQueryManager(sm->GetHierarchyInterface(), mWindow->getViewport(0), false); 594 599 … … 599 604 GtpVisibility::MeshInfoContainer visibleGeometry; 600 605 GtpVisibility::PatchInfoContainer visiblePatches; 601 606 Ogre::LogManager::getSingleton().logMessage("here999"); 602 607 603 608 if (fromPoint) 604 { 609 {Ogre::LogManager::getSingleton().logMessage("her11e5"); 605 610 mQueryManager-> 606 611 ComputeFromPointVisibility(mCamNode->getPosition(), &visibleNodes, … … 609 614 else 610 615 { 616 Ogre::LogManager::getSingleton().logMessage("here995"); 611 617 mQueryManager->ComputeCameraVisibility(*mCamera, 612 618 &visibleNodes, &visibleGeometry, &visiblePatches, relativeVisibility); … … 1520 1526 1521 1527 case KC_F5: 1522 applyVisibilityQuery(false, mShiftPressed, mUseItemBuffer); 1523 break; 1528 { 1529 const bool fromPoint = false; 1530 applyVisibilityQuery(fromPoint, mShiftPressed, mUseItemBuffer); 1531 break; 1532 } 1524 1533 1525 1534 case KC_F6: 1526 applyVisibilityQuery(true, mShiftPressed, mUseItemBuffer); 1527 break; 1528 1535 { 1536 const bool fromPoint = true; 1537 applyVisibilityQuery(fromPoint, mShiftPressed, mUseItemBuffer); 1538 break; 1539 } 1529 1540 case KC_F7: 1530 1541 ++ mCurrentObjectType; … … 1534 1545 1535 1546 case KC_F8: 1536 { // generate new objects 1547 { 1548 // generate new objects 1537 1549 const int objNum = 500; 1538 1550 mApplication->generateScene(objNum, mCurrentObjectType); … … 1550 1562 break; 1551 1563 1552 1564 case KC_F12: 1565 break; 1553 1566 //KEY_PRESSED(KC_F3, 0.3, writeFrames()); 1554 1567 //KEY_PRESSED(KC_F4, 0.3, loadFrames()); -
GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.h
r2145 r2168 373 373 bool mStatsOn; 374 374 bool mLMouseDown; 375 bool mRMouseDown; // True if the mouse buttons are down 375 // True if the mouse buttons are down 376 bool mRMouseDown; 376 377 bool mShutdownRequested; 377 378 bool mDisplayCameraDetails; -
GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj
r2130 r2168 98 98 LinkIncremental="1" 99 99 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)"" 100 GenerateDebugInformation=" FALSE"100 GenerateDebugInformation="TRUE" 101 101 SubSystem="2" 102 102 OptimizeReferences="2" -
GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp
r2130 r2168 530 530 mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr); 531 531 532 if (!msShowHillyTerrain)533 return;534 535 532 // if no objects in file, we generate new objects 536 if ( !mTerrainContentGenerator->LoadObjects("objects.out"))533 if (msShowHillyTerrain && !mTerrainContentGenerator->LoadObjects("objects.out")) 537 534 { 538 535 // the objects are generated randomly distributed over the terrain -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp
r2164 r2168 1040 1040 if (key == "VisibilityManager") 1041 1041 { 1042 * static_cast<GtpVisibility::VisibilityManager **>(val) = 1043 (GtpVisibility::VisibilityManager *)mVisibilityManager; 1044 return true; 1045 } 1046 if (key == "HierarchInterface") 1047 { 1048 * static_cast<GtpVisibility::HierarchyInterface **>(val) = 1049 (GtpVisibility::HierarchyInterface *)mHierarchyInterface; 1042 //Ogre::LogManager::getSingleton().logMessage("here77"); 1043 * static_cast<GtpVisibility::VisibilityManager **>(val) = mVisibilityManager; 1044 return true; 1045 } 1046 if (key == "HierarchyInterface") 1047 { 1048 * static_cast<GtpVisibility::HierarchyInterface **>(val) = mHierarchyInterface; 1050 1049 return true; 1051 1050 } 1052 1051 if (key == "ShowTerrain") 1053 1052 { 1054 * static_cast<bool *>(val) = (bool *)mShowTerrain;1053 * static_cast<bool *>(val) = mShowTerrain; 1055 1054 return true; 1056 1055 } 1057 1056 if (key == "UseDepthPass") 1058 1057 { 1059 * static_cast<bool *>(val) = (bool *)mUseDepthPass;1058 * static_cast<bool *>(val) = mUseDepthPass; 1060 1059 return true; 1061 1060 } 1062 1061 if (key == "FlushQueue") 1063 1062 { 1064 * static_cast<bool *>(val) = (bool *)mDeleteQueueAfterRendering;1063 * static_cast<bool *>(val) = mDeleteQueueAfterRendering; 1065 1064 return true; 1066 1065 } 1067 1066 if (key == "NormalExecution") 1068 1067 { 1069 * static_cast<bool *>(val) = (bool *)mNormalExecution;1068 * static_cast<bool *>(val) = mNormalExecution; 1070 1069 return true; 1071 1070 } -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionQueriesQueryManager.cpp
r2066 r2168 32 32 // disable overlays, reset them later 33 33 bool overlayEnabled = mViewport->getOverlaysEnabled(); 34 34 Ogre::LogManager::getSingleton().logMessage("here020202"); 35 35 /////////// 36 36 //-- render scene with item buffer (i.e., objects with their id as color codes) … … 209 209 GtpVisibility::PatchInfoContainer *visiblePatches, 210 210 bool relativeVisibility) 211 { 211 {Ogre::LogManager::getSingleton().logMessage("here5"); 212 212 PlatformQueryManager::ComputeFromPointVisibility(point, visibleNodes, 213 213 visibleGeometry, visiblePatches, relativeVisibility); … … 216 216 // (duplicates occur if an object is on the edge of the viewport) 217 217 RemoveDuplicateNodes(visibleNodes); 218 218 Ogre::LogManager::getSingleton().logMessage("here6"); 219 219 if (mItemBufferMode != GEOMETRY_VISIBILITY) 220 220 { 221 221 RemoveDuplicateGeometry(visibleGeometry); 222 222 } 223 223 Ogre::LogManager::getSingleton().logMessage("here7"); 224 224 if (mItemBufferMode != PATCH_VISIBILITY) 225 225 { -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj
r2130 r2168 112 112 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\$(ConfigurationName)"" 113 113 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 114 GenerateDebugInformation=" FALSE"114 GenerateDebugInformation="TRUE" 115 115 SubSystem="2" 116 116 OptimizeReferences="2" -
GTP/trunk/Lib/Vis/Preprocessing/include/Containers.h
r863 r2168 3 3 4 4 #include <vector> 5 using namespace std;5 //using namespace std; 6 6 7 7 namespace GtpVisibilityPreprocessor { -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj
r2164 r2168 221 221 OptimizeForProcessor="3" 222 222 OptimizeForWindowsApplication="TRUE" 223 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)";Timer;..\src\ootl\src\;..\src\ootl\src\cpp;..\src\ootl\src\include\ootl\sandbox;..\src\ootl\src;..\src\ootl\src\include\ootl;..\src\sparsehash\src\google\sparsehash;..\src\sparsehash\src\windows;..\src\sparsehash\src\google;..\src\sparsehash\src;..\src\ootl\ "223 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)";Timer;..\src\ootl\src\;..\src\ootl\src\cpp;..\src\ootl\src\include\ootl\sandbox;..\src\ootl\src;..\src\ootl\src\include\ootl;..\src\sparsehash\src\google\sparsehash;..\src\sparsehash\src\windows;..\src\sparsehash\src\google;..\src\sparsehash\src;..\src\ootl\;..\src\ootl\src\cpp\include\;..\src\ootl\src\cpp\include\ootl\mswin" 224 224 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_HASH_PVS" 225 225 ExceptionHandling="TRUE" -
GTP/trunk/Lib/Vis/Preprocessing/src/PvsBase.h
r2117 r2168 5 5 #include "Containers.h" 6 6 7 using namespace std;7 //using namespace std; 8 8 9 9 namespace GtpVisibilityPreprocessor { -
GTP/trunk/Lib/Vis/Preprocessing/src/SamplingPreprocessor.h
r1966 r2168 3 3 4 4 #include <fstream> 5 using namespace std;5 //using namespace std; 6 6 7 7 #include "Preprocessor.h" -
GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.h
r2076 r2168 3 3 4 4 #include <vector> 5 using namespace std;5 //using namespace std; 6 6 7 7 #include "common.h" -
GTP/trunk/Lib/Vis/Preprocessing/src/SceneGraph.h
r1958 r2168 3 3 4 4 #include <string> 5 using namespace std;5 //using namespace std; 6 6 7 7 #include "Containers.h" -
GTP/trunk/Lib/Vis/Preprocessing/src/SubdivisionCandidate.h
r1895 r2168 5 5 #include "FlexibleHeap.h" 6 6 7 using namespace std;7 //using namespace std; 8 8 9 9 namespace GtpVisibilityPreprocessor { -
GTP/trunk/Lib/Vis/Preprocessing/src/TraversalTree.h
r2149 r2168 3 3 4 4 #include <functional> 5 using namespace std;5 //using namespace std; 6 6 7 7 #include "Containers.h" -
GTP/trunk/Lib/Vis/Preprocessing/src/Vector3.h
r1958 r2168 3 3 4 4 #include <iostream> 5 using namespace std;5 //using namespace std; 6 6 #include <math.h> 7 7 #include "common.h" -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp
r2164 r2168 2205 2205 // one mesh per view cell 2206 2206 Mesh *mesh = MeshManager::GetSingleton()->CreateResource(); 2207 2207 //ootl::hash_map<int, Intersectable *> hmap(-2, NULL); 2208 2208 //////////// 2209 2209 //-- construct prism -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h
r2124 r2168 7 7 #include "Containers.h" 8 8 #include "ViewCell.h" 9 9 //#include "ootl_map.hpp" 10 10 11 11 namespace GtpVisibilityPreprocessor { -
GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.h
r2063 r2168 3 3 4 4 #include <fstream> 5 using namespace std;5 //using namespace std; 6 6 7 7 #include "Preprocessor.h" -
GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.h
r2116 r2168 7 7 #include "Containers.h" 8 8 9 using namespace std;9 //using namespace std; 10 10 11 11
Note: See TracChangeset
for help on using the changeset viewer.