[simspark-cvs] simspark/spark/kerosin/fontserver font.cpp, 1.1, 1.2 font.h, 1.1, 1.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/kerosin/fontserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/kerosin/fontserver

Modified Files:
	font.cpp font.h 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: font.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/fontserver/font.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** font.cpp	5 Dec 2005 21:38:22 -0000	1.1
--- font.cpp	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 13,31 ****
  #endif
  
- #include <GL/gl.h>
  
- using namespace kerosin;
  using namespace salt;
  
! Font::Font(FontServer &fontServer)
    : mTexID(0), mRowHeight(0), mSize(0), mFontServer(fontServer)
  {
  }
  
! Font::~Font()
  {
  }
  
! bool Font::Init(const std::string &name, unsigned int size, FT_Face face)
  {
    mName = name;
--- 13,29 ----
  #endif
  
  
  using namespace salt;
  
! kerosin::Font::Font(FontServer &fontServer)
    : mTexID(0), mRowHeight(0), mSize(0), mFontServer(fontServer)
  {
  }
  
! kerosin::Font::~Font()
  {
  }
  
! bool kerosin::Font::Init(const std::string &name, unsigned int size, FT_Face face)
  {
    mName = name;
***************
*** 202,206 ****
  }
  
! bool Font::Bind(int vRows)
  {
    glEnable(GL_TEXTURE_2D);
--- 200,204 ----
  }
  
! bool kerosin::Font::Bind(int vRows)
  {
    glEnable(GL_TEXTURE_2D);
***************
*** 228,232 ****
  }
  
! void Font::Dump()
  {
    glBegin(GL_QUADS);
--- 226,230 ----
  }
  
! void kerosin::Font::Dump()
  {
    glBegin(GL_QUADS);
***************
*** 242,246 ****
  }
  
! void Font::DrawString(float x, float y, const char *string)
  {
    const char *c = string;
--- 240,244 ----
  }
  
! void kerosin::Font::DrawString(float x, float y, const char *string)
  {
    const char *c = string;
***************
*** 276,280 ****
  }
  
! void Font::Printf(float x, float y, const char *format, ...)
  {
    char buffer[4096];
--- 274,278 ----
  }
  
! void kerosin::Font::Printf(float x, float y, const char *format, ...)
  {
    char buffer[4096];
***************
*** 286,290 ****
  }
  
! void Font::RowPrintf(float x, float row, const char *format, ...)
  {
    char buffer[4096];
--- 284,288 ----
  }
  
! void kerosin::Font::RowPrintf(float x, float row, const char *format, ...)
  {
    char buffer[4096];
***************
*** 296,300 ****
  }
  
! float Font::GetStringWidth(const char* string, int numChar)
  {
    if (numChar == -1) numChar = strlen(string);
--- 294,298 ----
  }
  
! float kerosin::Font::GetStringWidth(const char* string, int numChar)
  {
    if (numChar == -1) numChar = strlen(string);
***************
*** 319,333 ****
  }
  
! float Font::GetRowHeight()
  {
    return (float)mRowHeight;
  }
  
! const std::string& Font::GetName() const
  {
    return mName;
  }
  
! unsigned int Font::GetSize() const
  {
    return mSize;
--- 317,331 ----
  }
  
! float kerosin::Font::GetRowHeight()
  {
    return (float)mRowHeight;
  }
  
! const std::string& kerosin::Font::GetName() const
  {
    return mName;
  }
  
! unsigned int kerosin::Font::GetSize() const
  {
    return mSize;

Index: font.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/fontserver/font.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** font.h	5 Dec 2005 21:38:22 -0000	1.1
--- font.h	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  #include "glyph.h"
  
+ #include <kerosin/openglserver/openglwrapper.h>
+ 
  namespace kerosin
  {
***************
*** 107,111 ****
  
      //! OpenGL Texture ID
!     unsigned int mTexID;
  
      //! height (in pixels) of a row
--- 109,113 ----
  
      //! OpenGL Texture ID
!     GLuint mTexID;
  
      //! height (in pixels) of a row