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 2007-01-30 14:47:13 +00:00
parent 77b9a7ae19
commit f8213d1c53
5 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Stats
View File

@ -27,7 +27,9 @@ class OSG_EXPORT Stats : public osg::Referenced
{ {
public: 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; } void setName(const std::string& name) { _name = name; }
const std::string& getName() const { return _name; } const std::string& getName() const { return _name; }

7
src/osg/Stats.cpp
View File

@ -16,6 +16,13 @@
using namespace osg; using namespace osg;
Stats::Stats(const std::string& name):
_name(name)
{
allocate(25);
}
Stats::Stats(const std::string& name, unsigned int numberOfFrames): Stats::Stats(const std::string& name, unsigned int numberOfFrames):
_name(name) _name(name)
{ {

28
src/osgWrappers/osg/Stats.cpp
View File

@ -28,10 +28,14 @@ TYPE_NAME_ALIAS(std::map< std::string COMMA bool >, osg::Stats::CollectMap);
BEGIN_OBJECT_REFLECTOR(osg::Stats) BEGIN_OBJECT_REFLECTOR(osg::Stats)
I_BaseType(osg::Referenced); I_BaseType(osg::Referenced);
I_ConstructorWithDefaults2(IN, const std::string &, name, , IN, unsigned int, numberOfFrames, 50, I_Constructor1(IN, const std::string &, name,
____Stats__C5_std_string_R1__unsigned_int, ____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, I_Method1(void, setName, IN, const std::string &, name,
__void__setName__C5_std_string_R1, __void__setName__C5_std_string_R1,
"", "",
@ -60,14 +64,14 @@ BEGIN_OBJECT_REFLECTOR(osg::Stats)
__bool__getAttribute__int__C5_std_string_R1__double_R1, __bool__getAttribute__int__C5_std_string_R1__double_R1,
"", "",
""); "");
I_Method2(bool, getAveragedAttribute, IN, const std::string &, attributeName, IN, double &, value, 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__getAveragedAttribute__C5_std_string_R1__double_R1__bool,
"", "",
""); "");
I_Method4(bool, getAveragedAttribute, IN, int, startFrameNumber, IN, int, endFrameNumber, IN, const std::string &, attributeName, IN, double &, value, 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__getAveragedAttribute__int__int__C5_std_string_R1__double_R1__bool,
"", "",
""); "");
I_Method1(osg::Stats::AttributeMap &, getAttributeMap, IN, int, frameNumber, I_Method1(osg::Stats::AttributeMap &, getAttributeMap, IN, int, frameNumber,
__AttributeMap_R1__getAttributeMap__int, __AttributeMap_R1__getAttributeMap__int,
"", "",

10
src/osgWrappers/osgDB/ReaderWriter.cpp
View File

@ -37,8 +37,8 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter)
I_Constructor0(____ReaderWriter, I_Constructor0(____ReaderWriter,
"", "",
""); "");
I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter &, rw, , IN, const osg::CopyOp, copyop, osg::CopyOp::SHALLOW_COPY, I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter &, rw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____ReaderWriter__C5_ReaderWriter_R1__C5_osg_CopyOp, ____ReaderWriter__C5_ReaderWriter_R1__C5_osg_CopyOp_R1,
"", "",
""); "");
I_Method0(osg::Object *, cloneType, 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, 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, __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, 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, __ReadResult__openArchive__std_istream_R1__C5_Options_P1,
@ -158,8 +158,8 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter::Options)
____Options__C5_std_string_R1, ____Options__C5_std_string_R1,
"", "",
""); "");
I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter::Options &, options, , IN, const osg::CopyOp, copyop, osg::CopyOp::SHALLOW_COPY, I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter::Options &, options, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____Options__C5_Options_R1__C5_osg_CopyOp, ____Options__C5_Options_R1__C5_osg_CopyOp_R1,
"", "",
""); "");
I_Method0(osg::Object *, cloneType, I_Method0(osg::Object *, cloneType,

13
src/osgWrappers/osgText/Text.cpp
View File

@ -219,11 +219,19 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text)
I_Method1(void, setMaximumHeight, IN, float, maximumHeight, I_Method1(void, setMaximumHeight, IN, float, maximumHeight,
__void__setMaximumHeight__float, __void__setMaximumHeight__float,
"Set the maximum height of the text box. ", "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, I_Method0(float, getMaximumHeight,
__float__getMaximumHeight, __float__getMaximumHeight,
"Get the maximum height of the text box. ", "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, I_Method1(void, setPosition, IN, const osg::Vec3 &, pos,
__void__setPosition__C5_osg_Vec3_R1, __void__setPosition__C5_osg_Vec3_R1,
"Set the position of text. ", "Set the position of text. ",
@ -487,6 +495,9 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text)
I_SimpleProperty(unsigned int, LineCount, I_SimpleProperty(unsigned int, LineCount,
__unsigned_int__getLineCount, __unsigned_int__getLineCount,
0); 0);
I_SimpleProperty(float, LineSpacing,
__float__getLineSpacing,
__void__setLineSpacing__float);
I_SimpleProperty(float, MaximumHeight, I_SimpleProperty(float, MaximumHeight,
__float__getMaximumHeight, __float__getMaximumHeight,
__void__setMaximumHeight__float); __void__setMaximumHeight__float);