From 35435c314626e58da89357c82f492186151c1ab4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 11 Jul 2007 16:06:24 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/BufferObject.cpp | 6 +++--- src/osgWrappers/osg/DisplaySettings.cpp | 14 +++++++------- src/osgWrappers/osg/NodeTrackerCallback.cpp | 14 +++++++------- src/osgWrappers/osg/TexEnvCombine.cpp | 4 ++-- src/osgWrappers/osgGA/AnimationPathManipulator.cpp | 2 +- src/osgWrappers/osgGA/NodeTrackerManipulator.cpp | 14 +++++++------- src/osgWrappers/osgTerrain/Locator.cpp | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index 7ac1ce562..8a9743855 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -247,9 +247,9 @@ BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions) END_REFLECTOR -TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::DrawElements * >, osg::ElementBufferObject::BufferEntryDrawElementstPair) +TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::DrawElements * >, osg::ElementBufferObject::BufferEntryDrawElementsPair) -TYPE_NAME_ALIAS(std::vector< osg::ElementBufferObject::BufferEntryDrawElementstPair >, osg::ElementBufferObject::BufferEntryDrawElementsPairs) +TYPE_NAME_ALIAS(std::vector< osg::ElementBufferObject::BufferEntryDrawElementsPair >, osg::ElementBufferObject::BufferEntryDrawElementsPairs) BEGIN_OBJECT_REFLECTOR(osg::ElementBufferObject) I_DeclaringFile("osg/BufferObject"); @@ -497,7 +497,7 @@ STD_PAIR_REFLECTOR(std::pair< osg::BufferObject::BufferEntry COMMA osg::DrawEle STD_PAIR_REFLECTOR(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >) -STD_VECTOR_REFLECTOR(std::vector< osg::ElementBufferObject::BufferEntryDrawElementstPair >) +STD_VECTOR_REFLECTOR(std::vector< osg::ElementBufferObject::BufferEntryDrawElementsPair >) STD_VECTOR_REFLECTOR(std::vector< osg::VertexBufferObject::BufferEntryArrayPair >) diff --git a/src/osgWrappers/osg/DisplaySettings.cpp b/src/osgWrappers/osg/DisplaySettings.cpp index df753b0d1..98b8e9647 100644 --- a/src/osgWrappers/osg/DisplaySettings.cpp +++ b/src/osgWrappers/osg/DisplaySettings.cpp @@ -174,14 +174,14 @@ BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) __int__getSplitStereoVerticalSeparation, "", ""); - I_Method1(void, setSplitStereoAutoAjustAspectRatio, IN, bool, flag, + I_Method1(void, setSplitStereoAutoAdjustAspectRatio, IN, bool, flag, Properties::NON_VIRTUAL, - __void__setSplitStereoAutoAjustAspectRatio__bool, + __void__setSplitStereoAutoAdjustAspectRatio__bool, "", ""); - I_Method0(bool, getSplitStereoAutoAjustAspectRatio, + I_Method0(bool, getSplitStereoAutoAdjustAspectRatio, Properties::NON_VIRTUAL, - __bool__getSplitStereoAutoAjustAspectRatio, + __bool__getSplitStereoAutoAdjustAspectRatio, "", ""); I_Method1(void, setScreenWidth, IN, float, width, @@ -393,9 +393,9 @@ BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) I_SimpleProperty(float, ScreenWidth, __float__getScreenWidth, __void__setScreenWidth__float); - I_SimpleProperty(bool, SplitStereoAutoAjustAspectRatio, - __bool__getSplitStereoAutoAjustAspectRatio, - __void__setSplitStereoAutoAjustAspectRatio__bool); + I_SimpleProperty(bool, SplitStereoAutoAdjustAspectRatio, + __bool__getSplitStereoAutoAdjustAspectRatio, + __void__setSplitStereoAutoAdjustAspectRatio__bool); I_SimpleProperty(osg::DisplaySettings::SplitStereoHorizontalEyeMapping, SplitStereoHorizontalEyeMapping, __SplitStereoHorizontalEyeMapping__getSplitStereoHorizontalEyeMapping, __void__setSplitStereoHorizontalEyeMapping__SplitStereoHorizontalEyeMapping); diff --git a/src/osgWrappers/osg/NodeTrackerCallback.cpp b/src/osgWrappers/osg/NodeTrackerCallback.cpp index 3d4178ae6..f89fb2434 100644 --- a/src/osgWrappers/osg/NodeTrackerCallback.cpp +++ b/src/osgWrappers/osg/NodeTrackerCallback.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osg::NodeTrackerCallback::ObserveredNodePath) +TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osg::NodeTrackerCallback::ObserverNodePath) BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback) I_DeclaringFile("osg/NodeTrackerCallback"); @@ -35,14 +35,14 @@ BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback) __void__setTrackNodePath__C5_osg_NodePath_R1, "", ""); - I_Method1(void, setTrackNodePath, IN, const osg::NodeTrackerCallback::ObserveredNodePath &, nodePath, + I_Method1(void, setTrackNodePath, IN, const osg::NodeTrackerCallback::ObserverNodePath &, nodePath, Properties::NON_VIRTUAL, - __void__setTrackNodePath__C5_ObserveredNodePath_R1, + __void__setTrackNodePath__C5_ObserverNodePath_R1, "", ""); - I_Method0(osg::NodeTrackerCallback::ObserveredNodePath &, getTrackNodePath, + I_Method0(osg::NodeTrackerCallback::ObserverNodePath &, getTrackNodePath, Properties::NON_VIRTUAL, - __ObserveredNodePath_R1__getTrackNodePath, + __ObserverNodePath_R1__getTrackNodePath, "", ""); I_Method1(void, setTrackNode, IN, osg::Node *, node, @@ -73,8 +73,8 @@ BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback) I_SimpleProperty(osg::Node *, TrackNode, __osg_Node_P1__getTrackNode, __void__setTrackNode__osg_Node_P1); - I_SimpleProperty(osg::NodeTrackerCallback::ObserveredNodePath &, TrackNodePath, - __ObserveredNodePath_R1__getTrackNodePath, + I_SimpleProperty(osg::NodeTrackerCallback::ObserverNodePath &, TrackNodePath, + __ObserverNodePath_R1__getTrackNodePath, 0); END_REFLECTOR diff --git a/src/osgWrappers/osg/TexEnvCombine.cpp b/src/osgWrappers/osg/TexEnvCombine.cpp index 965ce47b9..7bd8cb31b 100644 --- a/src/osgWrappers/osg/TexEnvCombine.cpp +++ b/src/osgWrappers/osg/TexEnvCombine.cpp @@ -303,10 +303,10 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine) __bool__needsTexEnvCombiner__GLint, "", ""); - I_ProtectedMethod0(void, computeNeedoForTexEnvCombiners, + I_ProtectedMethod0(void, computeNeedForTexEnvCombiners, Properties::NON_VIRTUAL, Properties::NON_CONST, - __void__computeNeedoForTexEnvCombiners, + __void__computeNeedForTexEnvCombiners, "", ""); I_SimpleProperty(GLint, Combine_Alpha, diff --git a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp index 66657fec4..fc45148ac 100644 --- a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp @@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(void, setPrintOutTimingInfo, IN, bool, printOutTiminInfo, + I_Method1(void, setPrintOutTimingInfo, IN, bool, printOutTimingInfo, Properties::NON_VIRTUAL, __void__setPrintOutTimingInfo__bool, "", diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index 5de9edd9f..998ae1c8a 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osgGA::NodeTrackerManipulator::ObserveredNodePath) +TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osgGA::NodeTrackerManipulator::ObserverNodePath) BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::TrackerMode) I_DeclaringFile("osgGA/NodeTrackerManipulator"); @@ -57,14 +57,14 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) __void__setTrackNodePath__C5_osg_NodePath_R1, "", ""); - I_Method1(void, setTrackNodePath, IN, const osgGA::NodeTrackerManipulator::ObserveredNodePath &, nodePath, + I_Method1(void, setTrackNodePath, IN, const osgGA::NodeTrackerManipulator::ObserverNodePath &, nodePath, Properties::NON_VIRTUAL, - __void__setTrackNodePath__C5_ObserveredNodePath_R1, + __void__setTrackNodePath__C5_ObserverNodePath_R1, "", ""); - I_Method0(osgGA::NodeTrackerManipulator::ObserveredNodePath &, getTrackNodePath, + I_Method0(osgGA::NodeTrackerManipulator::ObserverNodePath &, getTrackNodePath, Properties::NON_VIRTUAL, - __ObserveredNodePath_R1__getTrackNodePath, + __ObserverNodePath_R1__getTrackNodePath, "", ""); I_Method1(void, setTrackNode, IN, osg::Node *, node, @@ -277,8 +277,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) I_SimpleProperty(osg::Node *, TrackNode, __osg_Node_P1__getTrackNode, __void__setTrackNode__osg_Node_P1); - I_SimpleProperty(osgGA::NodeTrackerManipulator::ObserveredNodePath &, TrackNodePath, - __ObserveredNodePath_R1__getTrackNodePath, + I_SimpleProperty(osgGA::NodeTrackerManipulator::ObserverNodePath &, TrackNodePath, + __ObserverNodePath_R1__getTrackNodePath, 0); I_SimpleProperty(osgGA::NodeTrackerManipulator::TrackerMode, TrackerMode, __TrackerMode__getTrackerMode, diff --git a/src/osgWrappers/osgTerrain/Locator.cpp b/src/osgWrappers/osgTerrain/Locator.cpp index 140736be3..69b6663b1 100644 --- a/src/osgWrappers/osgTerrain/Locator.cpp +++ b/src/osgWrappers/osgTerrain/Locator.cpp @@ -24,11 +24,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osgTerrain::CartizianLocator) +BEGIN_OBJECT_REFLECTOR(osgTerrain::CartesianLocator) I_DeclaringFile("osgTerrain/Locator"); I_BaseType(osgTerrain::Locator); I_ConstructorWithDefaults6(IN, double, originX, , IN, double, originY, , IN, double, lengthX, , IN, double, lengthY, , IN, double, height, 0.0f, IN, double, heightScale, 1.0f, - ____CartizianLocator__double__double__double__double__double__double, + ____CartesianLocator__double__double__double__double__double__double, "", ""); I_MethodWithDefaults6(void, setExtents, IN, double, originX, , IN, double, originY, , IN, double, lengthX, , IN, double, lengthY, , IN, double, height, 0.0f, IN, double, heightScale, 1.0f,