Fixed handling of Font implementations that don't handle multiple font resolutions.

2011-05-13 19:08:04 +00:00
parent 460f433ca7
commit fe1c75aa8a
10 changed files with 59 additions and 32 deletions
--- a/include/osgQt/QFontImplementation
+++ b/include/osgQt/QFontImplementation
@@ -30,16 +30,19 @@ public:

    virtual std::string getFileName() const;

-    void setFontResolution(const osgText::FontResolution& fontSize);
+    virtual bool supportsMultipleFontResolutions() const { return true; }
+    
    virtual osgText::Glyph* getGlyph(const osgText::FontResolution& fontRes, unsigned int charcode);
+    
    virtual osgText::Glyph3D* getGlyph3D(unsigned int charcode) { return 0; }
+    
    virtual osg::Vec2 getKerning(unsigned int leftcharcode, unsigned int rightcharcode, osgText::KerningType kerningType);
+    
    virtual bool hasVertical() const;

 protected:

    std::string             _filename;
-    osgText::FontResolution _currentRes;
    QFont                   _font;
 };