From 25b333b05b69b4c2b859f459030ccac46e57bf6c Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Fri, 13 Dec 2002 20:28:58 +0000 Subject: [PATCH] Move TrPageViewer.cpp to src/Demos/osgtxp --- src/osgPlugins/txp/Makefile | 1 - src/osgPlugins/txp/TrPageViewer.cpp | 168 ---------------------------- 2 files changed, 169 deletions(-) delete mode 100644 src/osgPlugins/txp/TrPageViewer.cpp diff --git a/src/osgPlugins/txp/Makefile b/src/osgPlugins/txp/Makefile index 652756c49..dc86adac9 100644 --- a/src/osgPlugins/txp/Makefile +++ b/src/osgPlugins/txp/Makefile @@ -28,7 +28,6 @@ CXXFILES =\ trPagePageManager.cpp\ trpage_print_parse.cpp\ trpage_util.cpp\ - TrPageViewer.cpp\ diff --git a/src/osgPlugins/txp/TrPageViewer.cpp b/src/osgPlugins/txp/TrPageViewer.cpp deleted file mode 100644 index 040d992f9..000000000 --- a/src/osgPlugins/txp/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 - -/* -#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 = osgNew 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(); -}