From Tree, updates to osgText and freetype plugin to support are kerning paramter.

include/osgText/Font

@@ -29,6 +29,13 @@ namespace osgText {
 class Font;
 class Text;
 
+enum KerningType
+{
+    KERNING_DEFAULT,    //default locked to integer kerning values
+    KERNING_UNFITTED,    //use floating point value for kerning
+    KERNING_NONE,        //no kerning
+};
+
 /** read a font from specified file.*/
 extern OSGTEXT_EXPORT Font* readFontFile(const std::string& filename);
 
@@ -62,12 +69,12 @@ public:
     unsigned int getWidth();
     unsigned int getHeight();
 
+    /** Get a kerning (adjustment of spacing of two adjacent character) for specified charcodes, w.r.t the current font size hint.*/
+    virtual osg::Vec2 getKerning(unsigned int leftcharcode,unsigned int rightcharcode, KerningType kerningType);
+
     /** Get a Glyph for specified charcode, and the font size nearest to the current font size hint.*/
     virtual Glyph* getGlyph(unsigned int charcode);
     
-    /** Get a kerning (adjustment of spacing of two adjacent character) for specified charcodes, w.r.t the current font size hint.*/
-    virtual osg::Vec2 getKerning(unsigned int leftcharcode,unsigned int rightcharcode);
-    
     /** Return true if this font provides vertical alignments and spacing or glyphs.*/
     virtual bool hasVertical() const;
 
@@ -149,7 +156,7 @@ public:
         virtual Glyph* getGlyph(unsigned int charcode) = 0;
 
         /** Get a kerning (adjustment of spacing of two adjacent character) for specified charcodes, w.r.t the current font size hint.*/
-        virtual osg::Vec2 getKerning(unsigned int leftcharcode,unsigned int rightcharcode) = 0;
+        virtual osg::Vec2 getKerning(unsigned int leftcharcode,unsigned int rightcharcode, KerningType kerningType) = 0;
 
         /** Return true if this font provides vertical alignments and spacing or glyphs.*/
         virtual bool hasVertical() const = 0;
@@ -166,7 +173,6 @@ public:
         Font* _facade;
     };
 
-
     class OSGTEXT_EXPORT GlyphTexture : public osg::Texture2D
     {
     public:

include/osgText/Text

@@ -211,7 +211,10 @@ public:
     
     unsigned int getDrawMode() const { return _drawMode; }
 
-   
+    void setKerningType(KerningType kerningType) { _kerningType = kerningType; }
+
+    KerningType getKerningType() const { return _kerningType; }
+
     /** Draw the text.*/
     virtual void drawImplementation(osg::State& state) const;
 
@@ -266,13 +269,12 @@ public:
     typedef std::map<osg::ref_ptr<osg::StateSet>,GlyphQuads> TextureGlyphQuadMap;
 
     /** Direct Access to GlyphQuads */
-    const GlyphQuads* getGlyphQuad(unsigned int index) const
+    const GlyphQuads* getGlyphQuads(osg::StateSet* stateSet) const 
     {
-        if (index>=_textureGlyphQuadMap.size()) return NULL;
+        TextureGlyphQuadMap::iterator itGlyphQuad = _textureGlyphQuadMap.find(stateSet);
+        if (itGlyphQuad == _textureGlyphQuadMap.end()) return NULL;
 
-        TextureGlyphQuadMap::const_iterator itGlyph = _textureGlyphQuadMap.begin();
-        while((index--) && (itGlyph!=_textureGlyphQuadMap.end())) itGlyph++;
-        return &itGlyph->second;
+        return &itGlyphQuad->second;
     }
 
 protected:
@@ -303,6 +305,7 @@ protected:
     Layout                                  _layout;
     osg::Vec4                               _color;
     unsigned int                            _drawMode;
+    KerningType                                _kerningType;
 
     // iternal map used for rendering. Set up by the computeGlyphRepresentation() method.
     mutable TextureGlyphQuadMap            _textureGlyphQuadMap;