From 8b1bc845682c26b92742e1e7b20b4d7858734779 Mon Sep 17 00:00:00 2001 From: James Turk Date: Tue, 19 Jul 2005 18:47:28 +0000 Subject: [PATCH] Font test reviewed --- test/Font_test.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/test/Font_test.cpp b/test/Font_test.cpp index a476401..7cdcec1 100644 --- a/test/Font_test.cpp +++ b/test/Font_test.cpp @@ -5,16 +5,12 @@ // James Turk (jpt2433@rit.edu) // // Version: -// $Id: Font_test.cpp,v 1.5 2005/07/17 07:14:09 cozman Exp $ +// $Id: Font_test.cpp,v 1.6 2005/07/19 18:47:28 cozman Exp $ #include "photon.hpp" using namespace photon; #include -// This is a simple framework for writing extremely simple Photon applications -// it simply displays a blank window and the framerate in the titlebar of -// the created window. This is meant to show basic interaction between the -// user and the more common features of the AppCore and the Kernel. class MainTask : public Task { @@ -25,23 +21,20 @@ public: app(AppCore::getInstance()), video(video::VideoCore::getInstance()) { - LogSinkPtr csp( new ConsoleSink("console") ); - log.addSink(csp); - video.setOrthoView(800,600); + // show two different fonts video::Font::addResource("font1","data/FreeMono.ttf",32); video::Font::addResource("font2","data/FreeSerif.ttf",18); font.open("font1"); font2.open("font2"); - } void update() { + // used to measure FPS and display it in the title bar static double t=0; - if(app.getTime() - t > 1.0) { app.setTitle("FPS: " + @@ -49,25 +42,27 @@ public: t = app.getTime(); } + // clear screen video.clear(); + // draw the three strings to the screen font.setColor(video::Color(0,128,128)); font.drawText(0, 0, "Photon"); font.setColor(video::Color(255,0,0)); font.drawText(font.calcStringWidth("Photon"), font.getHeight(), "FPS: %.0f", app.getFramerate() ); - font2.beginDraw(200, 200) << "another plain font" << font2.endDraw(); + font2.beginDraw(200, 200) << "another (plain) font" << font2.endDraw(); } private: video::Font font; video::Font font2; - Log log; AppCore& app; video::VideoCore& video; }; +// standard application, creates window, registers task and runs class FontTest : public Application { public: