diff --git a/Make/makedirdefs b/Make/makedirdefs index b01e7c952..06a096d05 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -94,7 +94,6 @@ DEMOS_DIRS = \ osgparticle\ osgprerender\ osgshadowtexture\ - osgtxp\ osgreflect\ osgscribe\ osgsequence\ diff --git a/VisualStudio/Demos/osgtxp/osgtxp.dsp b/VisualStudio/Demos/osgtxp/osgtxp.dsp deleted file mode 100644 index 0df8681a5..000000000 --- a/VisualStudio/Demos/osgtxp/osgtxp.dsp +++ /dev/null @@ -1,107 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Demo osgtxp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Demo osgtxp - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "osgtxp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "osgtxp.mak" CFG="Demo osgtxp - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Demo osgtxp - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Demo osgtxp - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Demo osgtxp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osgtxp.exe" /libpath:"../../../lib" - -!ELSEIF "$(CFG)" == "Demo osgtxp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /vd0 /GR /GX /Zi /Od /I "../../../include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /FR /YX /FD /c -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 glut32.lib glu32.lib opengl32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osgtxpd.exe" /pdbtype:sept /libpath:"../../../lib" -# SUBTRACT LINK32 /incremental:no - -!ENDIF - -# Begin Target - -# Name "Demo osgtxp - Win32 Release" -# Name "Demo osgtxp - Win32 Debug" -# Begin Source File - -SOURCE=..\..\..\src\Demos\osgtxp\osgtxp.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\Demos\osgtxp\TrPageViewer.cpp -# End Source File -# Begin Group "Header Files" - -# PROP Default_Filter ";h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\Demos\osgtxp\TrPageViewer.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index 835e9e4b2..91a00732b 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -481,36 +481,6 @@ Package=<4> End Project Dependency }}} -############################################################################### - -Project: "Demo osgtxp"=.\Demos\osgtxp\osgtxp.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core osg - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgDB - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGA - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgGLUT - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core osgUtil - End Project Dependency - Begin Project Dependency - Project_Dep_Name osgPlugin txp - End Project Dependency -}}} - ############################################################################################################################################################## Project: "Demo osggeometry"=.\Demos\osggeometry\osggeometry.dsp - Package Owner=<4> diff --git a/VisualStudio/osgPlugins/txp/txp.dsp b/VisualStudio/osgPlugins/txp/txp.dsp index 66ad23a8c..24304e6c8 100644 --- a/VisualStudio/osgPlugins/txp/txp.dsp +++ b/VisualStudio/osgPlugins/txp/txp.dsp @@ -214,6 +214,10 @@ SOURCE=..\..\..\src\osgPlugins\txp\trdll.h # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\txp\trPagePageManager.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\txp\trpage_compat.h # End Source File # Begin Source File @@ -230,6 +234,10 @@ SOURCE=..\..\..\src\osgPlugins\txp\trpage_io.h # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\txp\trpage_managers.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\txp\trpage_print.h # End Source File # Begin Source File @@ -250,6 +258,10 @@ SOURCE=..\..\..\src\osgPlugins\txp\trpage_sys.h # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\txp\trpage_util.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\txp\trpage_write.h # End Source File # Begin Source File @@ -260,6 +272,10 @@ SOURCE=..\..\..\src\osgPlugins\txp\TrPageArchive.h SOURCE=..\..\..\src\osgPlugins\txp\TrPageParser.h # End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\txp\WaitBlock.h +# End Source File # End Group # Begin Group "Resource Files" diff --git a/include/osgTXP/Export.h b/include/osgTXP/Export.h deleted file mode 100644 index 49b1b0370..000000000 --- a/include/osgTXP/Export.h +++ /dev/null @@ -1,27 +0,0 @@ -//C++ header - Open Scene Graph - Copyright (C) 1998-2002 Robert Osfield -//Distributed under the terms of the GNU Library General Public License (LGPL) -//as published by the Free Software Foundation. - -#ifndef OSGTXP_EXPORT_ -#define OSGTXP_EXPORT_ 1 - -#if defined(_MSC_VER) - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4267 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4290 ) - #pragma warning( disable : 4786 ) -#endif - -#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGTXP_LIBRARY - # define OSGTXP_EXPORT __declspec(dllexport) - # else - # define OSGTXP_EXPORT __declspec(dllimport) - # endif /* OSGTXP_LIBRARY */ -#else - # define OSGTXP_EXPORT -#endif - -#endif diff --git a/src/Demos/osgtxp/Makefile b/src/Demos/osgtxp/Makefile deleted file mode 100644 index 7953c1b0e..000000000 --- a/src/Demos/osgtxp/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -TOPDIR = ../../.. -include $(TOPDIR)/Make/makedefs - -CXXFILES =\ - osgtxp.cpp\ - TrPageViewer.cpp\ - -LIBS += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) - -LIBS += -losgTXP - -INSTFILES = \ - $(CXXFILES)\ - Makefile.inst=Makefile - -EXEC = osgtxp - -include $(TOPDIR)/Make/makerules - diff --git a/src/Demos/osgtxp/TrPageViewer.cpp b/src/Demos/osgtxp/TrPageViewer.cpp deleted file mode 100644 index 26d1fbcee..000000000 --- a/src/Demos/osgtxp/TrPageViewer.cpp +++ /dev/null @@ -1,168 +0,0 @@ -#if defined(_MSC_VER) - #pragma warning( disable : 4786 ) -#endif - -#include -#include - -#include -#if (!defined(WIN32) && !defined(macintosh)) || defined(__CYGWIN__) -#include -#include -#endif -#include - -#include -#include - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#ifdef WIN32 -#define USE_FLTK -#define USE_GLUT -#endif - -#include -#include "TrPageViewer.h" - -/* -#if defined(WIN32) && !defined(__CYGWIN__) -#include -#else -#endif -*/ - -using namespace osg; -using namespace osgUtil; -using namespace osgGLUT; -using namespace osgGA; - -using namespace std; -using namespace txp; - -PagingViewer::PagingViewer() : Viewer() -{ - pageManage = NULL; -} - -bool PagingViewer::Init(OSGPageManager *in_manage,OSGPageManager::ThreadMode threadMode) -{ - pageManage = in_manage; - - // Start up the thread if needed - if (threadMode != OSGPageManager::ThreadNone) { - ThreadID newThread; - pageManage->StartThread(threadMode,newThread); - } - - return true; -} - -/* App call - This replaces the app() call for the base viewer. - In this one, we ask the page manager to load stuff in. - */ -float PagingViewer::app(unsigned int viewport) -{ - osg::Timer_t beforeApp = _timer.tick(); - - // update the camera manipulator. - osg::ref_ptr ea = new GLUTEventAdapter; - ea->adaptFrame(_frameStamp->getReferenceTime()); - - bool handled = false; - for (EventHandlerList::iterator eh = _viewportList[viewport]._eventHandlerList.begin(); eh != _viewportList[viewport]._eventHandlerList.end(); - eh++ ) - { - if ( eh->valid() ) - { - if ( (*eh)->handle(*ea,*this) ) - { - handled = true; - break; - } - } - } - _viewportList[viewport]._cameraManipulator->handle(*ea,*this); - - if (getRecordingAnimationPath() && getAnimationPath()) - { - osg::Camera* camera = getViewportSceneView(viewport)->getCamera(); - osg::Matrix matrix; - matrix.invert(camera->getModelViewMatrix()); - osg::Quat quat; - quat.set(matrix); - getAnimationPath()->insert(_frameStamp->getReferenceTime(),osg::AnimationPath::ControlPoint(matrix.getTrans(),quat)); - } - - // Update the paging - if (pageManage) { - int numTile = 1; - osgUtil::SceneView *sceneView = getViewportSceneView(viewport); - osg::Camera *camera = sceneView->getCamera(); - const Vec3 &eyePt = camera->getEyePoint(); - double eyeX = eyePt[0]; - double eyeY = eyePt[1]; - - /* If we're in ThreadFree mode, merge in whatever may be ready. - If we're in non-thread mode, load in the given number of tiles (maximum). - */ - if (pageManage->GetThreadMode() == OSGPageManager::ThreadFree) { - pageManage->MergeUpdateThread((osg::Group *)sceneView->getSceneData()); - pageManage->UpdatePositionThread(eyeX,eyeY); - } else { - pageManage->UpdateNoThread((osg::Group *)sceneView->getSceneData(),eyeX,eyeY,numTile); - } - } - - // do app traversal. - - getViewportSceneView(viewport)->setFrameStamp(_frameStamp.get()); - getViewportSceneView(viewport)->app(); - - osg::Timer_t beforeCull = _timer.tick(); - - return _timer.delta_m(beforeApp,beforeCull); -} - -bool PagingViewer::run() -{ - updateFrameTick(); - return Window::run(); -} diff --git a/src/Demos/osgtxp/TrPageViewer.h b/src/Demos/osgtxp/TrPageViewer.h deleted file mode 100644 index cb0b6cbbb..000000000 --- a/src/Demos/osgtxp/TrPageViewer.h +++ /dev/null @@ -1,57 +0,0 @@ -/* ************************************************************************** - * OpenSceneGraph loader for Terrapage format database - * - * That loader is redistributed under the terms listed on Terrain Experts - * website (www.terrex.com/www/pages/technology/technologypage.htm) - * - * "TerraPage is provided as an Open Source format for use by anyone... - * We supply the TerraPage C++ source code free of charge. Anyone - * can use it and redistribute it as needed (including our competitors). - * We do, however, ask that you keep the TERREX copyrights intact." - * - * Copyright Terrain Experts Inc. 1999. - * All Rights Reserved. - * - *****************************************************************************/ - -#ifndef _TRPAGEVIEWER_H_ -#define _TRPAGEVIEWER_H_ - -#include -#include -#include -#include -#include - -#include - -#include - -#include - -#include - -#include - -namespace txp -{ - /* Paging Viewer - Variant of the regular viewer which knows to call - the Page Manager at the beginning of each app() phase. - */ - class PagingViewer : public osgGLUT::Viewer { - public: - PagingViewer(); - bool Init(OSGPageManager *,txp::OSGPageManager::ThreadMode = txp::OSGPageManager::ThreadNone); - - // called on each frame redraw..return the time in ms for each operation. - virtual float app(unsigned int viewport); - // The default Viewer resets the cameras at the beginning of the run() - // This is annoying. - bool run(); - protected: - OSGPageManager *pageManage; - }; -}; - -#endif diff --git a/src/Demos/osgtxp/osgtxp.cpp b/src/Demos/osgtxp/osgtxp.cpp deleted file mode 100644 index 68c55f986..000000000 --- a/src/Demos/osgtxp/osgtxp.cpp +++ /dev/null @@ -1,179 +0,0 @@ -#include -#include -#include - -#include -#include - -#include - -#include -#include - -#include -#include -#include - -#include -#include "TrPageViewer.h" - - -void write_usage(std::ostream& out,const std::string& name) -{ - out << std::endl; - out <<"usage:"<< std::endl; - out <<" "< commandLine; - for(int i=1;isetWindowTitle(argv[0]); - - // configure the viewer from the commandline arguments, and eat any - // parameters that have been matched. - viewer->readCommandLine(commandLine); - - // configure the plugin registry from the commandline arguments, and - // eat any parameters that have been matched. - //osgDB::readCommandLine(commandLine); - - // Initialize the TXP database - bool loadAll = false; - bool threadIt = false; - std::string fileName; - for(std::vector::iterator itr=commandLine.begin(); - itr!=commandLine.end(); - ++itr) - { - if ((*itr)[0]!='-') - { - fileName = (*itr); - - } - else - { - // Look for switches we want - if (*itr=="-loadall") - { - loadAll = true; - continue; - } - if (*itr=="-thread") - { - threadIt = true; - continue; - } - } - } - if (fileName.empty()) { - fprintf(stderr,"No TerraPage file specified on command line.\n"); - return 1; - } - // Open the TXP database - TrPageArchive *txpArchive = new TrPageArchive(); - if (!txpArchive->OpenFile(fileName.c_str())) - { - fprintf(stderr,"Couldn't load TerraPage archive %s.\n",fileName.c_str()); - return 1; - } - - // Note: Should be checking the return values - txpArchive->LoadMaterials(); -// txpArchive->LoadModels(); - - // Might need a page manager if we're paging - OSGPageManager *pageManager = new OSGPageManager(txpArchive); - osg::Group *rootNode=NULL; - if (loadAll) { - // Load the whole scenegraph - rootNode = txpArchive->LoadAllTiles(); - if (!rootNode) { - fprintf(stderr,"Couldn't load whole TerraPage archive %s.\n",fileName.c_str()); - return 1; - } - // add a viewport to the viewer and attach the scene graph. - viewer->addViewport( rootNode ); - } else { - viewer->Init(pageManager,(threadIt ? txp::OSGPageManager::ThreadFree : txp::OSGPageManager::ThreadNone)); - rootNode = new osg::Group(); - viewer->addViewport(rootNode); - } - - // run optimization over the scene graph -// osgUtil::Optimizer optimzer; -// optimzer.optimize(rootnode); - - - // register trackball, flight and drive. - viewer->registerCameraManipulator(new osgGA::TrackballManipulator); - viewer->registerCameraManipulator(new osgGA::FlightManipulator); - viewer->registerCameraManipulator(new osgGA::DriveManipulator); - - // Recenter the camera to the middle of the database - osg::Vec3 center; - txpArchive->GetCenter(center); center[2] += 200; - osgUtil::SceneView *sceneView = viewer->getViewportSceneView(0); - osg::Camera *camera = sceneView->getCamera(); - osg::Vec3 eyePt = center; - eyePt[0] -= 1000; - osg::Vec3 upVec( 0, 0, 1 ); - camera->setLookAt(eyePt,center,upVec); - - // open the viewer window. - viewer->open(); - - // fire up the event loop. - viewer->run(); - - - // Close things down - // (note from Robert Osfield, umm.... we should be using ref_ptr<> for handling memory here, this isn't robust..) - delete pageManager; - delete txpArchive; - delete viewer; - - return 0; -} diff --git a/src/osgPlugins/txp/ReaderWriterTXP.cpp b/src/osgPlugins/txp/ReaderWriterTXP.cpp index fbba86473..3998229ee 100644 --- a/src/osgPlugins/txp/ReaderWriterTXP.cpp +++ b/src/osgPlugins/txp/ReaderWriterTXP.cpp @@ -1,5 +1,5 @@ #include "ReaderWriterTXP.h" -#include +#include #include #include diff --git a/src/osgPlugins/txp/ReaderWriterTXP.h b/src/osgPlugins/txp/ReaderWriterTXP.h index a740f8975..a0c8e95bc 100644 --- a/src/osgPlugins/txp/ReaderWriterTXP.h +++ b/src/osgPlugins/txp/ReaderWriterTXP.h @@ -26,7 +26,7 @@ #ifndef READER_WRITER_TXP_H #define READER_WRITER_TXP_H -#include +#include #include #include diff --git a/src/osgPlugins/txp/TerrapageNode.h b/src/osgPlugins/txp/TerrapageNode.h index 0f513ab14..bf16c5e73 100644 --- a/src/osgPlugins/txp/TerrapageNode.h +++ b/src/osgPlugins/txp/TerrapageNode.h @@ -6,7 +6,7 @@ #include #include -#include +#include namespace txp { diff --git a/src/osgPlugins/txp/TrPageArchive.cpp b/src/osgPlugins/txp/TrPageArchive.cpp index 1dfba053a..84dd4b751 100644 --- a/src/osgPlugins/txp/TrPageArchive.cpp +++ b/src/osgPlugins/txp/TrPageArchive.cpp @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -23,11 +23,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace txp; diff --git a/include/osgTXP/TrPageArchive.h b/src/osgPlugins/txp/TrPageArchive.h similarity index 93% rename from include/osgTXP/TrPageArchive.h rename to src/osgPlugins/txp/TrPageArchive.h index 382652d84..de038f626 100644 --- a/include/osgTXP/TrPageArchive.h +++ b/src/osgPlugins/txp/TrPageArchive.h @@ -25,13 +25,11 @@ -#include -#include -#include +#include +#include +#include -#include - -#include +#include #include #include @@ -40,7 +38,7 @@ namespace txp { /// main class for loading terrapage archives - class OSGTXP_EXPORT TrPageArchive : public trpgr_Archive + class TrPageArchive : public trpgr_Archive { public: TrPageArchive(); diff --git a/src/osgPlugins/txp/TrPageParser.cpp b/src/osgPlugins/txp/TrPageParser.cpp index 67d68e249..8270b91c4 100644 --- a/src/osgPlugins/txp/TrPageParser.cpp +++ b/src/osgPlugins/txp/TrPageParser.cpp @@ -19,7 +19,7 @@ * All Rights Reserved. * *****************************************************************************/ -#include +#include #include #include #include @@ -35,8 +35,8 @@ #include -#include -#include +#include +#include /* #include #include diff --git a/include/osgTXP/TrPageParser.h b/src/osgPlugins/txp/TrPageParser.h similarity index 97% rename from include/osgTXP/TrPageParser.h rename to src/osgPlugins/txp/TrPageParser.h index ddc3e562e..2a3f7f4ee 100644 --- a/include/osgTXP/TrPageParser.h +++ b/src/osgPlugins/txp/TrPageParser.h @@ -31,9 +31,7 @@ #include #include #include -#include - -#include +#include namespace txp { @@ -46,7 +44,7 @@ namespace txp int id; } GroupIDInfo; - class OSGTXP_EXPORT TrPageParser : public trpgSceneParser + class TrPageParser : public trpgSceneParser { public: TrPageParser(TrPageArchive* parent); diff --git a/include/osgTXP/WaitBlock.h b/src/osgPlugins/txp/WaitBlock.h similarity index 100% rename from include/osgTXP/WaitBlock.h rename to src/osgPlugins/txp/WaitBlock.h diff --git a/src/osgPlugins/txp/trPagePageManager.cpp b/src/osgPlugins/txp/trPagePageManager.cpp index 59f570a35..0b0640367 100644 --- a/src/osgPlugins/txp/trPagePageManager.cpp +++ b/src/osgPlugins/txp/trPagePageManager.cpp @@ -9,9 +9,9 @@ #include #endif -#include -#include -#include +#include +#include +#include #include #include diff --git a/include/osgTXP/trPagePageManager.h b/src/osgPlugins/txp/trPagePageManager.h similarity index 92% rename from include/osgTXP/trPagePageManager.h rename to src/osgPlugins/txp/trPagePageManager.h index 1ff9f4a0a..d9f12c990 100644 --- a/include/osgTXP/trPagePageManager.h +++ b/src/osgPlugins/txp/trPagePageManager.h @@ -26,15 +26,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace txp { @@ -55,7 +54,7 @@ namespace txp /* OSG Page Manager This class handles the paging into */ - class OSGTXP_EXPORT OSGPageManager { + class OSGPageManager { public: /* Need a group to put things under and the archive to page. Also, optionally, a Page Manager (if you've made changes diff --git a/include/osgTXP/trdll.h b/src/osgPlugins/txp/trdll.h similarity index 100% rename from include/osgTXP/trdll.h rename to src/osgPlugins/txp/trdll.h diff --git a/src/osgPlugins/txp/trpage_basic.cpp b/src/osgPlugins/txp/trpage_basic.cpp index 3e166f637..d90140f67 100644 --- a/src/osgPlugins/txp/trpage_basic.cpp +++ b/src/osgPlugins/txp/trpage_basic.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include /* Checkable This is just a class that checks validity. diff --git a/src/osgPlugins/txp/trpage_compat.cpp b/src/osgPlugins/txp/trpage_compat.cpp index 9fff51cf7..44392b993 100644 --- a/src/osgPlugins/txp/trpage_compat.cpp +++ b/src/osgPlugins/txp/trpage_compat.cpp @@ -24,9 +24,9 @@ */ -#include -#include -#include +#include +#include +#include /* Old short Material definition from 1.0. {secret} diff --git a/include/osgTXP/trpage_compat.h b/src/osgPlugins/txp/trpage_compat.h similarity index 100% rename from include/osgTXP/trpage_compat.h rename to src/osgPlugins/txp/trpage_compat.h diff --git a/src/osgPlugins/txp/trpage_geom.cpp b/src/osgPlugins/txp/trpage_geom.cpp index 2d2e067aa..0a0cdfe94 100644 --- a/src/osgPlugins/txp/trpage_geom.cpp +++ b/src/osgPlugins/txp/trpage_geom.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/include/osgTXP/trpage_geom.h b/src/osgPlugins/txp/trpage_geom.h similarity index 99% rename from include/osgTXP/trpage_geom.h rename to src/osgPlugins/txp/trpage_geom.h index f88b2c526..f67c4f9bf 100644 --- a/include/osgTXP/trpage_geom.h +++ b/src/osgPlugins/txp/trpage_geom.h @@ -21,10 +21,10 @@ These are the objects that get read from and written to archives. */ -#include +#include -#include -#include +#include +#include // Forward declarations diff --git a/src/osgPlugins/txp/trpage_header.cpp b/src/osgPlugins/txp/trpage_header.cpp index 120658ed8..d8eefce81 100644 --- a/src/osgPlugins/txp/trpage_header.cpp +++ b/src/osgPlugins/txp/trpage_header.cpp @@ -23,8 +23,8 @@ to the header definition. */ -#include -#include +#include +#include /* Write Header class Fill it in and write it out. diff --git a/include/osgTXP/trpage_ident.h b/src/osgPlugins/txp/trpage_ident.h similarity index 100% rename from include/osgTXP/trpage_ident.h rename to src/osgPlugins/txp/trpage_ident.h diff --git a/include/osgTXP/trpage_io.h b/src/osgPlugins/txp/trpage_io.h similarity index 99% rename from include/osgTXP/trpage_io.h rename to src/osgPlugins/txp/trpage_io.h index 0758c46dd..036bf401d 100644 --- a/include/osgTXP/trpage_io.h +++ b/src/osgPlugins/txp/trpage_io.h @@ -20,7 +20,7 @@ Token definitions and basic classes. */ -#include +#include // Macros we may need #ifndef MIN diff --git a/src/osgPlugins/txp/trpage_light.cpp b/src/osgPlugins/txp/trpage_light.cpp index d5f8c5cfd..fc40865e6 100644 --- a/src/osgPlugins/txp/trpage_light.cpp +++ b/src/osgPlugins/txp/trpage_light.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #if defined(_WIN32) #define ALIGNMENT_WORKAROUND false diff --git a/src/osgPlugins/txp/trpage_main.cpp b/src/osgPlugins/txp/trpage_main.cpp index 7dc7d6308..3e5f47ebf 100644 --- a/src/osgPlugins/txp/trpage_main.cpp +++ b/src/osgPlugins/txp/trpage_main.cpp @@ -26,6 +26,6 @@ #include #include -#include +#include TXDUMMY_DLL_MAIN diff --git a/src/osgPlugins/txp/trpage_managers.cpp b/src/osgPlugins/txp/trpage_managers.cpp index 1aaa4031b..d8fac3030 100644 --- a/src/osgPlugins/txp/trpage_managers.cpp +++ b/src/osgPlugins/txp/trpage_managers.cpp @@ -17,11 +17,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* Managed Tile class. Check the header file for details. diff --git a/include/osgTXP/trpage_managers.h b/src/osgPlugins/txp/trpage_managers.h similarity index 100% rename from include/osgTXP/trpage_managers.h rename to src/osgPlugins/txp/trpage_managers.h diff --git a/src/osgPlugins/txp/trpage_material.cpp b/src/osgPlugins/txp/trpage_material.cpp index da1d5b51a..123bd6294 100644 --- a/src/osgPlugins/txp/trpage_material.cpp +++ b/src/osgPlugins/txp/trpage_material.cpp @@ -23,8 +23,8 @@ You should only modify this code if you want to add data to these classes. */ -#include -#include +#include +#include /* Write Material Table class Keeps track of the materials that have been added. diff --git a/src/osgPlugins/txp/trpage_model.cpp b/src/osgPlugins/txp/trpage_model.cpp index 0ecae88e8..054c15cf5 100644 --- a/src/osgPlugins/txp/trpage_model.cpp +++ b/src/osgPlugins/txp/trpage_model.cpp @@ -22,8 +22,8 @@ You should only modify this code if you want to add data to these classes. */ -#include -#include +#include +#include /* Write Model class Represents a model reference. diff --git a/src/osgPlugins/txp/trpage_nodes.cpp b/src/osgPlugins/txp/trpage_nodes.cpp index 387b1c5af..1a63cb319 100644 --- a/src/osgPlugins/txp/trpage_nodes.cpp +++ b/src/osgPlugins/txp/trpage_nodes.cpp @@ -24,8 +24,8 @@ of these classes. */ -#include -#include +#include +#include /* Write Group Basic group. diff --git a/src/osgPlugins/txp/trpage_parse.cpp b/src/osgPlugins/txp/trpage_parse.cpp index f478ac60b..ba9058e19 100644 --- a/src/osgPlugins/txp/trpage_parse.cpp +++ b/src/osgPlugins/txp/trpage_parse.cpp @@ -30,7 +30,7 @@ for the rest of the tokens that you want. */ -#include +#include /* *************************** Paging token callback structure diff --git a/src/osgPlugins/txp/trpage_pparse.cpp b/src/osgPlugins/txp/trpage_pparse.cpp index 055097c83..a64a0dfb7 100644 --- a/src/osgPlugins/txp/trpage_pparse.cpp +++ b/src/osgPlugins/txp/trpage_pparse.cpp @@ -22,8 +22,8 @@ archive for the purpose of printing it out. */ -#include -#include +#include +#include /* Set up the callbacks for the scene graph parser. In our case this is just one read helper with diff --git a/src/osgPlugins/txp/trpage_print.cpp b/src/osgPlugins/txp/trpage_print.cpp index a487185dd..3b8929230 100644 --- a/src/osgPlugins/txp/trpage_print.cpp +++ b/src/osgPlugins/txp/trpage_print.cpp @@ -23,7 +23,7 @@ within a TerraPage archive. */ -#include +#include /* ****************************************** Print Buffer implementation diff --git a/include/osgTXP/trpage_print.h b/src/osgPlugins/txp/trpage_print.h similarity index 99% rename from include/osgTXP/trpage_print.h rename to src/osgPlugins/txp/trpage_print.h index 9d37e0add..48fef4346 100644 --- a/include/osgTXP/trpage_print.h +++ b/src/osgPlugins/txp/trpage_print.h @@ -16,7 +16,7 @@ #ifndef trpage_print_h_ #define trpage_print_h_ -#include +#include /* Print Buffer for TerraPage. Subclasses of this object are used to print out to stdout or disk (or whatever). diff --git a/src/osgPlugins/txp/trpage_range.cpp b/src/osgPlugins/txp/trpage_range.cpp index b33f8e716..50a36013d 100644 --- a/src/osgPlugins/txp/trpage_range.cpp +++ b/src/osgPlugins/txp/trpage_range.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include /* ******************* Range Methods diff --git a/src/osgPlugins/txp/trpage_rarchive.cpp b/src/osgPlugins/txp/trpage_rarchive.cpp index a0a27f302..d600f55c7 100644 --- a/src/osgPlugins/txp/trpage_rarchive.cpp +++ b/src/osgPlugins/txp/trpage_rarchive.cpp @@ -22,8 +22,8 @@ The Read Archive is used to read a paging archive from disk. */ -#include -#include +#include +#include // Constructor trpgr_Archive::trpgr_Archive() diff --git a/include/osgTXP/trpage_read.h b/src/osgPlugins/txp/trpage_read.h similarity index 99% rename from include/osgTXP/trpage_read.h rename to src/osgPlugins/txp/trpage_read.h index 2a71dd71a..c81fece7b 100644 --- a/include/osgTXP/trpage_read.h +++ b/src/osgPlugins/txp/trpage_read.h @@ -21,9 +21,9 @@ Classes used to represent read objects for paging files. */ -#include +#include -#include +#include /* Callback base class Called when a given token is found. diff --git a/src/osgPlugins/txp/trpage_readbuf.cpp b/src/osgPlugins/txp/trpage_readbuf.cpp index b6b3574c6..46f59158d 100644 --- a/src/osgPlugins/txp/trpage_readbuf.cpp +++ b/src/osgPlugins/txp/trpage_readbuf.cpp @@ -28,8 +28,8 @@ implement a trpgDiskReadBuffer as a subclass of trpgReadBuffer. */ -#include -#include +#include +#include /* ********************** Read buffer base class functions diff --git a/src/osgPlugins/txp/trpage_scene.cpp b/src/osgPlugins/txp/trpage_scene.cpp index d6fd08358..3edfb4541 100644 --- a/src/osgPlugins/txp/trpage_scene.cpp +++ b/src/osgPlugins/txp/trpage_scene.cpp @@ -34,8 +34,8 @@ to read into a scene graph. You'll need to replace the helpers, primarily. */ -#include -#include +#include +#include /* **************** MBR Calculation and handling diff --git a/include/osgTXP/trpage_scene.h b/src/osgPlugins/txp/trpage_scene.h similarity index 99% rename from include/osgTXP/trpage_scene.h rename to src/osgPlugins/txp/trpage_scene.h index 605d8e886..264b70ed6 100644 --- a/include/osgTXP/trpage_scene.h +++ b/src/osgPlugins/txp/trpage_scene.h @@ -26,7 +26,7 @@ for how to read TerraPage format into your own scene graph. */ -#include +#include /* {group:Demonstration Scene Graph} diff --git a/src/osgPlugins/txp/trpage_swap.cpp b/src/osgPlugins/txp/trpage_swap.cpp index 5f43ae66b..be72293ed 100644 --- a/src/osgPlugins/txp/trpage_swap.cpp +++ b/src/osgPlugins/txp/trpage_swap.cpp @@ -20,7 +20,7 @@ Byte swapping utility functions. */ -#include +#include /* ** func: swap_two( in, out ) diff --git a/include/osgTXP/trpage_swap.h b/src/osgPlugins/txp/trpage_swap.h similarity index 97% rename from include/osgTXP/trpage_swap.h rename to src/osgPlugins/txp/trpage_swap.h index 6b79eb9ee..4eefcb255 100644 --- a/include/osgTXP/trpage_swap.h +++ b/src/osgPlugins/txp/trpage_swap.h @@ -20,9 +20,9 @@ Byte swapping utility functions. */ -#include +#include -#include +#include // Byte swap and return a short // {group:Byte Ordering Utilities} diff --git a/include/osgTXP/trpage_sys.h b/src/osgPlugins/txp/trpage_sys.h similarity index 97% rename from include/osgTXP/trpage_sys.h rename to src/osgPlugins/txp/trpage_sys.h index e97fec616..10f1fb92a 100644 --- a/include/osgTXP/trpage_sys.h +++ b/src/osgPlugins/txp/trpage_sys.h @@ -101,7 +101,7 @@ typedef int64 trpgllong; // These are used to export classes from a DLL // Definitely Windows specific -#include -#include +#include +#include #endif diff --git a/src/osgPlugins/txp/trpage_tile.cpp b/src/osgPlugins/txp/trpage_tile.cpp index 5210e7984..994595353 100644 --- a/src/osgPlugins/txp/trpage_tile.cpp +++ b/src/osgPlugins/txp/trpage_tile.cpp @@ -23,8 +23,8 @@ the front of an archive) or the Tile Header (at the beginning of each tile). */ -#include -#include +#include +#include /* Write Tile Table Keeps track of tiles written to disk. diff --git a/src/osgPlugins/txp/trpage_util.cpp b/src/osgPlugins/txp/trpage_util.cpp index 17911d229..772679565 100644 --- a/src/osgPlugins/txp/trpage_util.cpp +++ b/src/osgPlugins/txp/trpage_util.cpp @@ -13,7 +13,7 @@ ************************ */ -#include +#include /* trpage_util.cpp This source file implements various utility routines for paging archive diff --git a/include/osgTXP/trpage_util.h b/src/osgPlugins/txp/trpage_util.h similarity index 89% rename from include/osgTXP/trpage_util.h rename to src/osgPlugins/txp/trpage_util.h index 13a7bd31e..f213bee2c 100644 --- a/include/osgTXP/trpage_util.h +++ b/src/osgPlugins/txp/trpage_util.h @@ -20,9 +20,9 @@ #ifndef trpage_util_h_ #define trpage_util_h_ #include -#include -#include -#include +#include +#include +#include TX_EXDECL class TX_CLDECL trpgUtil { public: diff --git a/src/osgPlugins/txp/trpage_warchive.cpp b/src/osgPlugins/txp/trpage_warchive.cpp index bb4dc1d15..8790fd685 100644 --- a/src/osgPlugins/txp/trpage_warchive.cpp +++ b/src/osgPlugins/txp/trpage_warchive.cpp @@ -28,10 +28,10 @@ again, subclass and override if you need to change them. */ -#include -#include -#include -#include +#include +#include +#include +#include // Constructor trpgwArchive::trpgwArchive(trpgEndian inNess,TileMode inTileMode,int inVersion) diff --git a/include/osgTXP/trpage_write.h b/src/osgPlugins/txp/trpage_write.h similarity index 99% rename from include/osgTXP/trpage_write.h rename to src/osgPlugins/txp/trpage_write.h index 642924747..e7e81f25e 100644 --- a/include/osgTXP/trpage_write.h +++ b/src/osgPlugins/txp/trpage_write.h @@ -21,9 +21,9 @@ Classes that are used to write paging archives. */ -#include -#include -#include +#include +#include +#include /* Geometry Stats Used with a Geometry Helper to keep track of what go built. diff --git a/src/osgPlugins/txp/trpage_writebuf.cpp b/src/osgPlugins/txp/trpage_writebuf.cpp index 9f7bbad12..6e5a728c4 100644 --- a/src/osgPlugins/txp/trpage_writebuf.cpp +++ b/src/osgPlugins/txp/trpage_writebuf.cpp @@ -29,8 +29,8 @@ is required. */ -#include -#include +#include +#include /* ********************** Memory Write Buffer functions