Changeset 183 for trunk/VUT


Ignore:
Timestamp:
07/19/05 17:39:30 (19 years ago)
Author:
mattausch
Message:

added iv-reader library, testing code, and resources

Location:
trunk/VUT
Files:
194 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/VUT/Ogre/include/OgreTerrainContentGenerator.h

    r161 r183  
    33 
    44#include "OgreSceneContentGenerator.h" 
    5 //#include <Ogre.h> 
    65 
    76#define MAX_HEIGHT 5000 // maximal possible height for object position 
    … …  
    2120 
    2221protected: 
     22         
    2323        RaySceneQuery *mRaySceneQuery; 
    2424}; 
    2525 
    2626/**  
    27         Thsi class used to fill a terrain with content, 
    28         e.g., it randomly fills a terrain with objects of a specific type. 
     27        This class used to fill a terrain with content, e.g.,  
     28        it randomly fills a terrain with objects of a specific type. 
    2929*/ 
    3030class __declspec(dllexport) TerrainContentGenerator: public SceneContentGenerator 

  • trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

    r175 r183  
    9898        ro.srcRenderable = solidBox; 
    9999        mRenderSystem->_render(ro); 
    100  
    101         // Render two halfes of the bounding box (using triangle fans) 
    102         /*for(int halfIdx = 0; halfIdx < 2; ++halfIdx) 
    103         { 
    104                 solidBox->SetupBoundingBoxVertices(*box, halfIdx == 1); 
    105                                  
    106                 solidBox->getRenderOperation(ro); 
    107                 ro.srcRenderable = solidBox; 
    108                 mRenderSystem->_render(ro); 
    109         }*/ 
    110100} 
    111101//----------------------------------------------------------------------- 

  • trunk/VUT/scripts/GtpVisibility.sln

    r85 r183  
    11Microsoft Visual Studio Solution File, Format Version 8.00 
    2 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "..\GtpVisibilityPreprocessor\scripts\Preprocessor.vcproj", "{EABCE292-D598-4600-A1C9-2591E7D62FDA}" 
    3         ProjectSection(ProjectDependencies) = postProject 
    4         EndProjectSection 
    5 EndProject 
    62Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GtpVisibility", "..\GtpVisibility\scripts\GtpVisibility.vcproj", "{101A7691-74F3-48B4-96A3-CF35578F5900}" 
    73        ProjectSection(ProjectDependencies) = postProject 
    8                 {EABCE292-D598-4600-A1C9-2591E7D62FDA} = {EABCE292-D598-4600-A1C9-2591E7D62FDA} 
    94        EndProjectSection 
    105EndProject 
    … …  
    2621        EndProjectSection 
    2722EndProject 
     23Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_IV", "..\work\iv\scripts\Demo_IV.vcproj", "{640481BA-D8FE-41ED-B2F2-9844A8CA1E40}" 
     24        ProjectSection(ProjectDependencies) = postProject 
     25                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} 
     26                {101A7691-74F3-48B4-96A3-CF35578F5900} = {101A7691-74F3-48B4-96A3-CF35578F5900} 
     27                {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D} 
     28        EndProjectSection 
     29EndProject 
     30Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "..\GtpVisibilityPreprocessor\scripts\Preprocessor.vcproj", "{EABCE292-D598-4600-A1C9-2591E7D62FDA}" 
     31        ProjectSection(ProjectDependencies) = postProject 
     32        EndProjectSection 
     33EndProject 
     34Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IVReader", "..\work\IVReader\scripts\IVReader.vcproj", "{7319E499-473D-4CE5-9983-725D6E68A55D}" 
     35        ProjectSection(ProjectDependencies) = postProject 
     36        EndProjectSection 
     37EndProject 
    2838Global 
    2939        GlobalSection(SolutionConfiguration) = preSolution 
    … …  
    3242        EndGlobalSection 
    3343        GlobalSection(ProjectConfiguration) = postSolution 
    34                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Debug.ActiveCfg = Debug|Win32 
    35                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Debug.Build.0 = Debug|Win32 
    36                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release.ActiveCfg = Release|Win32 
    37                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release.Build.0 = Release|Win32 
    3844                {101A7691-74F3-48B4-96A3-CF35578F5900}.Debug.ActiveCfg = Debug|Win32 
    3945                {101A7691-74F3-48B4-96A3-CF35578F5900}.Debug.Build.0 = Debug|Win32 
    … …  
    5258                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release.ActiveCfg = Release|Win32 
    5359                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release.Build.0 = Release|Win32 
     60                {640481BA-D8FE-41ED-B2F2-9844A8CA1E40}.Debug.ActiveCfg = Debug|Win32 
     61                {640481BA-D8FE-41ED-B2F2-9844A8CA1E40}.Debug.Build.0 = Debug|Win32 
     62                {640481BA-D8FE-41ED-B2F2-9844A8CA1E40}.Release.ActiveCfg = Release|Win32 
     63                {640481BA-D8FE-41ED-B2F2-9844A8CA1E40}.Release.Build.0 = Release|Win32 
     64                {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Debug.ActiveCfg = Debug|Win32 
     65                {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Debug.Build.0 = Debug|Win32 
     66                {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release.ActiveCfg = Release|Win32 
     67                {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release.Build.0 = Release|Win32 
     68                {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.ActiveCfg = Debug|Win32 
     69                {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug.Build.0 = Debug|Win32 
     70                {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.ActiveCfg = Release|Win32 
     71                {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.Build.0 = Release|Win32 
    5472        EndGlobalSection 
    5573        GlobalSection(ExtensibilityGlobals) = postSolution 

  • trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

    r175 r183  
    4242{ 
    4343        0, 
    44         0, 
     44        -0.1, 
    4545        //7, 
    4646        0 

  • trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

    r173 r183  
    156156        Vector3 mTerrainMinPos; 
    157157        Vector3 mTerrainMaxPos; 
     158 
     159 
    158160private: 
    159161        void chooseSceneManager(void); 

  • trunk/VUT/work/ogre_changes/OgreMain/include/OgreSceneManager.h

    r159 r183  
    161161                */ 
    162162                void _renderMovableObject(MovableObject *mov, const int leavePassesInQueue); 
     163 
     164                /** Renders a single renderable using pass 0 of the renderable. 
     165                */ 
     166                void _renderSingleRenderable(Renderable *rend); 
    163167 
    164168                /** Tells the scene manager that the frame ends (i.e., 

  • trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneManager.cpp

    r139 r183  
    42484248        SceneManager::_renderVisibleObjects(); 
    42494249} 
     4250//----------------------------------------------------------------------- 
     4251void SceneManager::_renderSingleRenderable(Renderable *rend) 
     4252{ 
     4253        Pass *pass = rend->getTechnique()->getPass(0); 
     4254        setPass(pass); 
     4255        renderSingleObject(rend, pass, false); 
     4256} 
    42504257#endif //GTP_VISIBILITY_MODIFIED_OGRE 
    42514258} 

  • trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeNode.cpp

    r166 r183  
    189189        AxisAlignedBox box = mLocalAABB; 
    190190        // HACK: scale should not be done here 
    191         box.scale(Vector3(10,10,10)); 
     191        box.scale(Vector3(3, 3, 3)); 
    192192        mWireBoundingBox->setupBoundingBox(box); 
    193193        mWireBoundingBox->getRenderOperation(rend); 

  • trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp

    r171 r183  
    366366                md3dpp.BackBufferHeight                 = mHeight; 
    367367#ifdef GTP_VISIBILITY_MODIFIED_OGRE 
    368         md3dpp.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; 
     368        //md3dpp.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; 
    369369#endif 
    370370                if (mVSync) 
    … …  
    938938                // this will be the dimensions of the front buffer 
    939939                if (FAILED(hr = mpD3DDevice->GetDisplayMode(0, &dm))) 
    940                         OGRE_EXCEPT(hr, "Can't get display mode!", "D3D9RenderWindow::writeContentsToFile"); 
     940                        OGRE_EXCEPT(hr, "Can't get display mode!", "D3D9RenderWindow::getBufferContents"); 
    941941 
    942942                desc.Width = dm.Width; 
    … …  
    951951                                                NULL))) 
    952952                { 
    953                         OGRE_EXCEPT(hr, "Cannot create offscreen buffer 1!", "D3D9RenderWindow::writeContentsToFile"); 
     953                        OGRE_EXCEPT(hr, "Cannot create offscreen buffer 1!", "D3D9RenderWindow::getBufferContents"); 
    954954                } 
    955955 
    … …  
    971971                        desc.Format = D3DFMT_A8R8G8B8;         // this is what we get from the screen, so stick with it 
    972972 
    973                         // NB we can't lock the back buffer direct because it's no created that way 
     973                        // NB we can't lock the back buffer direct because it's not created that way 
    974974                        // and to do so hits performance, so copy to another surface 
    975975                        // Must be the same format as the source surface 
    … …  
    983983                        { 
    984984                                SAFE_RELEASE(pSurf); 
    985                                 OGRE_EXCEPT(hr, "Cannot create offscreen buffer 2!", "D3D9RenderWindow::writeContentsToFile"); 
     985                                OGRE_EXCEPT(hr, "Cannot create offscreen buffer 2!", "D3D9RenderWindow::getBufferContents"); 
    986986                        } 
    987987 
    … …  
    991991                                SAFE_RELEASE(pTempSurf); 
    992992                                SAFE_RELEASE(pSurf); 
    993                                 OGRE_EXCEPT(hr, "Cannot update surface!", "D3D9RenderWindow::writeContentsToFile"); 
     993                                OGRE_EXCEPT(hr, "Cannot update surface!", "D3D9RenderWindow::getBufferContents"); 
    994994                        } 
    995995 
    … …  
    10031003                        D3DLOCK_READONLY | D3DLOCK_NOSYSLOCK))) 
    10041004                { 
    1005                         OGRE_EXCEPT(hr, "can't lock rect!", "D3D9RenderWindow::writeContentsToFile"); 
     1005                        OGRE_EXCEPT(hr, "can't lock rect!", "D3D9RenderWindow::getBufferContents"); 
    10061006                }  
    10071007 
Note: See TracChangeset for help on using the changeset viewer.