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

Checked in Macro Jez's additions to osgText to support .osg IO make it

Browse Source 
a fully functioning NodeKit.

Also reimplement notify() to try an prevent a crash which has been caused by
to objects in notify.cpp being initiliazed twice, the second time the auto_ptr
holding the dev/null ofstream was being initilized to 0.
This commit is contained in:
Robert Osfield
2002-06-11 18:41:57 +00:00
parent e1ba8a6292
commit 247cb3ff7e
21 changed files with 958 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgText/Font
View File

@@ -85,7 +85,10 @@ class OSGTEXT_EXPORT Font : public osg::Object
int getPointSize(void) const { return _pointSize; }
int getTextureSize(void) const { return _textureSize; }
const std::string& getFontName();
const std::string& getFontName() const { return _fontName; }
/// Transfer font settings to another Font object and invalidate this one.
void copyAndInvalidate(Font &dest);
FTFont* getFont(void) { return _font; }

2
include/osgText/Paragraph
View File

@@ -36,7 +36,7 @@ class OSGTEXT_EXPORT Paragraph : public osg::Geode
const osg::Vec3& getPosition() const { return _position; }
void setAlignment(int alignment);
int getAlignment() { return _alignment; }
int getAlignment() const { return _alignment; }
float getHeight() const;

1
include/osgText/Text
View File

@@ -72,6 +72,7 @@ class OSGTEXT_EXPORT Text : public osg::Drawable
virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new Text(*this,copyop); }
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const Text*>(obj)!=NULL; }
virtual const char* className() const { return "Text"; }
virtual const char* libraryName() const { return "osgText"; }
void setPosition(const osg::Vec2& pos);
void setPosition(const osg::Vec3& pos);