Moved ViewerBase class out into its own header and source file.
Improved the support for stats collection in CompositeViewer/StatsHandler.
This commit is contained in:
Robert Osfield
@@ -10,7 +10,6 @@
|
||||
#include <osgIntrospection/StaticMethodInfo>
|
||||
#include <osgIntrospection/Attributes>
|
||||
|
||||
#include <osg/ApplicationUsage>
|
||||
#include <osg/Camera>
|
||||
#include <osg/CopyOp>
|
||||
#include <osg/DisplaySettings>
|
||||
@@ -18,19 +17,17 @@
|
||||
#include <osg/Image>
|
||||
#include <osg/Node>
|
||||
#include <osg/Object>
|
||||
#include <osg/OperationThread>
|
||||
#include <osg/Timer>
|
||||
#include <osg/View>
|
||||
#include <osgDB/DatabasePager>
|
||||
#include <osgGA/EventQueue>
|
||||
#include <osgGA/EventVisitor>
|
||||
#include <osgGA/GUIEventHandler>
|
||||
#include <osgGA/MatrixManipulator>
|
||||
#include <osgUtil/LineSegmentIntersector>
|
||||
#include <osgUtil/SceneView>
|
||||
#include <osgUtil/UpdateVisitor>
|
||||
#include <osgViewer/Scene>
|
||||
#include <osgViewer/View>
|
||||
#include <osgViewer/ViewerBase>
|
||||
|
||||
// Must undefine IN and OUT macros defined in Windows headers
|
||||
#ifdef IN
|
||||
@@ -368,271 +365,6 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View)
|
||||
0);
|
||||
END_REFLECTOR
|
||||
|
||||
TYPE_NAME_ALIAS(std::vector< osg::Camera * >, osgViewer::ViewerBase::Cameras)
|
||||
|
||||
TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::ViewerBase::Contexts)
|
||||
|
||||
TYPE_NAME_ALIAS(std::vector< osgViewer::GraphicsWindow * >, osgViewer::ViewerBase::Windows)
|
||||
|
||||
TYPE_NAME_ALIAS(std::vector< OpenThreads::Thread * >, osgViewer::ViewerBase::Threads)
|
||||
|
||||
TYPE_NAME_ALIAS(std::vector< osg::OperationThread * >, osgViewer::ViewerBase::OperationThreads)
|
||||
|
||||
TYPE_NAME_ALIAS(std::vector< osgViewer::Scene * >, osgViewer::ViewerBase::Scenes)
|
||||
|
||||
BEGIN_ENUM_REFLECTOR(osgViewer::ViewerBase::ThreadingModel)
|
||||
I_DeclaringFile("osgViewer/View");
|
||||
I_EnumLabel(osgViewer::ViewerBase::SingleThreaded);
|
||||
I_EnumLabel(osgViewer::ViewerBase::CullDrawThreadPerContext);
|
||||
I_EnumLabel(osgViewer::ViewerBase::ThreadPerContext);
|
||||
I_EnumLabel(osgViewer::ViewerBase::DrawThreadPerContext);
|
||||
I_EnumLabel(osgViewer::ViewerBase::CullThreadPerCameraDrawThreadPerContext);
|
||||
I_EnumLabel(osgViewer::ViewerBase::ThreadPerCamera);
|
||||
I_EnumLabel(osgViewer::ViewerBase::AutomaticSelection);
|
||||
END_REFLECTOR
|
||||
|
||||
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::ViewerBase)
|
||||
I_DeclaringFile("osgViewer/View");
|
||||
I_VirtualBaseType(osg::Object);
|
||||
I_Constructor0(____ViewerBase,
|
||||
"",
|
||||
"");
|
||||
I_Constructor1(IN, const osgViewer::ViewerBase &, vb,
|
||||
Properties::NON_EXPLICIT,
|
||||
____ViewerBase__C5_ViewerBase_R1,
|
||||
"",
|
||||
"");
|
||||
I_Method1(bool, readConfiguration, IN, const std::string &, filename,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__bool__readConfiguration__C5_std_string_R1,
|
||||
"read the viewer configuration from a configuration file. ",
|
||||
"");
|
||||
I_Method0(bool, isRealized,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__bool__isRealized,
|
||||
"Get whether at least of one of this viewers windows are realized. ",
|
||||
"");
|
||||
I_Method0(void, realize,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__realize,
|
||||
"set up windows and associated threads. ",
|
||||
"");
|
||||
I_Method1(void, setThreadingModel, IN, osgViewer::ViewerBase::ThreadingModel, threadingModel,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__setThreadingModel__ThreadingModel,
|
||||
"Set the threading model the rendering traversals will use. ",
|
||||
"");
|
||||
I_Method0(osgViewer::ViewerBase::ThreadingModel, getThreadingModel,
|
||||
Properties::NON_VIRTUAL,
|
||||
__ThreadingModel__getThreadingModel,
|
||||
"Get the threading model the rendering traversals will use. ",
|
||||
"");
|
||||
I_Method1(void, setDone, IN, bool, done,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setDone__bool,
|
||||
"Set the done flag to singnal the viewer's work is done and should exit the frame loop. ",
|
||||
"");
|
||||
I_Method0(bool, done,
|
||||
Properties::NON_VIRTUAL,
|
||||
__bool__done,
|
||||
"Reurn true if viewer's work is done and should exit the frame loop. ",
|
||||
"");
|
||||
I_Method1(void, setEventVisitor, IN, osgGA::EventVisitor *, eventVisitor,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setEventVisitor__osgGA_EventVisitor_P1,
|
||||
"Set the EventVisitor. ",
|
||||
"");
|
||||
I_Method0(osgGA::EventVisitor *, getEventVisitor,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osgGA_EventVisitor_P1__getEventVisitor,
|
||||
"Get the EventVisitor. ",
|
||||
"");
|
||||
I_Method0(const osgGA::EventVisitor *, getEventVisitor,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osgGA_EventVisitor_P1__getEventVisitor,
|
||||
"Get the const EventVisitor. ",
|
||||
"");
|
||||
I_Method1(void, setKeyEventSetsDone, IN, int, key,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setKeyEventSetsDone__int,
|
||||
"Set the key event that the viewer checks on each frame to see if the viewer's done flag should be set to signal end of viewers main loop. ",
|
||||
"Default value is Escape (osgGA::GUIEVentAdapter::KEY_Escape). Setting to 0 switches off the feature. ");
|
||||
I_Method0(int, getKeyEventSetsDone,
|
||||
Properties::NON_VIRTUAL,
|
||||
__int__getKeyEventSetsDone,
|
||||
"get the key event that the viewer checks on each frame to see if the viewer's done flag. ",
|
||||
"");
|
||||
I_Method1(void, setQuitEventSetsDone, IN, bool, flag,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setQuitEventSetsDone__bool,
|
||||
"if the flag is true, the viewer set its done flag when a QUIT_APPLICATION is received, false disables this feature ",
|
||||
"");
|
||||
I_Method0(bool, getQuitEventSetsDone,
|
||||
Properties::NON_VIRTUAL,
|
||||
__bool__getQuitEventSetsDone,
|
||||
"",
|
||||
"true if the viewer respond to the QUIT_APPLICATION-event ");
|
||||
I_Method1(void, setUpdateVisitor, IN, osgUtil::UpdateVisitor *, updateVisitor,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setUpdateVisitor__osgUtil_UpdateVisitor_P1,
|
||||
"Set the UpdateVisitor. ",
|
||||
"");
|
||||
I_Method0(osgUtil::UpdateVisitor *, getUpdateVisitor,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osgUtil_UpdateVisitor_P1__getUpdateVisitor,
|
||||
"Get the UpdateVisitor. ",
|
||||
"");
|
||||
I_Method0(const osgUtil::UpdateVisitor *, getUpdateVisitor,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osgUtil_UpdateVisitor_P1__getUpdateVisitor,
|
||||
"Get the const UpdateVisitor. ",
|
||||
"");
|
||||
I_Method1(void, setUpdateOperations, IN, osg::OperationQueue *, operations,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setUpdateOperations__osg_OperationQueue_P1,
|
||||
"Set the Update OperationQueue. ",
|
||||
"");
|
||||
I_Method0(osg::OperationQueue *, getUpdateOperations,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_OperationQueue_P1__getUpdateOperations,
|
||||
"Get the Update OperationQueue. ",
|
||||
"");
|
||||
I_Method0(const osg::OperationQueue *, getUpdateOperations,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osg_OperationQueue_P1__getUpdateOperations,
|
||||
"Get the const Update OperationQueue. ",
|
||||
"");
|
||||
I_Method1(void, addUpdateOperation, IN, osg::Operation *, operation,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__addUpdateOperation__osg_Operation_P1,
|
||||
"Add an update operation. ",
|
||||
"");
|
||||
I_Method1(void, removeUpdateOperation, IN, osg::Operation *, operation,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__removeUpdateOperation__osg_Operation_P1,
|
||||
"Remove an update operation. ",
|
||||
"");
|
||||
I_Method0(int, run,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__int__run,
|
||||
"Execute a main frame loop. ",
|
||||
"Equivialant to while (!viewer.done()) viewer.frame(); Also calls realize() if the viewer is not already realized, and installs trackball manipulator if one is not already assigned. ");
|
||||
I_MethodWithDefaults1(void, frame, IN, double, simulationTime, USE_REFERENCE_TIME,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__frame__double,
|
||||
"Render a complete new frame. ",
|
||||
"Calls advance(), eventTraversal(), updateTraversal(), renderingTraversals(). ");
|
||||
I_MethodWithDefaults1(void, advance, IN, double, simulationTime, USE_REFERENCE_TIME,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__advance__double,
|
||||
"",
|
||||
"");
|
||||
I_Method0(void, eventTraversal,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__eventTraversal,
|
||||
"",
|
||||
"");
|
||||
I_Method0(void, updateTraversal,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__updateTraversal,
|
||||
"",
|
||||
"");
|
||||
I_Method0(void, renderingTraversals,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__renderingTraversals,
|
||||
"",
|
||||
"");
|
||||
I_MethodWithDefaults2(void, getCameras, IN, osgViewer::ViewerBase::Cameras &, cameras, , IN, bool, onlyActive, true,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__getCameras__Cameras_R1__bool,
|
||||
"",
|
||||
"");
|
||||
I_MethodWithDefaults2(void, getContexts, IN, osgViewer::ViewerBase::Contexts &, contexts, , IN, bool, onlyValid, true,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__getContexts__Contexts_R1__bool,
|
||||
"",
|
||||
"");
|
||||
I_MethodWithDefaults2(void, getWindows, IN, osgViewer::ViewerBase::Windows &, windows, , IN, bool, onlyValid, true,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__getWindows__Windows_R1__bool,
|
||||
"",
|
||||
"");
|
||||
I_MethodWithDefaults2(void, getAllThreads, IN, osgViewer::ViewerBase::Threads &, threads, , IN, bool, onlyActive, true,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__getAllThreads__Threads_R1__bool,
|
||||
"",
|
||||
"");
|
||||
I_MethodWithDefaults2(void, getOperationThreads, IN, osgViewer::ViewerBase::OperationThreads &, threads, , IN, bool, onlyActive, true,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__getOperationThreads__OperationThreads_R1__bool,
|
||||
"",
|
||||
"");
|
||||
I_MethodWithDefaults2(void, getScenes, IN, osgViewer::ViewerBase::Scenes &, scenes, , IN, bool, onlyValid, true,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__getScenes__Scenes_R1__bool,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, setRealizeOperation, IN, osg::Operation *, op,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setRealizeOperation__osg_Operation_P1,
|
||||
"Set the graphics operation to call on realization of the viewers graphics windows. ",
|
||||
"");
|
||||
I_Method0(osg::Operation *, getRealizeOperation,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_Operation_P1__getRealizeOperation,
|
||||
"Get the graphics operation to call on realization of the viewers graphics windows. ",
|
||||
"");
|
||||
I_Method0(void, setUpThreading,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__setUpThreading,
|
||||
"Set up the threading and processor affinity as per the viewers threading model. ",
|
||||
"");
|
||||
I_Method0(bool, areThreadsRunning,
|
||||
Properties::NON_VIRTUAL,
|
||||
__bool__areThreadsRunning,
|
||||
"Return true if viewer threads are running. ",
|
||||
"");
|
||||
I_Method0(void, stopThreading,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__stopThreading,
|
||||
"Stop any threads begin run by viewer. ",
|
||||
"");
|
||||
I_Method0(void, startThreading,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__startThreading,
|
||||
"Start any threads required by the viewer. ",
|
||||
"");
|
||||
I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage,
|
||||
Properties::PURE_VIRTUAL,
|
||||
__void__getUsage__osg_ApplicationUsage_R1,
|
||||
"Get the keyboard and mouse usage of this viewer. ",
|
||||
"");
|
||||
I_SimpleProperty(bool, Done,
|
||||
0,
|
||||
__void__setDone__bool);
|
||||
I_SimpleProperty(osgGA::EventVisitor *, EventVisitor,
|
||||
__osgGA_EventVisitor_P1__getEventVisitor,
|
||||
__void__setEventVisitor__osgGA_EventVisitor_P1);
|
||||
I_SimpleProperty(int, KeyEventSetsDone,
|
||||
__int__getKeyEventSetsDone,
|
||||
__void__setKeyEventSetsDone__int);
|
||||
I_SimpleProperty(bool, QuitEventSetsDone,
|
||||
__bool__getQuitEventSetsDone,
|
||||
__void__setQuitEventSetsDone__bool);
|
||||
I_SimpleProperty(osg::Operation *, RealizeOperation,
|
||||
__osg_Operation_P1__getRealizeOperation,
|
||||
__void__setRealizeOperation__osg_Operation_P1);
|
||||
I_SimpleProperty(osgViewer::ViewerBase::ThreadingModel, ThreadingModel,
|
||||
__ThreadingModel__getThreadingModel,
|
||||
__void__setThreadingModel__ThreadingModel);
|
||||
I_SimpleProperty(osg::OperationQueue *, UpdateOperations,
|
||||
__osg_OperationQueue_P1__getUpdateOperations,
|
||||
__void__setUpdateOperations__osg_OperationQueue_P1);
|
||||
I_SimpleProperty(osgUtil::UpdateVisitor *, UpdateVisitor,
|
||||
__osgUtil_UpdateVisitor_P1__getUpdateVisitor,
|
||||
__void__setUpdateVisitor__osgUtil_UpdateVisitor_P1);
|
||||
END_REFLECTOR
|
||||
|
||||
BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >)
|
||||
I_DeclaringFile("osg/ref_ptr");
|
||||
I_Constructor0(____ref_ptr,
|
||||
@@ -675,13 +407,3 @@ END_REFLECTOR
|
||||
|
||||
STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >)
|
||||
|
||||
STD_VECTOR_REFLECTOR(std::vector< OpenThreads::Thread * >)
|
||||
|
||||
STD_VECTOR_REFLECTOR(std::vector< osg::Camera * >)
|
||||
|
||||
STD_VECTOR_REFLECTOR(std::vector< osg::OperationThread * >)
|
||||
|
||||
STD_VECTOR_REFLECTOR(std::vector< osgViewer::GraphicsWindow * >)
|
||||
|
||||
STD_VECTOR_REFLECTOR(std::vector< osgViewer::Scene * >)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user