FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganised the managment of margins around glyphs so that is done entirely

Browse Source 
with src/osgText/Font.cpp rather than the font plugins or Text.cpp
This commit is contained in:
Robert Osfield
2007-05-04 12:05:29 +00:00
parent 0ad6aae023
commit dadb92ea64
7 changed files with 176 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/osgWrappers/osgTerrain/Locator.cpp
View File

@@ -24,15 +24,95 @@
#undef OUT
#endif
BEGIN_OBJECT_REFLECTOR(osgTerrain::EllipsoidLocator)
BEGIN_OBJECT_REFLECTOR(osgTerrain::CartizianLocator)
I_BaseType(osgTerrain::Locator);
I_ConstructorWithDefaults5(IN, double, longitude, , IN, double, latitude, , IN, double, deltaLongitude, , IN, double, deltaLatitude, , IN, double, height, 0.0,
____EllipsoidLocator__double__double__double__double__double,
I_ConstructorWithDefaults6(IN, double, originX, , IN, double, originY, , IN, double, lengthX, , IN, double, lengthY, , IN, double, height, 0.0f, IN, double, heightScale, 1.0f,
____CartizianLocator__double__double__double__double__double__double,
"",
"");
I_MethodWithDefaults5(void, setExtents, IN, double, longitude, , IN, double, latitude, , IN, double, deltaLongitude, , IN, double, deltaLatitude, , IN, double, height, 0.0,
I_MethodWithDefaults6(void, setExtents, IN, double, originX, , IN, double, originY, , IN, double, lengthX, , IN, double, lengthY, , IN, double, height, 0.0f, IN, double, heightScale, 1.0f,
Properties::NON_VIRTUAL,
__void__setExtents__double__double__double__double__double,
__void__setExtents__double__double__double__double__double__double,
"",
"");
I_Method1(void, setOriginX, IN, double, x,
Properties::NON_VIRTUAL,
__void__setOriginX__double,
"",
"");
I_Method0(double, getOriginX,
Properties::NON_VIRTUAL,
__double__getOriginX,
"",
"");
I_Method1(void, setOriginY, IN, double, y,
Properties::NON_VIRTUAL,
__void__setOriginY__double,
"",
"");
I_Method0(double, getOriginY,
Properties::NON_VIRTUAL,
__double__getOriginY,
"",
"");
I_Method1(void, setLengthX, IN, double, x,
Properties::NON_VIRTUAL,
__void__setLengthX__double,
"",
"");
I_Method0(double, getLengthX,
Properties::NON_VIRTUAL,
__double__getLengthX,
"",
"");
I_Method1(void, setLengthY, IN, double, y,
Properties::NON_VIRTUAL,
__void__setLengthY__double,
"",
"");
I_Method0(double, getLengthY,
Properties::NON_VIRTUAL,
__double__getLengthY,
"",
"");
I_Method0(bool, orientationOpenGL,
Properties::VIRTUAL,
__bool__orientationOpenGL,
"",
"");
I_Method2(bool, convertLocalToModel, IN, const osg::Vec3d &, local, IN, osg::Vec3d &, world,
Properties::VIRTUAL,
__bool__convertLocalToModel__C5_osg_Vec3d_R1__osg_Vec3d_R1,
"",
"");
I_Method2(bool, convertModelToLocal, IN, const osg::Vec3d &, world, IN, osg::Vec3d &, local,
Properties::VIRTUAL,
__bool__convertModelToLocal__C5_osg_Vec3d_R1__osg_Vec3d_R1,
"",
"");
I_SimpleProperty(double, LengthX,
__double__getLengthX,
__void__setLengthX__double);
I_SimpleProperty(double, LengthY,
__double__getLengthY,
__void__setLengthY__double);
I_SimpleProperty(double, OriginX,
__double__getOriginX,
__void__setOriginX__double);
I_SimpleProperty(double, OriginY,
__double__getOriginY,
__void__setOriginY__double);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgTerrain::EllipsoidLocator)
I_BaseType(osgTerrain::Locator);
I_ConstructorWithDefaults6(IN, double, longitude, , IN, double, latitude, , IN, double, deltaLongitude, , IN, double, deltaLatitude, , IN, double, height, 0.0, IN, double, heightScale, 1.0f,
____EllipsoidLocator__double__double__double__double__double__double,
"",
"");
I_MethodWithDefaults6(void, setExtents, IN, double, longitude, , IN, double, latitude, , IN, double, deltaLongitude, , IN, double, deltaLatitude, , IN, double, height, 0.0, IN, double, heightScale, 1.0f,
Properties::NON_VIRTUAL,
__void__setExtents__double__double__double__double__double__double,
"",
"");
I_Method0(double, getLongitude,

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

@@ -129,12 +129,22 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font)
Properties::NON_VIRTUAL,
__void__setGlyphImageMargin__unsigned_int,
"Set the margin around each glyph, to ensure that texture filtering doesn't bleed adjacent glyph's into each other. ",
"Default margin is 2 texels. ");
"Default margin is 1 texels. ");
I_Method0(unsigned int, getGlyphImageMargin,
Properties::NON_VIRTUAL,
__unsigned_int__getGlyphImageMargin,
"",
"");
I_Method1(void, setGlyphImageMarginRatio, IN, float, margin,
Properties::NON_VIRTUAL,
__void__setGlyphImageMarginRatio__float,
"Set the margin ratio around each glyph, relative to the glyph's size. ",
"to ensure that texture filtering doesn't bleed adjacent glyph's into each other. Default margin is 0.05. ");
I_Method0(float, getGlyphImageMarginRatio,
Properties::NON_VIRTUAL,
__float__getGlyphImageMarginRatio,
"",
"");
I_Method2(void, setTextureSizeHint, IN, unsigned int, width, IN, unsigned int, height,
Properties::NON_VIRTUAL,
__void__setTextureSizeHint__unsigned_int__unsigned_int,
@@ -218,6 +228,9 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font)
I_SimpleProperty(unsigned int, GlyphImageMargin,
__unsigned_int__getGlyphImageMargin,
__void__setGlyphImageMargin__unsigned_int);
I_SimpleProperty(float, GlyphImageMarginRatio,
__float__getGlyphImageMarginRatio,
__void__setGlyphImageMarginRatio__float);
I_SimpleProperty(osgText::Font::FontImplementation *, Implementation,
__FontImplementation_P1__getImplementation,
__void__setImplementation__FontImplementation_P1);
@@ -468,6 +481,16 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font::GlyphTexture)
__unsigned_int__getGlyphImageMargin,
"",
"");
I_Method1(void, setGlyphImageMarginRatio, IN, float, margin,
Properties::NON_VIRTUAL,
__void__setGlyphImageMarginRatio__float,
"",
"");
I_Method0(float, getGlyphImageMarginRatio,
Properties::NON_VIRTUAL,
__float__getGlyphImageMarginRatio,
"",
"");
I_Method3(bool, getSpaceForGlyph, IN, osgText::Font::Glyph *, glyph, IN, int &, posX, IN, int &, posY,
Properties::NON_VIRTUAL,
__bool__getSpaceForGlyph__Glyph_P1__int_R1__int_R1,
@@ -496,6 +519,9 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font::GlyphTexture)
I_SimpleProperty(unsigned int, GlyphImageMargin,
__unsigned_int__getGlyphImageMargin,
__void__setGlyphImageMargin__unsigned_int);
I_SimpleProperty(float, GlyphImageMarginRatio,
__float__getGlyphImageMarginRatio,
__void__setGlyphImageMarginRatio__float);
I_SimpleProperty(bool, ThreadSafeRefUnref,
0,
__void__setThreadSafeRefUnref__bool);