FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated wrappers.

Browse Source
This commit is contained in:
Robert Osfield
2006-02-27 19:51:32 +00:00
parent abed6b7951
commit a8255f6932
9 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VisualStudio/osg/osg.dsp
View File

@@ -912,6 +912,10 @@ SOURCE=..\..\Include\Osg\Quat
# End Source File
# Begin Source File
SOURCE=..\..\include\osg\observer_ptr
# End Source File
# Begin Source File
SOURCE=..\..\include\osg\ref_ptr
# End Source File
# Begin Source File

8
VisualStudio/osgWrappers/osg/wrapper_osg.dsp
View File

@@ -427,10 +427,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\ProxyNode.cpp
SOURCE=..\..\..\src\osgWrappers\osg\Quat.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgWrappers\osg\RefNodePath.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgWrappers\osg\Referenced.cpp
# End Source File
@@ -615,6 +611,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\VertexProgram.cpp
SOURCE=..\..\..\src\osgWrappers\osg\Viewport.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgWrappers\osg\observer_ptr.cpp
# End Source File
# End Group
# Begin Group "Header Files"

2
src/osgWrappers/osg/GNUmakefile
View File

@@ -85,7 +85,6 @@ CXXFILES =\
Projection.cpp\
ProxyNode.cpp\
Quat.cpp\
RefNodePath.cpp\
Referenced.cpp\
Scissor.cpp\
Sequence.cpp\
@@ -132,6 +131,7 @@ CXXFILES =\
Vec4ub.cpp\
VertexProgram.cpp\
Viewport.cpp\
observer_ptr.cpp\
LIBS += -losg -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS)

5
src/osgWrappers/osg/Node.cpp
View File

@@ -56,6 +56,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Node)
I_Method1(const osg::Group *, getParent, IN, unsigned int, i);
I_Method0(unsigned int, getNumParents);
I_MethodWithDefaults1(osg::NodePathList, getParentalNodePaths, IN, osg::Node *, haltTraversalAtNode, 0);
I_MethodWithDefaults1(osg::MatrixList, getWorldMatrices, IN, osg::Node *, haltTraversalAtNode, 0);
I_Method1(void, setUpdateCallback, IN, osg::NodeCallback *, nc);
I_Method0(osg::NodeCallback *, getUpdateCallback);
I_Method0(const osg::NodeCallback *, getUpdateCallback);
@@ -126,8 +127,12 @@ TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::NodePath);
TYPE_NAME_ALIAS(std::vector< osg::NodePath >, osg::NodePathList);
TYPE_NAME_ALIAS(std::vector< osg::Matrix >, osg::MatrixList);
STD_VECTOR_REFLECTOR(std::vector< osg::Group * >);
STD_VECTOR_REFLECTOR(std::vector< osg::Matrix >);
STD_VECTOR_REFLECTOR(std::vector< osg::NodePath >);
STD_VECTOR_REFLECTOR(std::vector< std::string >);

24
src/osgWrappers/osg/NodeTrackerCallback.cpp
View File

@@ -12,7 +12,6 @@
#include <osg/Node>
#include <osg/NodeTrackerCallback>
#include <osg/NodeVisitor>
#include <osg/RefNodePath>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -22,19 +21,34 @@
#undef OUT
#endif
TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osg::NodeTrackerCallback::ObserveredNodePath);
BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback)
I_BaseType(osg::NodeCallback);
I_Constructor0();
I_Method1(void, setTrackNodePath, IN, const osg::RefNodePath &, nodePath);
I_Method1(void, setTrackNodePath, IN, const osg::NodePath &, nodePath);
I_Method0(osg::RefNodePath &, getTrackNodePath);
I_Method0(const osg::RefNodePath &, getTrackNodePath);
I_Method1(void, setTrackNodePath, IN, const osg::NodeTrackerCallback::ObserveredNodePath &, nodePath);
I_Method0(osg::NodeTrackerCallback::ObserveredNodePath &, getTrackNodePath);
I_Method1(void, setTrackNode, IN, osg::Node *, node);
I_Method0(osg::Node *, getTrackNode);
I_Method0(const osg::Node *, getTrackNode);
I_Method1(void, update, IN, osg::Node &, node);
I_Method0(bool, validateNodePath);
I_Property(osg::Node *, TrackNode);
I_Property(const osg::RefNodePath &, TrackNodePath);
I_ReadOnlyProperty(osg::NodeTrackerCallback::ObserveredNodePath &, TrackNodePath);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osg::observer_ptr< osg::Node >)
I_BaseType(osg::Observer);
I_Constructor0();
I_Constructor1(IN, osg::Node *, t);
I_Constructor1(IN, const osg::observer_ptr< osg::Node > &, rp);
I_Method1(void, objectDeleted, IN, void *, ptr);
I_Method0(bool, valid);
I_Method0(osg::Node *, get);
I_Method0(const osg::Node *, get);
I_ReadOnlyProperty(osg::Node *, );
END_REFLECTOR
STD_VECTOR_REFLECTOR(std::vector< osg::observer_ptr< osg::Node > >);

