Changeset 2168 for GTP/trunk/Lib


Ignore:
Timestamp:
02/26/07 18:49:46 (18 years ago)
Author:
mattausch
Message:
 
Location:
GTP/trunk/Lib/Vis
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

    r2164 r2168  
    10401040        if (key == "VisibilityManager") 
    10411041        { 
    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; 
    10501049                return true; 
    10511050        } 
    10521051        if (key == "ShowTerrain") 
    10531052        { 
    1054                 * static_cast<bool *>(val) = (bool *)mShowTerrain; 
     1053                * static_cast<bool *>(val) = mShowTerrain; 
    10551054                return true; 
    10561055        } 
    10571056        if (key == "UseDepthPass") 
    10581057        { 
    1059                 * static_cast<bool *>(val) = (bool *)mUseDepthPass; 
     1058                * static_cast<bool *>(val) = mUseDepthPass; 
    10601059                return true; 
    10611060        } 
    10621061        if (key == "FlushQueue") 
    10631062        { 
    1064                 * static_cast<bool *>(val) = (bool *)mDeleteQueueAfterRendering; 
     1063                * static_cast<bool *>(val) = mDeleteQueueAfterRendering; 
    10651064                return true; 
    10661065        } 
    10671066        if (key == "NormalExecution") 
    10681067        { 
    1069                 * static_cast<bool *>(val) = (bool *)mNormalExecution; 
     1068                * static_cast<bool *>(val) = mNormalExecution; 
    10701069                return true; 
    10711070        } 

  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionQueriesQueryManager.cpp

    r2066 r2168  
    3232        // disable overlays, reset them later 
    3333        bool overlayEnabled = mViewport->getOverlaysEnabled(); 
    34  
     34Ogre::LogManager::getSingleton().logMessage("here020202"); 
    3535        /////////// 
    3636        //-- render scene with item buffer (i.e., objects with their id as color codes) 
    … …  
    209209                                   GtpVisibility::PatchInfoContainer *visiblePatches, 
    210210                               bool relativeVisibility) 
    211 { 
     211{Ogre::LogManager::getSingleton().logMessage("here5"); 
    212212        PlatformQueryManager::ComputeFromPointVisibility(point, visibleNodes,  
    213213                visibleGeometry, visiblePatches, relativeVisibility); 
    … …  
    216216        // (duplicates occur if an object is on the edge of the viewport) 
    217217        RemoveDuplicateNodes(visibleNodes); 
    218          
     218        Ogre::LogManager::getSingleton().logMessage("here6"); 
    219219        if (mItemBufferMode != GEOMETRY_VISIBILITY) 
    220220        { 
    221221                RemoveDuplicateGeometry(visibleGeometry); 
    222222        } 
    223          
     223        Ogre::LogManager::getSingleton().logMessage("here7"); 
    224224        if (mItemBufferMode != PATCH_VISIBILITY) 
    225225        { 

  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj

    r2130 r2168  
    112112                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)&quot;;&quot;..\..\..\Preprocessing\lib\$(ConfigurationName)&quot;;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;&quot;..\..\lib\$(ConfigurationName)&quot;;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)&quot;;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\$(ConfigurationName)&quot;" 
    113113                                ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 
    114                                 GenerateDebugInformation="FALSE" 
     114                                GenerateDebugInformation="TRUE" 
    115115                                SubSystem="2" 
    116116                                OptimizeReferences="2" 

  • GTP/trunk/Lib/Vis/Preprocessing/include/Containers.h

    r863 r2168  
    33 
    44#include <vector> 
    5 using namespace std; 
     5//using namespace std; 
    66 
    77namespace GtpVisibilityPreprocessor { 

  • GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj

    r2164 r2168  
    221221                                OptimizeForProcessor="3" 
    222222                                OptimizeForWindowsApplication="TRUE" 
    223                                 AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;&quot;$(CG_INC_PATH)&quot;;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;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;&quot;$(CG_INC_PATH)&quot;;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" 
    224224                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_HASH_PVS" 
    225225                                ExceptionHandling="TRUE" 

  • GTP/trunk/Lib/Vis/Preprocessing/src/PvsBase.h

    r2117 r2168  
    55#include "Containers.h" 
    66 
    7 using namespace std; 
     7//using namespace std; 
    88 
    99namespace GtpVisibilityPreprocessor { 

  • GTP/trunk/Lib/Vis/Preprocessing/src/SamplingPreprocessor.h

    r1966 r2168  
    33 
    44#include <fstream> 
    5 using namespace std; 
     5//using namespace std; 
    66 
    77#include "Preprocessor.h" 

  • GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.h

    r2076 r2168  
    33 
    44#include <vector> 
    5 using namespace std; 
     5//using namespace std; 
    66 
    77#include "common.h" 

  • GTP/trunk/Lib/Vis/Preprocessing/src/SceneGraph.h

    r1958 r2168  
    33 
    44#include <string> 
    5 using namespace std; 
     5//using namespace std; 
    66 
    77#include "Containers.h" 

  • GTP/trunk/Lib/Vis/Preprocessing/src/SubdivisionCandidate.h

    r1895 r2168  
    55#include "FlexibleHeap.h" 
    66 
    7 using namespace std; 
     7//using namespace std; 
    88 
    99namespace GtpVisibilityPreprocessor { 

  • GTP/trunk/Lib/Vis/Preprocessing/src/TraversalTree.h

    r2149 r2168  
    33 
    44#include <functional> 
    5 using namespace std; 
     5//using namespace std; 
    66 
    77#include "Containers.h" 

  • GTP/trunk/Lib/Vis/Preprocessing/src/Vector3.h

    r1958 r2168  
    33 
    44#include <iostream> 
    5 using namespace std; 
     5//using namespace std; 
    66#include <math.h> 
    77#include "common.h" 

  • GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

    r2164 r2168  
    22052205        // one mesh per view cell 
    22062206        Mesh *mesh = MeshManager::GetSingleton()->CreateResource(); 
    2207  
     2207//ootl::hash_map<int, Intersectable *> hmap(-2, NULL); 
    22082208        //////////// 
    22092209        //-- construct prism 

  • GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

    r2124 r2168  
    77#include "Containers.h" 
    88#include "ViewCell.h" 
    9  
     9//#include "ootl_map.hpp" 
    1010 
    1111namespace GtpVisibilityPreprocessor { 

  • GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.h

    r2063 r2168  
    33 
    44#include <fstream> 
    5 using namespace std; 
     5//using namespace std; 
    66 
    77#include "Preprocessor.h" 

  • GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.h

    r2116 r2168  
    77#include "Containers.h" 
    88 
    9 using namespace std; 
     9//using namespace std; 
    1010 
    1111 
Note: See TracChangeset for help on using the changeset viewer.