From Erik van Dekker,
"I made several modifications:
* The cause of my errors was that my OSG source directory path contains spaces. To fix this issue I wrapped all paths with quotes, as stated in doxygen documentation.
* I also received some warning messages about deprecated doxygen settings, which I fixed by updating the doxygen file, i.e. running \u2018doxygen \u2013u doxygen.cmake\u2018. By running this command deprecated doxygen options are removed, some option comments have changed and quite some options have been added (I kept their default settings unless mentioned).
* I was surprised to find that the doxygen OUTPUT_DIRECTORY was set to \u201c${OpenSceneGraph_SOURCE_DIR}/doc\u201d, which does not seem appropriate for out of source builds; I changed this to \u201c${OpenSceneGraph_BINARY_DIR}/doc\u201d. (On the other hand, maybe a cmake selectable option should be given to the user?)
* Fixed two warnings I received about unexpected end-of-list-markers in \u2018osg\AnimationPath and \u2018osgUtil\CullVisitor due to excess trailing points in comments.
* Fixed a warning in osgWidget\StyleInterface due to an #include directive (strangely) placed inside a namespace.
* Fixed a warning in osg\Camera due to the META_Object macro that confused doxygen. Adding a semi-colon fixed this.
* Removed auto_Mainpage from the INCLUDE option, because I am positive that this file does not belong there; It never generated useful documentation anyway.
* I added the OSG version number environment variable to the PROJECT_NUMBER option so that the version number is now shown on the main page of generated documentation (e.g. index.html).
* Changed option FULL_PATH_NAMES to YES, but made sure STRIP_FROM_PATH stripped the absolute path until the include dir. This fixed an issue that created mangled names for identical filenames in different directories. E.g. osg/Export and osgDB/Export are now correctly named.
* Changed option SHOW_DIRECTORIES to yes, which is a case of preference I guess.
"
This commit is contained in:
Robert Osfield
@@ -163,6 +163,21 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD)
|
||||
__unsigned_int__getNumTimeStamps,
|
||||
"",
|
||||
"");
|
||||
I_Method2(void, setFrameNumber, IN, unsigned int, childNo, IN, int, frameNumber,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setFrameNumber__unsigned_int__int,
|
||||
"",
|
||||
"");
|
||||
I_Method1(double, getFrameNumber, IN, unsigned int, childNo,
|
||||
Properties::NON_VIRTUAL,
|
||||
__double__getFrameNumber__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method0(unsigned int, getNumFrameNumbers,
|
||||
Properties::NON_VIRTUAL,
|
||||
__unsigned_int__getNumFrameNumbers,
|
||||
"",
|
||||
"");
|
||||
I_Method1(osg::ref_ptr< osg::Referenced > &, getDatabaseRequest, IN, unsigned int, childNo,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_ref_ptrT1_osg_Referenced__R1__getDatabaseRequest__unsigned_int,
|
||||
@@ -193,10 +208,10 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD)
|
||||
__unsigned_int__getNumChildrenThatCannotBeExpired,
|
||||
"Get the number of children that the PagedLOD must keep around, even if they are older than their expiry time. ",
|
||||
"");
|
||||
I_Method2(bool, removeExpiredChildren, IN, double, expiryTime, IN, osg::NodeList &, removedChildren,
|
||||
I_Method3(bool, removeExpiredChildren, IN, double, expiryTime, IN, int, expiryFrame, IN, osg::NodeList &, removedChildren,
|
||||
Properties::VIRTUAL,
|
||||
__bool__removeExpiredChildren__double__NodeList_R1,
|
||||
"Remove the children from the PagedLOD which haven't been visited since specified expiry time. ",
|
||||
__bool__removeExpiredChildren__double__int__NodeList_R1,
|
||||
"Remove the children from the PagedLOD which haven't been visited since specified expiry time and expiry frame number. ",
|
||||
"The removed children are added to the removeChildren list passed into the method, this allows the children to be deleted later at the caller's discretion. Return true if children are removed, false otherwise. ");
|
||||
I_ProtectedMethod1(void, expandPerRangeDataTo, IN, unsigned int, pos,
|
||||
Properties::NON_VIRTUAL,
|
||||
@@ -214,6 +229,13 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD)
|
||||
0,
|
||||
0,
|
||||
0);
|
||||
I_ArrayProperty(double, FrameNumber,
|
||||
__double__getFrameNumber__unsigned_int,
|
||||
0,
|
||||
__unsigned_int__getNumFrameNumbers,
|
||||
0,
|
||||
0,
|
||||
0);
|
||||
I_SimpleProperty(int, FrameNumberOfLastTraversal,
|
||||
__int__getFrameNumberOfLastTraversal,
|
||||
__void__setFrameNumberOfLastTraversal__int);
|
||||
@@ -257,6 +279,7 @@ BEGIN_VALUE_REFLECTOR(osg::PagedLOD::PerRangeData)
|
||||
I_PublicMemberProperty(float, _priorityOffset);
|
||||
I_PublicMemberProperty(float, _priorityScale);
|
||||
I_PublicMemberProperty(double, _timeStamp);
|
||||
I_PublicMemberProperty(int, _frameNumber);
|
||||
I_PublicMemberProperty(osg::ref_ptr< osg::Referenced >, _databaseRequest);
|
||||
END_REFLECTOR
|
||||
|
||||
|
||||
@@ -204,6 +204,16 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
|
||||
__double__getExpiryDelay,
|
||||
"Get the amount of time that a subgraph will be kept without being visited in the cull traversal before being removed. ",
|
||||
"");
|
||||
I_Method1(void, setExpiryFrames, IN, int, expiryFrames,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setExpiryFrames__int,
|
||||
"Set the number of frames that a subgraph will be kept without being visited in the cull traversal before being removed. ",
|
||||
"");
|
||||
I_Method0(int, getExpiryFrames,
|
||||
Properties::NON_VIRTUAL,
|
||||
__int__getExpiryFrames,
|
||||
"Get the number of frames that a subgraph will be kept without being visited in the cull traversal before being removed. ",
|
||||
"");
|
||||
I_Method1(void, setDeleteRemovedSubgraphsInDatabaseThread, IN, bool, flag,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setDeleteRemovedSubgraphsInDatabaseThread__bool,
|
||||
@@ -249,9 +259,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
|
||||
__bool__requiresUpdateSceneGraph,
|
||||
"Return true if there are pending updates to the scene graph that require a call to updateSceneGraph(double). ",
|
||||
"");
|
||||
I_Method1(void, updateSceneGraph, IN, double, currentFrameTime,
|
||||
I_Method1(void, updateSceneGraph, IN, const osg::FrameStamp &, frameStamp,
|
||||
Properties::VIRTUAL,
|
||||
__void__updateSceneGraph__double,
|
||||
__void__updateSceneGraph__C5_osg_FrameStamp_R1,
|
||||
"Merge the changes to the scene graph by calling calling removeExpiredSubgraphs then addLoadedDataToSceneGraph. ",
|
||||
"Note, must only be called from single thread update phase. ");
|
||||
I_Method2(void, setCompileGLObjectsForContextID, IN, unsigned int, contextID, IN, bool, on,
|
||||
@@ -340,16 +350,16 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
|
||||
__bool__isCompiled__C5_osg_Drawable_P1,
|
||||
"",
|
||||
"");
|
||||
I_ProtectedMethod1(void, removeExpiredSubgraphs, IN, double, currentFrameTime,
|
||||
I_ProtectedMethod1(void, removeExpiredSubgraphs, IN, const osg::FrameStamp &, frameStamp,
|
||||
Properties::VIRTUAL,
|
||||
Properties::NON_CONST,
|
||||
__void__removeExpiredSubgraphs__double,
|
||||
__void__removeExpiredSubgraphs__C5_osg_FrameStamp_R1,
|
||||
"Iterate through the active PagedLOD nodes children removing children which havn't been visited since specified expiryTime. ",
|
||||
"note, should be only be called from the update thread. ");
|
||||
I_ProtectedMethod1(void, addLoadedDataToSceneGraph, IN, double, currentFrameTime,
|
||||
I_ProtectedMethod1(void, addLoadedDataToSceneGraph, IN, const osg::FrameStamp &, frameStamp,
|
||||
Properties::NON_VIRTUAL,
|
||||
Properties::NON_CONST,
|
||||
__void__addLoadedDataToSceneGraph__double,
|
||||
__void__addLoadedDataToSceneGraph__C5_osg_FrameStamp_R1,
|
||||
"Add the loaded data to the scene graph. ",
|
||||
"");
|
||||
I_SimpleProperty(bool, AcceptNewDatabaseRequests,
|
||||
@@ -387,6 +397,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
|
||||
I_SimpleProperty(double, ExpiryDelay,
|
||||
__double__getExpiryDelay,
|
||||
__void__setExpiryDelay__double);
|
||||
I_SimpleProperty(int, ExpiryFrames,
|
||||
__int__getExpiryFrames,
|
||||
__void__setExpiryFrames__int);
|
||||
I_SimpleProperty(unsigned int, FileRequestListSize,
|
||||
__unsigned_int__getFileRequestListSize,
|
||||
0);
|
||||
|
||||
@@ -69,9 +69,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ImagePager)
|
||||
__bool__requiresUpdateSceneGraph,
|
||||
"Return true if there are pending updates to the scene graph that require a call to updateSceneGraph(double). ",
|
||||
"");
|
||||
I_Method1(void, updateSceneGraph, IN, double, currentFrameTime,
|
||||
I_Method1(void, updateSceneGraph, IN, const osg::FrameStamp &, frameStamp,
|
||||
Properties::VIRTUAL,
|
||||
__void__updateSceneGraph__double,
|
||||
__void__updateSceneGraph__C5_osg_FrameStamp_R1,
|
||||
"Merge the changes to the scene graph. ",
|
||||
"");
|
||||
I_Method0(int, cancel,
|
||||
|
||||
@@ -131,6 +131,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow)
|
||||
__void__grabFocusIfPointerInWindow,
|
||||
"Get focus on if the pointer is in this window. ",
|
||||
"");
|
||||
I_Method0(void, raiseWindow,
|
||||
Properties::VIRTUAL,
|
||||
__void__raiseWindow,
|
||||
"Raise the window to the top. ",
|
||||
"");
|
||||
I_Method1(void, setWindowName, IN, const std::string &, x,
|
||||
Properties::VIRTUAL,
|
||||
__void__setWindowName__C5_std_string_R1,
|
||||
@@ -305,6 +310,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindowEmbedded)
|
||||
__void__grabFocusIfPointerInWindow,
|
||||
"Get focus on if the pointer is in this window. ",
|
||||
"");
|
||||
I_Method0(void, raiseWindow,
|
||||
Properties::VIRTUAL,
|
||||
__void__raiseWindow,
|
||||
"Raise the window to the top. ",
|
||||
"");
|
||||
END_REFLECTOR
|
||||
|
||||
BEGIN_VALUE_REFLECTOR(osgViewer::GraphicsWindowFunctionProxy)
|
||||
|
||||
Reference in New Issue
Block a user