Changeset 999 for GTP/trunk/App


Ignore:
Timestamp:
05/31/06 18:25:39 (18 years ago)
Author:
mattausch
Message:
 
Location:
GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r956 r999  
    7373                        <Tool 
    7474                                Name="VCCLCompilerTool" 
    75                                 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_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include" 
     75                                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_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;&quot;$(LIBXML_HOME)\include&quot;" 
    7676                                PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE" 
    7777                                RuntimeLibrary="2" 

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

    r973 r999  
    1010#include "TerrainFrameListener.h" 
    1111 
     12// #include "OgreColladaPrerequisites.h" 
     13#include "OgreColladaDocument.h" 
     14#include "OgreColladaScene.h" 
     15 
     16 
    1217#include "IVReader.h" 
    1318 
    … …  
    2025 
    2126 
    22 /******************************************************/ 
    23 /*             EntityState implementation             */ 
    24 /******************************************************/ 
     27/*************************************************************/ 
     28/*                EntityState implementation                 */ 
     29/*************************************************************/ 
    2530 
    2631 
    … …  
    328333                                                                                                const int index) 
    329334{ 
     335        // Collada 
     336#if 1 
     337        ColladaDocument *daeDoc = new ColladaDocument(mSceneMgr); 
     338 
     339        String daeName = strCmdLine; 
     340        if (daeName.empty())  
     341                daeName = "cube.dae"; 
     342 
     343        // default directory 
     344        daeName.insert(0, "../../media/models/collada/"); 
     345        LogManager::getSingleton().logMessage("ColladaDocument - import started"); 
     346         
     347        // full import 
     348        if (daeDoc->doImport(daeName)) 
     349        { 
     350                LogManager::getSingleton().logMessage("yuppi"); 
     351                /** 
     352                 * build up scene 
     353                 * if you only want a specific part of the scene graph, you must fetch a scene node 
     354                 * by its unique node name and give it as parameter 
     355                 * e.g. 
     356                 * ColladaSceneNode *box = mScene->getNode("Box2"); 
     357                 * if (box != NULL) box->createOgreInstance(NULL); 
     358                 */ 
     359                daeDoc->getScene()->createOgreInstance(NULL); 
     360        } 
     361 
     362        LogManager::getSingleton().logMessage("ColladaDocument - import finished"); 
     363        // everything is loaded, we do not need the collada document anymore 
     364        delete daeDoc; 
     365#else 
     366 
     367 
    330368        mIVReader = new IVReader(); 
    331369 
    … …  
    366404                return true; 
    367405        } 
    368  
     406#endif 
    369407 
    370408        return false; 
    … …  
    602640                //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager"); 
    603641                mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager"); 
     642                //mSceneMgr = mRoot->createSceneManager("KdTreeSceneManager"); 
     643                //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager"); 
    604644        } 
    605645        else 
    … …  
    607647                //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager"); 
    608648                mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager"); 
     649                //mSceneMgr = mRoot->createSceneManager("KdTreeSceneManager"); 
     650                //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager"); 
    609651        } 
    610652 
Note: See TracChangeset for help on using the changeset viewer.