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-12-24 15:37:15 +00:00
parent 5e89958623
commit 17b7f57814
4 changed files with 17 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/osgWrappers/osgText/Font.cpp
View File

@ -99,29 +99,14 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font)
__C5_osg_StateSet_P1__getStateSet,
"",
"");
I_Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height,
I_Method4(osg::Vec2, getKerning, IN, const osgText::FontResolution &, fontSize, IN, unsigned int, leftcharcode, IN, unsigned int, rightcharcode, IN, osgText::KerningType, kerningType,
Properties::VIRTUAL,
__void__setFontResolution__unsigned_int__unsigned_int,
"Set the pixel width and height hint. ",
"");
I_Method0(unsigned int, getFontWidth,
Properties::NON_VIRTUAL,
__unsigned_int__getFontWidth,
"",
"");
I_Method0(unsigned int, getFontHeight,
Properties::NON_VIRTUAL,
__unsigned_int__getFontHeight,
"",
"");
I_Method3(osg::Vec2, getKerning, IN, unsigned int, leftcharcode, IN, unsigned int, rightcharcode, IN, osgText::KerningType, kerningType,
Properties::VIRTUAL,
__osg_Vec2__getKerning__unsigned_int__unsigned_int__KerningType,
__osg_Vec2__getKerning__C5_FontResolution_R1__unsigned_int__unsigned_int__KerningType,
"Get a kerning (adjustment of spacing of two adjacent character) for specified charcodes, w.r.t the current font size hint. ",
"");
I_Method1(osgText::Font::Glyph *, getGlyph, IN, unsigned int, charcode,
I_Method2(osgText::Font::Glyph *, getGlyph, IN, const osgText::FontResolution &, fontSize, IN, unsigned int, charcode,
Properties::VIRTUAL,
__Glyph_P1__getGlyph__unsigned_int,
__Glyph_P1__getGlyph__C5_FontResolution_R1__unsigned_int,
"Get a Glyph for specified charcode, and the font size nearest to the current font size hint. ",
"");
I_Method0(bool, hasVertical,
@ -218,21 +203,15 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font)
__FontMutex_P1__getSerializeFontCallsMutex_S,
"Get the mutex that enables the serialization of calls to this font. ",
"");
I_ProtectedMethod4(void, addGlyph, IN, unsigned int, width, IN, unsigned int, height, IN, unsigned int, charcode, IN, osgText::Font::Glyph *, glyph,
I_ProtectedMethod3(void, addGlyph, IN, const osgText::FontResolution &, fontRes, IN, unsigned int, charcode, IN, osgText::Font::Glyph *, glyph,
Properties::NON_VIRTUAL,
Properties::NON_CONST,
__void__addGlyph__unsigned_int__unsigned_int__unsigned_int__Glyph_P1,
__void__addGlyph__C5_FontResolution_R1__unsigned_int__Glyph_P1,
"",
"");
I_SimpleProperty(std::string, FileName,
__std_string__getFileName,
0);
I_SimpleProperty(unsigned int, FontHeight,
__unsigned_int__getFontHeight,
0);
I_SimpleProperty(unsigned int, FontWidth,
__unsigned_int__getFontWidth,
0);
I_SimpleProperty(unsigned int, GlyphImageMargin,
__unsigned_int__getGlyphImageMargin,
__void__setGlyphImageMargin__unsigned_int);
@ -276,19 +255,14 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::FontImplementation)
__std_string__getFileName,
"",
"");
I_Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height,
I_Method2(osgText::Font::Glyph *, getGlyph, IN, const osgText::FontResolution &, fontRes, IN, unsigned int, charcode,
Properties::PURE_VIRTUAL,
__void__setFontResolution__unsigned_int__unsigned_int,
"Set the pixel width and height hint. ",
"");
I_Method1(osgText::Font::Glyph *, getGlyph, IN, unsigned int, charcode,
Properties::PURE_VIRTUAL,
__Glyph_P1__getGlyph__unsigned_int,
__Glyph_P1__getGlyph__C5_FontResolution_R1__unsigned_int,
"Get a Glyph for specified charcode, and the font size nearest to the current font size hint. ",
"");
I_Method3(osg::Vec2, getKerning, IN, unsigned int, leftcharcode, IN, unsigned int, rightcharcode, IN, osgText::KerningType, kerningType,
I_Method4(osg::Vec2, getKerning, IN, const osgText::FontResolution &, fontRes, IN, unsigned int, leftcharcode, IN, unsigned int, rightcharcode, IN, osgText::KerningType, kerningType,
Properties::PURE_VIRTUAL,
__osg_Vec2__getKerning__unsigned_int__unsigned_int__KerningType,
__osg_Vec2__getKerning__C5_FontResolution_R1__unsigned_int__unsigned_int__KerningType,
"Get a kerning (adjustment of spacing of two adjacent character) for specified charcodes, w.r.t the current font size hint. ",
"");
I_Method0(bool, hasVertical,
@ -296,30 +270,14 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::FontImplementation)
__bool__hasVertical,
"Return true if this font provides vertical alignments and spacing or glyphs. ",
"");
I_Method1(void, setFontWidth, IN, unsigned int, width,
I_Method3(void, addGlyph, IN, const osgText::FontResolution &, fontRes, IN, unsigned int, charcode, IN, osgText::Font::Glyph *, glyph,
Properties::NON_VIRTUAL,
__void__setFontWidth__unsigned_int,
"",
"");
I_Method1(void, setFontHeight, IN, unsigned int, height,
Properties::NON_VIRTUAL,
__void__setFontHeight__unsigned_int,
"",
"");
I_Method4(void, addGlyph, IN, unsigned int, width, IN, unsigned int, height, IN, unsigned int, charcode, IN, osgText::Font::Glyph *, glyph,
Properties::NON_VIRTUAL,
__void__addGlyph__unsigned_int__unsigned_int__unsigned_int__Glyph_P1,
__void__addGlyph__C5_FontResolution_R1__unsigned_int__Glyph_P1,
"",
"");
I_SimpleProperty(std::string, FileName,
__std_string__getFileName,
0);
I_SimpleProperty(unsigned int, FontHeight,
0,
__void__setFontHeight__unsigned_int);
I_SimpleProperty(unsigned int, FontWidth,
0,
__void__setFontWidth__unsigned_int);
I_PublicMemberProperty(osgText::Font *, _facade);
END_REFLECTOR

2
src/osgWrappers/osgText/Font3D.cpp
View File

@ -70,7 +70,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font3D)
I_Method0(unsigned int, getFontWidth,
Properties::NON_VIRTUAL,
__unsigned_int__getFontWidth,
"Set the pixel width and height hint. ",
"",
"");
I_Method0(unsigned int, getFontHeight,
Properties::NON_VIRTUAL,

4
src/osgWrappers/osgText/KerningType.cpp
View File

@ -20,6 +20,8 @@
#undef OUT
#endif
TYPE_NAME_ALIAS(std::pair< unsigned int COMMA unsigned int >, osgText::FontResolution)
BEGIN_ENUM_REFLECTOR(osgText::KerningType)
I_DeclaringFile("osgText/KerningType");
I_EnumLabel(osgText::KERNING_DEFAULT);
@ -27,3 +29,5 @@ BEGIN_ENUM_REFLECTOR(osgText::KerningType)
I_EnumLabel(osgText::KERNING_NONE);
END_REFLECTOR
STD_PAIR_REFLECTOR(std::pair< unsigned int COMMA unsigned int >)

2
src/osgWrappers/osgUtil/Statistics.cpp
View File

@ -328,8 +328,6 @@ STD_MAP_REFLECTOR(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >)
STD_MAP_REFLECTOR(std::map< GLenum COMMA unsigned int >)
STD_PAIR_REFLECTOR(std::pair< unsigned int COMMA unsigned int >)
STD_SET_REFLECTOR(std::set< osg::Drawable * >)
STD_SET_REFLECTOR(std::set< osg::StateSet * >)