From 1d2dadaa5ae7b41e865b9de9995595550dc67c52 Mon Sep 17 00:00:00 2001 From: nick Date: Sun, 1 Jun 2008 16:24:25 +0000 Subject: [PATCH] Remove the last non-free fonts git-svn-id: http://svn.nickg.me.uk/work/lander@429 a97b1542-0b21-0410-a459-e47997c36f34 --- COPYRIGHT.vera | 124 ++++++++++++++++++++++ Makefile.am | 2 +- configure.ac | 2 +- Default_Font.ttf => data/Default_Font.ttf | Bin data/Makefile.am | 4 +- data/images/gameover.png | Bin 0 -> 4860 bytes data/images/title.png | Bin 0 -> 4696 bytes src/Game.cpp | 13 +-- src/Lander.hpp | 4 +- src/Main.cpp | 3 +- src/Makefile.am | 4 +- src/Menu.cpp | 33 +++--- src/Menu.hpp | 1 + 13 files changed, 158 insertions(+), 32 deletions(-) create mode 100644 COPYRIGHT.vera rename Default_Font.ttf => data/Default_Font.ttf (100%) create mode 100644 data/images/gameover.png create mode 100644 data/images/title.png diff --git a/COPYRIGHT.vera b/COPYRIGHT.vera new file mode 100644 index 0000000..e651be1 --- /dev/null +++ b/COPYRIGHT.vera @@ -0,0 +1,124 @@ +Bitstream Vera Fonts Copyright + +The fonts have a generous copyright, allowing derivative works (as +long as "Bitstream" or "Vera" are not in the names), and full +redistribution (so long as they are not *sold* by themselves). They +can be be bundled, redistributed and sold with any software. + +The fonts are distributed under the following copyright: + +Copyright +========= + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream +Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute +the Font Software, including without limitation the rights to use, +copy, merge, publish, distribute, and/or sell copies of the Font +Software, and to permit persons to whom the Font Software is furnished +to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, +OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT +SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font +Software without prior written authorization from the Gnome Foundation +or Bitstream Inc., respectively. For further information, contact: +fonts at gnome dot org. + +Copyright FAQ +============= + + 1. I don't understand the resale restriction... What gives? + + Bitstream is giving away these fonts, but wishes to ensure its + competitors can't just drop the fonts as is into a font sale system + and sell them as is. It seems fair that if Bitstream can't make money + from the Bitstream Vera fonts, their competitors should not be able to + do so either. You can sell the fonts as part of any software package, + however. + + 2. I want to package these fonts separately for distribution and + sale as part of a larger software package or system. Can I do so? + + Yes. A RPM or Debian package is a "larger software package" to begin + with, and you aren't selling them independently by themselves. + See 1. above. + + 3. Are derivative works allowed? + Yes! + + 4. Can I change or add to the font(s)? + Yes, but you must change the name(s) of the font(s). + + 5. Under what terms are derivative works allowed? + + You must change the name(s) of the fonts. This is to ensure the + quality of the fonts, both to protect Bitstream and Gnome. We want to + ensure that if an application has opened a font specifically of these + names, it gets what it expects (though of course, using fontconfig, + substitutions could still could have occurred during font + opening). You must include the Bitstream copyright. Additional + copyrights can be added, as per copyright law. Happy Font Hacking! + + 6. If I have improvements for Bitstream Vera, is it possible they might get + adopted in future versions? + + Yes. The contract between the Gnome Foundation and Bitstream has + provisions for working with Bitstream to ensure quality additions to + the Bitstream Vera font family. Please contact us if you have such + additions. Note, that in general, we will want such additions for the + entire family, not just a single font, and that you'll have to keep + both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add + glyphs to the font, they must be stylistically in keeping with Vera's + design. Vera cannot become a "ransom note" font. Jim Lyles will be + providing a document describing the design elements used in Vera, as a + guide and aid for people interested in contributing to Vera. + + 7. I want to sell a software package that uses these fonts: Can I do so? + + Sure. Bundle the fonts with your software and sell your software + with the fonts. That is the intent of the copyright. + + 8. If applications have built the names "Bitstream Vera" into them, + can I override this somehow to use fonts of my choosing? + + This depends on exact details of the software. Most open source + systems and software (e.g., Gnome, KDE, etc.) are now converting to + use fontconfig (see www.fontconfig.org) to handle font configuration, + selection and substitution; it has provisions for overriding font + names and subsituting alternatives. An example is provided by the + supplied local.conf file, which chooses the family Bitstream Vera for + "sans", "serif" and "monospace". Other software (e.g., the XFree86 + core server) has other mechanisms for font substitution. + diff --git a/Makefile.am b/Makefile.am index ce0e414..5011dbd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,6 @@ SUBDIRS = po data src ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = config.rpath m4/ChangeLog +EXTRA_DIST = config.rpath m4/ChangeLog COPYRIGHT.vera diff --git a/configure.ac b/configure.ac index 2bb3677..193ff17 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Lunar Lander], [0.9], +AC_INIT([Lunar Lander], [0.2], [Nick Gasson ], [lander]) AM_INIT_AUTOMAKE([-Wall -Werror]) diff --git a/Default_Font.ttf b/data/Default_Font.ttf similarity index 100% rename from Default_Font.ttf rename to data/Default_Font.ttf diff --git a/data/Makefile.am b/data/Makefile.am index 5dccbb3..5e6fd94 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -12,6 +12,8 @@ EXTRA_DIST = images/ship.png images/star.png images/start_option.png \ images/snow_surface2.png images/dirt_surface2.png \ images/grass_surface2.png images/fade.png images/fuelmeter.png \ images/fuelbar.png images/speedmeter.png images/particle.png \ - images/landingpad.png images/landingpadred.png + images/landingpad.png images/landingpadred.png images/title.png \ + images/gameover.png \ + Default_Font.ttf nobase_dist_pkgdata_DATA = $(EXTRA_DIST) diff --git a/data/images/gameover.png b/data/images/gameover.png new file mode 100644 index 0000000000000000000000000000000000000000..048fa67e2c2a0efac5911d7f9af5c8c72271a09c GIT binary patch literal 4860 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 literal 0 HcmV?d00001 diff --git a/data/images/title.png b/data/images/title.png new file mode 100644 index 0000000000000000000000000000000000000000..b510ed878d313f7d6531c29ac0f1d44dc3cb6b12 GIT binary patch literal 4696 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 KaLd8Soc{p@!2z@Y literal 0 HcmV?d00001 diff --git a/src/Game.cpp b/src/Game.cpp index 8f85532..80c4166 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -62,7 +62,8 @@ Game::Game() fadeTexture("images/fade.png"), starImage("images/star.png"), levelComp("images/levelcomp.png"), - smallShip("images/shipsmall.png") + smallShip("images/shipsmall.png"), + gameOver("images/gameover.png") { } @@ -710,13 +711,9 @@ void Game::Display() // Draw game over message if (lives == 0 || (lives == 1 && life_alpha < LIFE_ALPHA_BASE)) { - opengl.Colour(0.9f, 0.0f, 0.0f); - const char *sgo = i18n("Game Over"); - ft.Print - (ftHollow, - (opengl.GetWidth() - ft.GetStringWidth(ftHollow, sgo) - 20)/2, - (opengl.GetHeight() - 150)/2, - sgo); + int draw_x = (opengl.GetWidth() - gameOver.GetWidth()) / 2; + int draw_y = (opengl.GetHeight() - 150)/2; + gameOver.Draw(draw_x, draw_y); } // Draw paused message diff --git a/src/Lander.hpp b/src/Lander.hpp index e402a66..868ecd2 100644 --- a/src/Lander.hpp +++ b/src/Lander.hpp @@ -40,7 +40,7 @@ #include "Key.hpp" // Different fonts to be loaded -enum FontType { ftNormal, ftBig, ftScore, ftHollow, ftScoreName, ftLarge }; +enum FontType { ftNormal, ftBig, ftScore, ftScoreName, ftLarge }; #define MIN(a, b) (a < b ? a : b) #define MAX(a, b) (a > b ? a : b) @@ -124,7 +124,7 @@ private: Texture fadeTexture; Image levelComp, smallShip; - Image starImage; + Image starImage, gameOver; // Stars static const int MAX_GAME_STARS = 2048; diff --git a/src/Main.cpp b/src/Main.cpp index 5cb9416..ff177c0 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) #ifdef DEBUG_WINDOW width = DEBUG_WIN_X; height = DEBUG_WIN_Y; - fullscreen = true; + fullscreen = false; #else // width = GetSystemMetrics(SM_CXSCREEN); // height = GetSystemMetrics(SM_CYSCREEN); @@ -81,7 +81,6 @@ int main(int argc, char **argv) ft.LoadFont(ftNormal, File::LocateResource("Default_Font", "ttf"), 11); ft.LoadFont(ftBig, File::LocateResource("Default_Font", "ttf"), 20); ft.LoadFont(ftScore, File::LocateResource("Default_Font", "ttf"), 16); - ft.LoadFont(ftHollow, File::LocateResource("Hollow_Font", "ttf"), 40); ft.LoadFont(ftScoreName, File::LocateResource("Default_Font", "ttf"), 14); ft.LoadFont(ftLarge, File::LocateResource("Default_Font", "ttf"), 15); diff --git a/src/Makefile.am b/src/Makefile.am index 75c2aa7..b1e12e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,10 +16,8 @@ lander_SOURCES = Main.cpp Lander.hpp Game.cpp \ Image.cpp AnimatedImage.hpp AnimatedImage.cpp \ Texture.hpp Texture.cpp -dist_pkgdata_DATA = ../Default_Font.ttf ../Hollow_Font.ttf - localedir = $(datadir)/locale # Add -DSHOW_FPS here to show FPS in title bar DEFS = -DLOCALEDIR=\"$(localedir)\" -DLINUX -DUNIX \ - -DDATADIR=\"$(pkgdatadir)\" @DEFS@ \ No newline at end of file + -DDATADIR=\"$(pkgdatadir)\" @DEFS@ diff --git a/src/Menu.cpp b/src/Menu.cpp index 333c4c7..248448e 100644 --- a/src/Menu.cpp +++ b/src/Menu.cpp @@ -42,7 +42,8 @@ MainMenu::MainMenu() : startOpt("images/start_option.png", OPTIONS_OFFSET, 0), scoreOpt("images/score_option.png", OPTIONS_OFFSET, 1), optionsOpt("images/options_option.png", OPTIONS_OFFSET, 2), - exitOpt("images/exit_option.png", OPTIONS_OFFSET, 3) + exitOpt("images/exit_option.png", OPTIONS_OFFSET, 3), + titleImage("images/title.png") { } @@ -213,9 +214,8 @@ void MainMenu::Display() OpenGL &opengl = OpenGL::GetInstance(); - for (StarListIt it = stars.begin(); it != stars.end(); ++it) { + for (StarListIt it = stars.begin(); it != stars.end(); ++it) (*it).Display(); - } // Draw logo and menu items startOpt.Display(selOption == optStart, bigness, fade); @@ -225,19 +225,23 @@ void MainMenu::Display() FreeType &ft = FreeType::GetInstance(); - opengl.Colour(0.0f, 1.0f, 0.0f, fade); - const char *stitle = i18n("LUNAR LANDER"); - ft.Print(ftHollow, (opengl.GetWidth() - ft.GetStringWidth(ftHollow, stitle))/2, 100, stitle); + int title_x = (opengl.GetWidth() - titleImage.GetWidth()) / 2; + int title_y = 100; + titleImage.Draw(title_x, title_y, 0.0, 1.0, fade); + // Draw some hint texts const int numhints = 7; const char *hints[][2] = { - { "Use the arrow keys to rotate the ship", "" }, - { "Press the up arrow to fire the thruster", "" }, - { "Smaller landing pads give you more points", "" }, - { "Press P to pause the game", "" }, - { "Press escape to self destruct", "" }, - { "You can only land safely when the", "speed bar is green" }, - { "Collect the spinning rings to", "unlock the landing pads" } + { i18n("Use the arrow keys to rotate the ship"), "" }, + { i18n("Press the up arrow to fire the thruster"), "" }, + { i18n("Smaller landing pads give you more points"), "" }, + { i18n("Press P to pause the game"), "" }, + { i18n("Press escape to self destruct"), "" }, + // TODO: automatically split text into multiple lines + { i18n("You can only land safely when the"), + i18n("speed bar is green") }, + { i18n("Collect the spinning rings to"), + i18n("unlock the landing pads") } }; if (hint_timeout == 0) { @@ -246,7 +250,8 @@ void MainMenu::Display() } else hint_timeout--; - + + opengl.Colour(0.0f, 1.0f, 0.0f, fade); ft.Print(ftNormal, (opengl.GetWidth() - ft.GetStringWidth(ftNormal, hints[hintidx][0])) / 2, opengl.GetHeight() - 120, diff --git a/src/Menu.hpp b/src/Menu.hpp index e9a0b6b..eaccbab 100644 --- a/src/Menu.hpp +++ b/src/Menu.hpp @@ -75,6 +75,7 @@ private: SelOption selOption; double fade, bigness; MenuState state; + Image titleImage; int hint_timeout, hintidx; -- 2.39.2