From c6c5cdaf89f944421534cdcf6559b57743b4650e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 15 Aug 2008 13:06:18 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/ImageSequence.cpp | 28 +++++++++ src/osgWrappers/osg/ImageStream.cpp | 5 ++ .../osgUtil/IntersectionVisitor.cpp | 59 +++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/src/osgWrappers/osg/ImageSequence.cpp b/src/osgWrappers/osg/ImageSequence.cpp index d25cc614d..51dc3f47c 100644 --- a/src/osgWrappers/osg/ImageSequence.cpp +++ b/src/osgWrappers/osg/ImageSequence.cpp @@ -96,6 +96,26 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageSequence) __double__getTimeMultiplier, "", ""); + I_Method1(void, seek, IN, double, time, + Properties::VIRTUAL, + __void__seek__double, + "", + ""); + I_Method0(void, play, + Properties::VIRTUAL, + __void__play, + "", + ""); + I_Method0(void, pause, + Properties::VIRTUAL, + __void__pause, + "", + ""); + I_Method0(void, rewind, + Properties::VIRTUAL, + __void__rewind, + "", + ""); I_Method1(void, setMode, IN, osg::ImageSequence::Mode, mode, Properties::NON_VIRTUAL, __void__setMode__Mode, @@ -116,6 +136,11 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageSequence) __double__getDuration, "", ""); + I_Method0(double, getLength, + Properties::VIRTUAL, + __double__getLength, + "", + ""); I_Method1(void, addImageFile, IN, const std::string &, fileName, Properties::NON_VIRTUAL, __void__addImageFile__C5_std_string_R1, @@ -172,6 +197,9 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageSequence) I_SimpleProperty(osg::ImageSequence::Images &, Images, __Images_R1__getImages, 0); + I_SimpleProperty(double, Length, + __double__getLength, + 0); I_SimpleProperty(osg::ImageSequence::Mode, Mode, __Mode__getMode, __void__setMode__Mode); diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index b40eeb6ef..23e8fb8a9 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -77,6 +77,11 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream) __int__compare__C5_Image_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); + I_Method1(void, seek, IN, double, x, + Properties::VIRTUAL, + __void__seek__double, + "", + ""); I_Method0(void, play, Properties::VIRTUAL, __void__play, diff --git a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp index 75daa90f7..b3e0d7bd6 100644 --- a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -32,6 +33,12 @@ #undef OUT #endif +BEGIN_ENUM_REFLECTOR(osgUtil::IntersectionVisitor::LODSelectionMode) + I_DeclaringFile("osgUtil/IntersectionVisitor"); + I_EnumLabel(osgUtil::IntersectionVisitor::USE_HIGHEST_LEVEL_OF_DETAIL); + I_EnumLabel(osgUtil::IntersectionVisitor::USE_EYE_POINT_FOR_LOD_LEVEL_SELECTION); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) I_DeclaringFile("osgUtil/IntersectionVisitor"); I_BaseType(osg::NodeVisitor); @@ -179,6 +186,46 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) __C5_osg_RefMatrix_P1__getModelMatrix, "", ""); + I_Method1(void, setReferenceEyePoint, IN, const osg::Vec3 &, ep, + Properties::NON_VIRTUAL, + __void__setReferenceEyePoint__C5_osg_Vec3_R1, + "Set the reference eye point that is used for nodes that require an eye point to position themselves, such as billboards. ", + ""); + I_Method0(const osg::Vec3 &, getReferenceEyePoint, + Properties::NON_VIRTUAL, + __C5_osg_Vec3_R1__getReferenceEyePoint, + "Get the reference eye point. ", + ""); + I_Method1(void, setReferenceEyePointCoordinateFrame, IN, osgUtil::Intersector::CoordinateFrame, cf, + Properties::NON_VIRTUAL, + __void__setReferenceEyePointCoordinateFrame__Intersector_CoordinateFrame, + "Set the coordinate frame of the reference eye point. ", + ""); + I_Method0(osgUtil::Intersector::CoordinateFrame, getReferenceEyePointCoordinateFrame, + Properties::NON_VIRTUAL, + __Intersector_CoordinateFrame__getReferenceEyePointCoordinateFrame, + "Get the coordinate frame of the reference eye point. ", + ""); + I_Method0(osg::Vec3, getEyePoint, + Properties::VIRTUAL, + __osg_Vec3__getEyePoint, + "Get the eye point in the local coordinate frame a given traversal point. ", + ""); + I_Method1(void, setLODSelectionMode, IN, osgUtil::IntersectionVisitor::LODSelectionMode, mode, + Properties::NON_VIRTUAL, + __void__setLODSelectionMode__LODSelectionMode, + "Set the LOD selection scheme. ", + ""); + I_Method0(osgUtil::IntersectionVisitor::LODSelectionMode, getLODSelectionMode, + Properties::NON_VIRTUAL, + __LODSelectionMode__getLODSelectionMode, + "Get the LOD selection scheme. ", + ""); + I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale, + Properties::VIRTUAL, + __float__getDistanceToEyePoint__C5_osg_Vec3_R1__bool, + "Get the distance from a point to the eye point, distance value in local coordinate system. ", + "This is calculated using the pseudo-EyePoint (above) when doing LOD calculcations. "); I_Method1(void, apply, IN, osg::Node &, node, Properties::VIRTUAL, __void__apply__osg_Node_R1, @@ -257,9 +304,15 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) I_SimpleProperty(bool, DoDummyTraversal, __bool__getDoDummyTraversal, __void__setDoDummyTraversal__bool); + I_SimpleProperty(osg::Vec3, EyePoint, + __osg_Vec3__getEyePoint, + 0); I_SimpleProperty(osgUtil::Intersector *, Intersector, __Intersector_P1__getIntersector, __void__setIntersector__Intersector_P1); + I_SimpleProperty(osgUtil::IntersectionVisitor::LODSelectionMode, LODSelectionMode, + __LODSelectionMode__getLODSelectionMode, + __void__setLODSelectionMode__LODSelectionMode); I_SimpleProperty(osg::RefMatrix *, ModelMatrix, __osg_RefMatrix_P1__getModelMatrix, 0); @@ -269,6 +322,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) I_SimpleProperty(osgUtil::IntersectionVisitor::ReadCallback *, ReadCallback, __ReadCallback_P1__getReadCallback, __void__setReadCallback__ReadCallback_P1); + I_SimpleProperty(const osg::Vec3 &, ReferenceEyePoint, + __C5_osg_Vec3_R1__getReferenceEyePoint, + __void__setReferenceEyePoint__C5_osg_Vec3_R1); + I_SimpleProperty(osgUtil::Intersector::CoordinateFrame, ReferenceEyePointCoordinateFrame, + __Intersector_CoordinateFrame__getReferenceEyePointCoordinateFrame, + __void__setReferenceEyePointCoordinateFrame__Intersector_CoordinateFrame); I_SimpleProperty(bool, UseKdTreeWhenAvailable, __bool__getUseKdTreeWhenAvailable, __void__setUseKdTreeWhenAvailable__bool);