From f8213d1c53ba1a15d5db944f4c2703bb7b20c11b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 30 Jan 2007 14:47:13 +0000 Subject: [PATCH] Updated wrappers --- include/osg/Stats | 4 +++- src/osg/Stats.cpp | 7 +++++++ src/osgWrappers/osg/Stats.cpp | 28 +++++++++++++++----------- src/osgWrappers/osgDB/ReaderWriter.cpp | 10 ++++----- src/osgWrappers/osgText/Text.cpp | 13 +++++++++++- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/include/osg/Stats b/include/osg/Stats index b99b1f903..51a579e75 100644 --- a/include/osg/Stats +++ b/include/osg/Stats @@ -27,7 +27,9 @@ class OSG_EXPORT Stats : public osg::Referenced { public: - Stats(const std::string& name, unsigned int numberOfFrames=50); + Stats(const std::string& name); + + Stats(const std::string& name, unsigned int numberOfFrames); void setName(const std::string& name) { _name = name; } const std::string& getName() const { return _name; } diff --git a/src/osg/Stats.cpp b/src/osg/Stats.cpp index 3626093ed..34d465b93 100644 --- a/src/osg/Stats.cpp +++ b/src/osg/Stats.cpp @@ -16,6 +16,13 @@ using namespace osg; +Stats::Stats(const std::string& name): + _name(name) +{ + allocate(25); +} + + Stats::Stats(const std::string& name, unsigned int numberOfFrames): _name(name) { diff --git a/src/osgWrappers/osg/Stats.cpp b/src/osgWrappers/osg/Stats.cpp index 55639f2e8..6abea30f7 100644 --- a/src/osgWrappers/osg/Stats.cpp +++ b/src/osgWrappers/osg/Stats.cpp @@ -28,10 +28,14 @@ TYPE_NAME_ALIAS(std::map< std::string COMMA bool >, osg::Stats::CollectMap); BEGIN_OBJECT_REFLECTOR(osg::Stats) I_BaseType(osg::Referenced); - I_ConstructorWithDefaults2(IN, const std::string &, name, , IN, unsigned int, numberOfFrames, 50, - ____Stats__C5_std_string_R1__unsigned_int, - "", - ""); + I_Constructor1(IN, const std::string &, name, + ____Stats__C5_std_string_R1, + "", + ""); + I_Constructor2(IN, const std::string &, name, IN, unsigned int, numberOfFrames, + ____Stats__C5_std_string_R1__unsigned_int, + "", + ""); I_Method1(void, setName, IN, const std::string &, name, __void__setName__C5_std_string_R1, "", @@ -60,14 +64,14 @@ BEGIN_OBJECT_REFLECTOR(osg::Stats) __bool__getAttribute__int__C5_std_string_R1__double_R1, "", ""); - I_Method2(bool, getAveragedAttribute, IN, const std::string &, attributeName, IN, double &, value, - __bool__getAveragedAttribute__C5_std_string_R1__double_R1, - "", - ""); - I_Method4(bool, getAveragedAttribute, IN, int, startFrameNumber, IN, int, endFrameNumber, IN, const std::string &, attributeName, IN, double &, value, - __bool__getAveragedAttribute__int__int__C5_std_string_R1__double_R1, - "", - ""); + I_MethodWithDefaults3(bool, getAveragedAttribute, IN, const std::string &, attributeName, , IN, double &, value, , IN, bool, averageInInverseSpace, false, + __bool__getAveragedAttribute__C5_std_string_R1__double_R1__bool, + "", + ""); + I_MethodWithDefaults5(bool, getAveragedAttribute, IN, int, startFrameNumber, , IN, int, endFrameNumber, , IN, const std::string &, attributeName, , IN, double &, value, , IN, bool, averageInInverseSpace, false, + __bool__getAveragedAttribute__int__int__C5_std_string_R1__double_R1__bool, + "", + ""); I_Method1(osg::Stats::AttributeMap &, getAttributeMap, IN, int, frameNumber, __AttributeMap_R1__getAttributeMap__int, "", diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index fbad43e53..61b799fba 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -37,8 +37,8 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) I_Constructor0(____ReaderWriter, "", ""); - I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter &, rw, , IN, const osg::CopyOp, copyop, osg::CopyOp::SHALLOW_COPY, - ____ReaderWriter__C5_ReaderWriter_R1__C5_osg_CopyOp, + I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter &, rw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____ReaderWriter__C5_ReaderWriter_R1__C5_osg_CopyOp_R1, "", ""); I_Method0(osg::Object *, cloneType, @@ -67,7 +67,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) ""); I_MethodWithDefaults4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, x, , IN, osgDB::ReaderWriter::ArchiveStatus, x, , IN, unsigned, int, 4096, IN, const osgDB::ReaderWriter::Options *, x, NULL, __ReadResult__openArchive__C5_std_string_R1__ArchiveStatus__unsigned__C5_Options_P1, - "open an archive for reading, writing or or to create an empty archive for writing to. ", + "open an archive for reading, writing, or to create an empty archive for writing to. ", ""); I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, openArchive, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL, __ReadResult__openArchive__std_istream_R1__C5_Options_P1, @@ -158,8 +158,8 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter::Options) ____Options__C5_std_string_R1, "", ""); - I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter::Options &, options, , IN, const osg::CopyOp, copyop, osg::CopyOp::SHALLOW_COPY, - ____Options__C5_Options_R1__C5_osg_CopyOp, + I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter::Options &, options, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____Options__C5_Options_R1__C5_osg_CopyOp_R1, "", ""); I_Method0(osg::Object *, cloneType, diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index a85049beb..c1de23665 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -219,11 +219,19 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text) I_Method1(void, setMaximumHeight, IN, float, maximumHeight, __void__setMaximumHeight__float, "Set the maximum height of the text box. ", - "With horizontal layouts any characters which do not fit are wrapped around. 0 or negative values indicate that no maximum height is set, lines can be as long as they need be to fit thre required text "); + "With horizontal layouts any characters which do not fit are wrapped around. 0 or negative values indicate that no maximum height is set, lines can be as long as they need be to fit the required text "); I_Method0(float, getMaximumHeight, __float__getMaximumHeight, "Get the maximum height of the text box. ", ""); + I_Method1(void, setLineSpacing, IN, float, lineSpacing, + __void__setLineSpacing__float, + "Set the line spacing of the text box, given as a percentage of the character height. ", + "The default value is 0 for backward compatibility. For longer paragraphs of text, a value of at least 25% (i.e. set line spacing to 0.25) is recommended. "); + I_Method0(float, getLineSpacing, + __float__getLineSpacing, + "Get the line spacing of the text box. ", + ""); I_Method1(void, setPosition, IN, const osg::Vec3 &, pos, __void__setPosition__C5_osg_Vec3_R1, "Set the position of text. ", @@ -487,6 +495,9 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text) I_SimpleProperty(unsigned int, LineCount, __unsigned_int__getLineCount, 0); + I_SimpleProperty(float, LineSpacing, + __float__getLineSpacing, + __void__setLineSpacing__float); I_SimpleProperty(float, MaximumHeight, __float__getMaximumHeight, __void__setMaximumHeight__float);