3
src/osgWrappers/osg/Referenced.cpp
View File

@@ -10,6 +10,7 @@
#include <osgIntrospection/Attributes>
#include <osg/Referenced>
#include <osg/observer_ptr>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -35,6 +36,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Referenced)
I_Method0(void, unref);
I_Method0(void, unref_nodelete);
I_Method0(int, referenceCount);
I_Method1(void, addObserver, IN, osg::Observer *, observer_ptr);
I_Method1(void, removeObserver, IN, osg::Observer *, observer_ptr);
I_Property(bool, ThreadSafeRefUnref);
END_REFLECTOR

9
src/osgWrappers/osg/RefNodePath.cpp → src/osgWrappers/osg/observer_ptr.cpp
View File

@@ -9,8 +9,7 @@
#include <osgIntrospection/TypedMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/Node>
#include <osg/RefNodePath>
#include <osg/observer_ptr>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -20,10 +19,8 @@
#undef OUT
#endif
BEGIN_VALUE_REFLECTOR(osg::RefNodePath)
BEGIN_VALUE_REFLECTOR(osg::Observer)
I_Constructor0();
I_Constructor1(IN, const osg::RefNodePath &, refNodePath);
I_Constructor1(IN, const osg::NodePath &, nodePath);
I_Method0(bool, valid);
I_Method1(void, objectDeleted, IN, void *, x);
END_REFLECTOR

10
src/osgWrappers/osgGA/NodeTrackerManipulator.cpp
View File

@@ -12,7 +12,6 @@
#include <osg/ApplicationUsage>
#include <osg/Matrixd>
#include <osg/Node>
#include <osg/RefNodePath>
#include <osgGA/GUIActionAdapter>
#include <osgGA/GUIEventAdapter>
#include <osgGA/NodeTrackerManipulator>
@@ -26,6 +25,8 @@
#undef OUT
#endif
TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osgGA::NodeTrackerManipulator::ObserveredNodePath);
BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::TrackerMode)
I_EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER);
I_EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER_AND_AZIM);
@@ -41,10 +42,9 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator)
I_BaseType(osgGA::MatrixManipulator);
I_Constructor0();
I_Method0(const char *, className);
I_Method1(void, setTrackNodePath, IN, const osg::RefNodePath &, nodePath);
I_Method1(void, setTrackNodePath, IN, const osg::NodePath &, nodePath);
I_Method0(osg::RefNodePath &, getTrackNodePath);
I_Method0(const osg::RefNodePath &, getTrackNodePath);
I_Method1(void, setTrackNodePath, IN, const osgGA::NodeTrackerManipulator::ObserveredNodePath &, nodePath);
I_Method0(osgGA::NodeTrackerManipulator::ObserveredNodePath &, getTrackNodePath);
I_Method1(void, setTrackNode, IN, osg::Node *, node);
I_Method0(osg::Node *, getTrackNode);
I_Method0(const osg::Node *, getTrackNode);
@@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator)
I_Property(osg::Node *, Node);
I_Property(osgGA::NodeTrackerManipulator::RotationMode, RotationMode);
I_Property(osg::Node *, TrackNode);
I_Property(const osg::RefNodePath &, TrackNodePath);
I_ReadOnlyProperty(osgGA::NodeTrackerManipulator::ObserveredNodePath &, TrackNodePath);
I_Property(osgGA::NodeTrackerManipulator::TrackerMode, TrackerMode);
END_REFLECTOR

1
src/osgWrappers/osgProducer/Viewer.cpp
View File

@@ -15,7 +15,6 @@
#include <osg/Node>
#include <osg/NodeVisitor>
#include <osg/Quat>
#include <osg/RefNodePath>
#include <osg/Vec3>
#include <osgGA/EventVisitor>
#include <osgGA/KeySwitchMatrixManipulator>