Updated wrappers and dev release version numbers

This commit is contained in:
Robert Osfield 2009-03-05 15:31:03 +00:00
parent 9eac90b8cb
commit 43a081ee98
4 changed files with 201 additions and 4 deletions

View File

@ -28,8 +28,8 @@ PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
SET(OPENSCENEGRAPH_MINOR_VERSION 9)
SET(OPENSCENEGRAPH_PATCH_VERSION 0)
SET(OPENSCENEGRAPH_SOVERSION 55)
SET(OPENSCENEGRAPH_PATCH_VERSION 1)
SET(OPENSCENEGRAPH_SOVERSION 56)
# set to 0 when not a release candidate, non zero means that any generated
# svn tags will be treated as release candidates of given number

View File

@ -21,8 +21,8 @@ extern "C" {
#define OPENSCENEGRAPH_MAJOR_VERSION 2
#define OPENSCENEGRAPH_MINOR_VERSION 9
#define OPENSCENEGRAPH_PATCH_VERSION 0
#define OPENSCENEGRAPH_SOVERSION 55
#define OPENSCENEGRAPH_PATCH_VERSION 1
#define OPENSCENEGRAPH_SOVERSION 56
/**
* osgGetVersion() returns the library version number.

View File

@ -0,0 +1,134 @@
// ***************************************************************************
//
// Generated automatically by genwrapper.
// Please DO NOT EDIT this file!
//
// ***************************************************************************
#include <osgIntrospection/ReflectionMacros>
#include <osgIntrospection/TypedMethodInfo>
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/AudioStream>
#include <osg/CopyOp>
#include <osg/Object>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
#undef IN
#endif
#ifdef OUT
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AudioSink)
I_DeclaringFile("osg/AudioStream");
I_BaseType(osg::Object);
I_Constructor0(____AudioSink,
"",
"");
I_Method0(void, startPlaying,
Properties::PURE_VIRTUAL,
__void__startPlaying,
"",
"");
I_Method0(bool, playing,
Properties::PURE_VIRTUAL,
__bool__playing,
"",
"");
I_Method0(double, getDelay,
Properties::VIRTUAL,
__double__getDelay,
"",
"");
I_Method1(void, setDelay, IN, const double, delay,
Properties::VIRTUAL,
__void__setDelay__C5_double,
"",
"");
I_Method0(const char *, libraryName,
Properties::VIRTUAL,
__C5_char_P1__libraryName,
"return the name of the object's library. ",
"Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
I_Method0(const char *, className,
Properties::VIRTUAL,
__C5_char_P1__className,
"return the name of the object's class type. ",
"Must be defined by derived classes. ");
I_SimpleProperty(double, Delay,
__double__getDelay,
0);
END_REFLECTOR
BEGIN_ENUM_REFLECTOR(osg::AudioStream::SampleFormat)
I_DeclaringFile("osg/AudioStream");
I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_U8);
I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_S16);
I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_S24);
I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_S32);
I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_F32);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AudioStream)
I_DeclaringFile("osg/AudioStream");
I_BaseType(osg::Object);
I_Constructor0(____AudioStream,
"",
"");
I_ConstructorWithDefaults2(IN, const osg::AudioStream &, audio, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____AudioStream__C5_AudioStream_R1__C5_CopyOp_R1,
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
"");
I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
Properties::VIRTUAL,
__bool__isSameKindAs__C5_Object_P1,
"",
"");
I_Method0(const char *, libraryName,
Properties::VIRTUAL,
__C5_char_P1__libraryName,
"return the name of the object's library. ",
"Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
I_Method0(const char *, className,
Properties::VIRTUAL,
__C5_char_P1__className,
"return the name of the object's class type. ",
"Must be defined by derived classes. ");
I_Method1(void, setAudioSink, IN, osg::AudioSink *, audio_sink,
Properties::PURE_VIRTUAL,
__void__setAudioSink__osg_AudioSink_P1,
"",
"");
I_Method2(void, consumeAudioBuffer, IN, void *const, buffer, IN, const size_t, size,
Properties::PURE_VIRTUAL,
__void__consumeAudioBuffer__void_P1C5__C5_size_t,
"",
"");
I_Method0(bool, audioStream,
Properties::PURE_VIRTUAL,
__bool__audioStream,
"",
"");
I_Method0(int, audioFrequency,
Properties::PURE_VIRTUAL,
__int__audioFrequency,
"",
"");
I_Method0(int, audioNbChannels,
Properties::PURE_VIRTUAL,
__int__audioNbChannels,
"",
"");
I_Method0(osg::AudioStream::SampleFormat, audioSampleFormat,
Properties::PURE_VIRTUAL,
__SampleFormat__audioSampleFormat,
"",
"");
I_SimpleProperty(osg::AudioSink *, AudioSink,
0,
__void__setAudioSink__osg_AudioSink_P1);
END_REFLECTOR

View File

@ -10,6 +10,7 @@
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/AudioStream>
#include <osg/CopyOp>
#include <osg/Image>
#include <osg/ImageStream>
@ -37,6 +38,8 @@ BEGIN_ENUM_REFLECTOR(osg::ImageStream::LoopingMode)
I_EnumLabel(osg::ImageStream::LOOPING);
END_REFLECTOR
TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::AudioStream > >, osg::ImageStream::AudioStreams)
BEGIN_OBJECT_REFLECTOR(osg::ImageStream)
I_DeclaringFile("osg/ImageStream");
I_BaseType(osg::Image);
@ -152,12 +155,30 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream)
__float__getVolume,
"",
"");
I_Method1(void, setAudioStreams, IN, const osg::ImageStream::AudioStreams &, asl,
Properties::NON_VIRTUAL,
__void__setAudioStreams__C5_AudioStreams_R1,
"",
"");
I_Method0(osg::ImageStream::AudioStreams &, getAudioStreams,
Properties::NON_VIRTUAL,
__AudioStreams_R1__getAudioStreams,
"",
"");
I_Method0(const osg::ImageStream::AudioStreams &, getAudioStreams,
Properties::NON_VIRTUAL,
__C5_AudioStreams_R1__getAudioStreams,
"",
"");
I_ProtectedMethod0(void, applyLoopingMode,
Properties::VIRTUAL,
Properties::NON_CONST,
__void__applyLoopingMode,
"",
"");
I_SimpleProperty(const osg::ImageStream::AudioStreams &, AudioStreams,
__C5_AudioStreams_R1__getAudioStreams,
__void__setAudioStreams__C5_AudioStreams_R1);
I_SimpleProperty(double, Length,
__double__getLength,
0);
@ -178,3 +199,45 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream)
__void__setVolume__float);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::AudioStream >)
I_DeclaringFile("osg/ref_ptr");
I_Constructor0(____ref_ptr,
"",
"");
I_Constructor1(IN, osg::AudioStream *, ptr,
Properties::NON_EXPLICIT,
____ref_ptr__T_P1,
"",
"");
I_Constructor1(IN, const osg::ref_ptr< osg::AudioStream > &, rp,
Properties::NON_EXPLICIT,
____ref_ptr__C5_ref_ptr_R1,
"",
"");
I_Method0(osg::AudioStream *, get,
Properties::NON_VIRTUAL,
__T_P1__get,
"",
"");
I_Method0(bool, valid,
Properties::NON_VIRTUAL,
__bool__valid,
"",
"");
I_Method0(osg::AudioStream *, release,
Properties::NON_VIRTUAL,
__T_P1__release,
"",
"");
I_Method1(void, swap, IN, osg::ref_ptr< osg::AudioStream > &, rp,
Properties::NON_VIRTUAL,
__void__swap__ref_ptr_R1,
"",
"");
I_SimpleProperty(osg::AudioStream *, ,
__T_P1__get,
0);
END_REFLECTOR
STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::AudioStream > >)