Make ~Program virtual

Rename Parser -> DataFile
Utilize string codecs in Font

diff --git a/source/font.cpp b/source/font.cpp
index 956acb462324dddb2603442981ef476f98be6d1f..2cab462c04e9eaef76b27066d327cebb15a93396 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -16,12 +16,18 @@ Font::Font():
        varray((TEXCOORD2, VERTEX2))
 { }
 
        varray((TEXCOORD2, VERTEX2))
 { }
 

+Font::~Font()
+{
+       if(own_tex)
+               delete tex;
+}
+

 void Font::set_texture(const Texture2D &t)
 {
        tex=&t;
 }
 
 void Font::set_texture(const Texture2D &t)
 {
        tex=&t;
 }
 

-void Font::add_glyph(wchar_t code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)
+void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)

 {
        Glyph glyph;
        glyph.code=code;
 {
        Glyph glyph;
        glyph.code=code;


@@ -51,12 +57,12 @@ float Font::get_string_width(const string &str) const
        return x;
 }
 
        return x;
 }
 

-float Font::get_string_width(const wstring &str) const
+float Font::get_string_width(const string &str, Codecs::Decoder &dec) const

 {
        float x=0;
 
 {
        float x=0;
 

-       for(wstring::const_iterator i=str.begin(); i!=str.end(); ++i)
-               x+=get_glyph_advance(*i);
+       for(string::const_iterator i=str.begin(); i!=str.end();)
+               x+=get_glyph_advance(dec.decode_char(str, i));

 
        return x;
 }
 
        return x;
 }


@@ -71,22 +77,16 @@ void Font::draw_string(const string &str) const
        glPopMatrix();
 }
 
        glPopMatrix();
 }
 

-void Font::draw_string(const wstring &str) const
+void Font::draw_string(const string &str, Codecs::Decoder &dec) const

 {
        prepare_render();
 
 {
        prepare_render();
 

-       for(wstring::const_iterator i=str.begin(); i!=str.end(); ++i)
-               draw_glyph(*i);
+       for(string::const_iterator i=str.begin(); i!=str.end();)
+               draw_glyph(dec.decode_char(str, i));

 
        glPopMatrix();
 }
 
 
        glPopMatrix();
 }
 

-Font::~Font()
-{
-       if(own_tex)
-               delete tex;
-}
-

 void Font::create_glyph_vertices()
 {
        varray.clear();
 void Font::create_glyph_vertices()
 {
        varray.clear();


@@ -119,7 +119,7 @@ void Font::prepare_render() const
        glPushMatrix();
 }
 
        glPushMatrix();
 }
 

-void Font::draw_glyph(wchar_t code) const
+void Font::draw_glyph(unsigned code) const

 {
        GlyphMap::const_iterator i=glyphs.find(code);
        if(i==glyphs.end())
 {
        GlyphMap::const_iterator i=glyphs.find(code);
        if(i==glyphs.end())


@@ -130,7 +130,7 @@ void Font::draw_glyph(wchar_t code) const
        glTranslatef(i->second.advance, 0, 0);
 }
 
        glTranslatef(i->second.advance, 0, 0);
 }
 

