From ec14f0c1b5e3ae36afd054aeb2cb774dc0d16cfc Mon Sep 17 00:00:00 2001 From: James Turk Date: Fri, 12 Dec 2008 00:31:14 -0500 Subject: [PATCH] point at polimath and other changes --- GLFT_Font.cpp | 13 ++++++----- GLFT_Font.hpp | 13 ++++++----- Makefile | 2 +- README | 13 +++++------ index.html | 60 --------------------------------------------------- test.cpp | 3 +-- 6 files changed, 21 insertions(+), 83 deletions(-) delete mode 100644 index.html diff --git a/GLFT_Font.cpp b/GLFT_Font.cpp index be80142..0dde8d7 100644 --- a/GLFT_Font.cpp +++ b/GLFT_Font.cpp @@ -1,14 +1,13 @@ -// GLFT_Font (http://www.cs.rit.edu/~jpt2433/glftfont/) -// by James Turk (jpt2433@rit.edu) +// GLFT_Font (http://polimath.com/blog/code/glft_font/) +// by James Turk (james.p.turk@gmail.com) // Based on work by Marijn Haverbeke (http://marijn.haverbeke.nl) // -// Version 0.1 - Released 1 July 2005 - Initial Release -// Version 0.2 - Released 18 July 2005 - Added beginDraw/endDraw, +// Version 0.2.1 - Released 2 March 2008 - Updated contact information. +// Version 0.2.0 - Released 18 July 2005 - Added beginDraw/endDraw, // Changed vsprintf to vsnprintf +// Version 0.1.0 - Released 1 July 2005 - Initial Release // -// $Id: GLFT_Font.cpp,v 1.1 2005/07/18 22:19:16 cozman Exp $ -// -// Copyright (c) 2005, James Turk +// Copyright (c) 2005-2008, James Turk // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/GLFT_Font.hpp b/GLFT_Font.hpp index 208c554..19f4bb6 100644 --- a/GLFT_Font.hpp +++ b/GLFT_Font.hpp @@ -1,14 +1,13 @@ -// GLFT_Font (http://www.cs.rit.edu/~jpt2433/glftfont/) -// by James Turk (jpt2433@rit.edu) +// GLFT_Font (http://polimath.com/blog/code/glft_font/) +// by James Turk (james.p.turk@gmail.com) // Based on work by Marijn Haverbeke (http://marijn.haverbeke.nl) // -// Version 0.1 - Released 1 July 2005 - Initial Release -// Version 0.2 - Released 18 July 2005 - Added beginDraw/endDraw, +// Version 0.2.1 - Released 2 March 2008 - Updated contact information. +// Version 0.2.0 - Released 18 July 2005 - Added beginDraw/endDraw, // Changed vsprintf to vsnprintf +// Version 0.1.0 - Released 1 July 2005 - Initial Release // -// $Id: GLFT_Font.hpp,v 1.1 2005/07/18 22:19:16 cozman Exp $ -// -// Copyright (c) 2005, James Turk +// Copyright (c) 2005-2008, James Turk // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/Makefile b/Makefile index 1ed1e8f..5740f53 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ test: test.cpp GLFT_Font.cpp - g++ GLFT_Font.cpp test.cpp -o test -Wall -pedantic -lglfw -lGL -lfreetype `freetype-config --cflags` + g++ GLFT_Font.cpp test.cpp -o test -Wall -pedantic -lglfw -lGL -lfreetype -pthread `freetype-config --cflags` glftfont.tar.gz: tar -czf glftfont.tar.gz GLFT_Font.cpp GLFT_Font.hpp index.html README test.cpp Makefile diff --git a/README b/README index bc0b3a1..d117095 100644 --- a/README +++ b/README @@ -1,10 +1,13 @@ -// GLFT_Font (http://www.cs.rit.edu/~jpt2433/glftfont/) -// by James Turk (jpt2433@rit.edu) +// GLFT_Font (http://polimath.com/blog/code/glft_font/) +// by James Turk (james.p.turk@gmail.com) // Based on work by Marijn Haverbeke (http://marijn.haverbeke.nl) // -// Version 0.1 - Released 1 July 2005 +// Version 0.2.1 - Released 2 March 2008 - Updated contact information. +// Version 0.2.0 - Released 18 July 2005 - Added beginDraw/endDraw, +// Changed vsprintf to vsnprintf +// Version 0.1.0 - Released 1 July 2005 - Initial Release // -// Copyright (c) 2005, James Turk +// Copyright (c) 2005-2008, James Turk // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -30,5 +33,3 @@ // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. - -$Id: README,v 1.1 2005/07/18 22:19:16 cozman Exp $ diff --git a/index.html b/index.html deleted file mode 100644 index b40cbd7..0000000 --- a/index.html +++ /dev/null @@ -1,60 +0,0 @@ - -GLFT_Font - -

GLFT_Font

- -

About GLFT_Font

-

-GLFT_Font is originally by James Turk -although it is based on the work of -Marijn Haverbeke. GLFT_Font allows -programmers to use fonts in their OpenGL applications with great ease on any -platform for which both FreeType2 and -OpenGL are available. -

- -

Obtaining GLFT_Font

-

-The latest copy of GLFT_Font will be available via this website. -At the moment the latest version is 0.2. -

- -

Using GLFT_Font

-

-Using GLFT_Font is designed to be extremely simple. The simplest use is: -

-
-#include "GLFT_Font.h"
-
-...
-glEnable(GL_TEXTURE_2D);
-glEnable(GL_BLEND);
-glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-...
-Font fnt("somefont.ttf", size);  
-...
-fnt.drawText(x, y, "Hello World");
-
-
-GLFT_Font also includes support for finding the width/height of a string and -drawText supports printf-style argument formatting.
-New in 0.2: GLFT_Font now allows outputting text using C++ -style stream operators. -

- -

Changelog

-

-

-

- -
-

$Id: index.html,v 1.2 2005/07/18 22:32:26 cozman Exp $

- - - - diff --git a/test.cpp b/test.cpp index 7895b89..3b5ce21 100644 --- a/test.cpp +++ b/test.cpp @@ -1,8 +1,7 @@ // This file is distributed along with GLFT_Font and is in the public domain. // Compiled with g++ GLFT_Font.cpp test.cpp -o test -Wall -pedantic -// -lglfw -lGL -lfreetype `freetype-config --cflags` +// -lglfw -lGL -pthread -lfreetype `freetype-config --cflags` // -// $Id: test.cpp,v 1.2 2005/07/18 22:28:27 cozman Exp $ #include #include "GLFT_Font.hpp"