From 4025ea3e81b0d2ec4492f3a0b3e374ce1568bdf5 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 28 Oct 2008 19:31:17 +0000 Subject: switch UseFreetype added to toggle between bitmap-font and freetype font git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1484 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/base/TextGL.pas | 29 +++--- src/base/TextGLFreetype.pas | 222 ++++++++++++++++++++++++++++++++++++++++++++ src/switches.inc | 2 + src/ultrastardx.dpr | 6 +- 4 files changed, 239 insertions(+), 20 deletions(-) create mode 100644 src/base/TextGLFreetype.pas diff --git a/src/base/TextGL.pas b/src/base/TextGL.pas index 57f3d6f5..11bbd52b 100644 --- a/src/base/TextGL.pas +++ b/src/base/TextGL.pas @@ -33,6 +33,11 @@ interface {$I switches.inc} +// as long as the transition to freetype is not finished +// use the old implementation +{$IFDEF UseFreetype} + {$INCLUDE TextGLFreetype.pas} +{$ELSE} uses gl, SDL, @@ -51,7 +56,6 @@ procedure SetFontStyle(Style: integer); // sets active font style (normal, procedure SetFontItalic(Enable: boolean); // sets italic type letter (works for all fonts) procedure SetFontAspectW(Aspect: real); procedure SetFontReflection(Enable:boolean;Spacing: real); // enables/disables text reflection -procedure SetFontBlend(Enable: boolean); // enables/disables blending //function NextPowerOfTwo(Value: integer): integer; // Checks if the ttf exists, if yes then a SDL_ttf is returned @@ -81,7 +85,6 @@ type Italic: boolean; Reflection: boolean; ReflectionSpacing: real; - Blend: boolean; end; @@ -191,10 +194,6 @@ begin // close ini-file FontIni.Free; - - // enable blending by default - for Count := 0 to High(Fonts) do - Fonts[Count].Blend := true; end; // Deletes the font @@ -262,11 +261,8 @@ begin else XItal := 12; - if (Font.Blend) then - begin - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - end; + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, Tex.TexNum); @@ -310,8 +306,7 @@ begin end; // reflection glDisable(GL_TEXTURE_2D); - if (Font.Blend) then - glDisable(GL_BLEND); + glDisable(GL_BLEND); Tex.X := Tex.X + Tex.W; @@ -382,9 +377,7 @@ begin Fonts[ActFont].ReflectionSpacing := Spacing; end; -procedure SetFontBlend(Enable: boolean); -begin - Fonts[ActFont].Blend := Enable; -end; - end. + +{$ENDIF} + diff --git a/src/base/TextGLFreetype.pas b/src/base/TextGLFreetype.pas new file mode 100644 index 00000000..6a41b5de --- /dev/null +++ b/src/base/TextGLFreetype.pas @@ -0,0 +1,222 @@ +{* UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * $URL: https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk/src/base/TextGL.pas $ + * $Id: TextGL.pas 1483 2008-10-28 19:01:20Z tobigun $ + *} + +(* +unit TextGL; + +interface + +{$IFDEF FPC} + {$MODE Delphi} +{$ENDIF} + +{$I switches.inc} +*) + +uses + gl, + glext, + SDL, + UTexture, + UFont, + Classes, + ULog; + +type + PGLFont = ^TGLFont; + TGLFont = record + Font: TScalableFont; + X, Y, Z: real; + end; + +var + Fonts: array of TGLFont; + ActFont: integer; + +procedure BuildFont; // build our bitmap font +procedure KillFont; // delete the font +function glTextWidth(const text: string): real; // returns text width +procedure glPrint(const text: string); // custom GL "Print" routine +procedure ResetFont(); // reset font settings of active font +procedure SetFontPos(X, Y: real); // sets X and Y +procedure SetFontZ(Z: real); // sets Z +procedure SetFontSize(Size: real); +procedure SetFontStyle(Style: integer); // sets active font style (normal, bold, etc) +procedure SetFontItalic(Enable: boolean); // sets italic type letter (works for all fonts) +procedure SetFontReflection(Enable:boolean;Spacing: real); // enables/disables text reflection + +implementation + +uses + UMain, + UCommon, + SysUtils, + IniFiles, + UGraphic; + +function FindFontFile(FontIni: TCustomIniFile; Font: string): string; +var + Filename: string; +begin + Filename := FontIni.ReadString(Font, 'File', ''); + Result := FontPath + Filename; + // if path does not exist, try as an absolute path + if (not FileExists(Result)) then + Result := Filename; +end; + +procedure BuildFont; +var + FontIni: TMemIniFile; + BitmapFont: TBitmapFont; + FontFile: string; +begin + ActFont := 0; + + SetLength(Fonts, 4); + FontIni := TMemIniFile.Create(FontPath + 'fontsTTF.ini'); + //FontIni := TMemIniFile.Create(FontPath + 'fonts.ini'); + + try + + // Normal + FontFile := FindFontFile(FontIni, 'Normal'); + Fonts[0].Font := TFTScalableFont.Create(FontFile, 64); + //Fonts[0].Font.GlyphSpacing := 1.4; + //Fonts[0].Font.Aspect := 1.2; + + { + BitmapFont := TBitmapFont.Create(FontFile, 0, 19, 35, -10); + BitmapFont.CorrectWidths(2, 0); + Fonts[0].Font := TScalableFont.Create(BitmapFont, false); + } + + //Fonts[0].Font.Aspect := 0.9; + + // Bold + FontFile := FindFontFile(FontIni, 'Bold'); + Fonts[1].Font := TFTScalableFont.Create(FontFile, 64); + + // Outline1 + FontFile := FindFontFile(FontIni, 'Outline1'); + Fonts[2].Font := TFTScalableOutlineFont.Create(FontFile, 64, 0.06); + //TFTScalableOutlineFont(Fonts[2].Font).SetOutlineColor(0.3, 0.3, 0.3); + + // Outline2 + FontFile := FindFontFile(FontIni, 'Outline2'); + Fonts[3].Font := TFTScalableOutlineFont.Create(FontFile, 64, 0.08); + + except on E: Exception do + Log.LogCritical(E.Message, 'BuildFont'); + end; + + // close ini-file + FontIni.Free; +end; + + +// Deletes the font +procedure KillFont; +begin + // delete all characters + //glDeleteLists(..., 256); +end; + +function glTextWidth(const text: string): real; +var + Bounds: TBoundsDbl; +begin + // FIXME: remove UTF-8 conversion + Bounds := Fonts[ActFont].Font.BBox(AnsiToUtf8(text), true); + Result := Bounds.Right - Bounds.Left; +end; + +// Custom GL "Print" Routine +procedure glPrint(const Text: string); +var + GLFont: PGLFont; +begin + // if there is no text do nothing + if (Text = '') then + Exit; + + GLFont := @Fonts[ActFont]; + + glPushMatrix(); + // set font position + glTranslatef(GLFont.X, GLFont.Y + GLFont.Font.Ascender, GLFont.Z); + // draw string + // FIXME: remove UTF-8 conversion + GLFont.Font.Print(AnsiToUtf8(Text)); + glPopMatrix(); +end; + +procedure ResetFont(); +begin + SetFontPos(0, 0); + SetFontZ(0); + SetFontItalic(False); + SetFontReflection(False, 0); +end; + +procedure SetFontPos(X, Y: real); +begin + Fonts[ActFont].X := X; + Fonts[ActFont].Y := Y; +end; + +procedure SetFontZ(Z: real); +begin + Fonts[ActFont].Z := Z; +end; + +procedure SetFontSize(Size: real); +begin + Fonts[ActFont].Font.Height := Size; +end; + +procedure SetFontStyle(Style: integer); +begin + ActFont := Style; +end; + +procedure SetFontItalic(Enable: boolean); +begin + if (Enable) then + Fonts[ActFont].Font.Style := Fonts[ActFont].Font.Style + [Italic] + else + Fonts[ActFont].Font.Style := Fonts[ActFont].Font.Style - [Italic] +end; + +procedure SetFontReflection(Enable: boolean; Spacing: real); +begin + if (Enable) then + Fonts[ActFont].Font.Style := Fonts[ActFont].Font.Style + [Reflect] + else + Fonts[ActFont].Font.Style := Fonts[ActFont].Font.Style - [Reflect]; + Fonts[ActFont].Font.ReflectionSpacing := Spacing - Fonts[ActFont].Font.Descender; +end; + +end. diff --git a/src/switches.inc b/src/switches.inc index cfd57fd4..215fe239 100644 --- a/src/switches.inc +++ b/src/switches.inc @@ -65,6 +65,8 @@ {$DEFINE CONSOLE} {$IFEND} +{.$DEFINE UseFreetype} + // audio config {$IF Defined(HaveBASS)} {$DEFINE UseBASSPlayback} diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 7ade4eaf..842d2369 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -77,8 +77,10 @@ uses zlib in 'lib\zlib\zlib.pas', png in 'lib\libpng\png.pas', - //freetype in 'lib\freetype\freetype.pas', - //UFont in 'base\UFont.pas', + {$IFDEF UseFreetype} + freetype in 'lib\freetype\freetype.pas', + UFont in 'base\UFont.pas', + {$ENDIF} {$IFDEF UseBass} bass in 'lib\bass\delphi\bass.pas', -- cgit v1.2.3