-float Font::get_glyph_advance(wchar_t code) const
+float Font::get_glyph_advance(unsigned code) const

 {
        GlyphMap::const_iterator i=glyphs.find(code);
        if(i==glyphs.end())
 {
        GlyphMap::const_iterator i=glyphs.find(code);
        if(i==glyphs.end())

diff --git a/source/font.h b/source/font.h
index 609f272316433866580b1797941fe95b69e05865..278a14aa82ab53fd3cd2c57172f3dbbb3d33fe7a 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -3,7 +3,8 @@
 
 #include <map>
 #include <string>
 
 #include <map>
 #include <string>

-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
+#include <msp/strings/codec.h>

 #include "vertexarray.h"
 
 namespace Msp {
 #include "vertexarray.h"
 
 namespace Msp {


@@ -14,7 +15,7 @@ class Texture2D;
 class Font
 {
 public:
 class Font
 {
 public:

-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::Loader

        {
        public:
                Loader(Font &);
        {
        public:
                Loader(Font &);


@@ -28,22 +29,37 @@ public:
        };
 
        Font();
        };
 
        Font();

+       ~Font();
+

        void  set_texture(const Texture2D &);
        void  set_texture(const Texture2D &);

-       void  add_glyph(wchar_t, float, float, float, float, float, float, float, float, float);
+       void  add_glyph(unsigned, float, float, float, float, float, float, float, float, float);

        float get_default_size() const { return default_size; }
        float get_ascent() const { return ascent; }
        float get_descent() const { return descent; }
        float get_string_width(const std::string &) const;
        float get_default_size() const { return default_size; }
        float get_ascent() const { return ascent; }
        float get_descent() const { return descent; }
        float get_string_width(const std::string &) const;

-       float get_string_width(const std::wstring &) const;
-       void  draw_glyph(wchar_t);
+       float get_string_width(const std::string &, Codecs::Decoder &) const;
+       void  draw_glyph(unsigned);

        void  draw_string(const std::string &) const;
        void  draw_string(const std::string &) const;

-       void  draw_string(const std::wstring &) const;
+       void  draw_string(const std::string &, Codecs::Decoder &) const;

        void  draw_multiline(const std::string &) const;
        void  draw_multiline(const std::string &) const;

-       ~Font();
+       
+       template<class C>
+       float get_string_width(const std::string &str) const
+       {
+               typename C::Decoder dec;
+               return get_string_width(str, dec);
+       }       
+       
+       template<class C>
+       void draw_string(const std::string &str) const
+       {
+               typename C::Decoder dec;
+               draw_string(str, dec);
+       }       

 private:
        struct Glyph
        {
 private:
        struct Glyph
        {

-               class Loader: public Msp::Parser::Loader
+               class Loader: public Msp::DataFile::Loader

                {
                public:
                        Loader(Glyph &);
                {
                public:
                        Loader(Glyph &);


@@ -56,7 +72,7 @@ private:
                        void offset(float, float);
                };
 
                        void offset(float, float);
                };
 

-               wchar_t code;
+               unsigned code;

                float x1,y1;
                float x2,y2;
                float w,h;
                float x1,y1;
                float x2,y2;
                float w,h;


@@ -64,7 +80,7 @@ private:
                float advance;
                unsigned index;
        };
                float advance;
                unsigned index;
        };

-       typedef std::map<wchar_t, Glyph> GlyphMap;
+       typedef std::map<unsigned, Glyph> GlyphMap;

 
        const Texture2D *tex;
        bool     own_tex;
 
        const Texture2D *tex;
        bool     own_tex;


@@ -77,8 +93,8 @@ private:
        void create_glyph_vertices();
        void create_glyph_vertices(const Glyph &, VertexArrayBuilder &);
        void prepare_render() const;
        void create_glyph_vertices();
        void create_glyph_vertices(const Glyph &, VertexArrayBuilder &);
        void prepare_render() const;

-       void draw_glyph(wchar_t) const;
-       float get_glyph_advance(wchar_t) const;
+       void draw_glyph(unsigned) const;
+       float get_glyph_advance(unsigned) const;

 };
 
 } // namespace GL
 };
 
 } // namespace GL

diff --git a/source/program.h b/source/program.h
index 682ac99fb895b02498a9f9054735f69c558d44a0..5b1ae29f3ed0681b9a4eb930d938a712fecfacdc 100644 (file)
--- a/source/program.h
+++ b/source/program.h
@@ -23,7 +23,7 @@ class Program
 {
 public:
        Program();
 {
 public:
        Program();

-       ~Program();
+       virtual ~Program();

 
        void attach_shader(Shader &shader);
        void detach_shader(Shader &shader);
 
        void attach_shader(Shader &shader);
        void detach_shader(Shader &shader);