From fc90b7d3d55ab6481e515e069d52c1f23e2f202c Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Wed, 20 Jul 2005 01:35:11 +0000
Subject: [PATCH] Image/Texture tests reviewed

---
 test/Image_test.cpp   | 12 ++++++------
 test/Texture_test.cpp | 39 +++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/test/Image_test.cpp b/test/Image_test.cpp
index 20b160e..8343820 100644
--- a/test/Image_test.cpp
+++ b/test/Image_test.cpp
@@ -5,7 +5,7 @@
 //  James Turk (jpt2433@rit.edu)
 //
 // Version:
-//  $Id: Image_test.cpp,v 1.5 2005/07/19 20:31:41 cozman Exp $
+//  $Id: Image_test.cpp,v 1.6 2005/07/20 01:35:11 cozman Exp $
 
 #include "photon.hpp"
 using namespace photon;
@@ -23,16 +23,16 @@ public:
         video.setOrthoView(800,600);
 
         // load the images
-        video::Image::addResource("data/test.png");
-        video::Texture::addResource("test2","data/test2.png");
+        video::Image::addResource("data/icon.png");
+        video::Texture::addResource("robo","data/robo.png");
 
         // load img[0], set to half translucency and resize
-        img[0].open("test2");
+        img[0].open("robo");
         img[0].setAlpha(128);
         img[0].resize(100,200);
         
         // load img[1]
-        img[1].open("data/test.png");
+        img[1].open("data/icon.png");
         
         // copy img[0] into img[2] and flip it
         img[2] = img[0];
@@ -62,7 +62,7 @@ public:
         // example usage of Images boolean operator
         if(img[2])
         {
-            img[2].draw(100,400);
+            img[2].draw(0,200);
         }
     }
 
diff --git a/test/Texture_test.cpp b/test/Texture_test.cpp
index 840d9b9..6c28fc1 100644
--- a/test/Texture_test.cpp
+++ b/test/Texture_test.cpp
@@ -5,17 +5,12 @@
 //  James Turk (jpt2433@rit.edu)
 //
 // Version:
-//  $Id: Texture_test.cpp,v 1.4 2005/07/04 03:06:48 cozman Exp $
+//  $Id: Texture_test.cpp,v 1.5 2005/07/20 01:35:11 cozman Exp $
 
 #include "photon.hpp"
 using namespace photon;
 #include <boost/lexical_cast.hpp>
 
-// 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,29 +20,26 @@ public:
         app(AppCore::getInstance()),
         video(video::VideoCore::getInstance())
     {
-        LogSinkPtr csp( new ConsoleSink("console") );
-        log.addSink(csp);
-
         video.setOrthoView(800,600);
 
-        video::Texture::addResource("data/test.png");
-        video::Texture::addResource("test2","data/test2.png");
+        video::Texture::addResource("data/icon.png");
+        video::Texture::addResource("robo","data/robo.png");
         
-        // Testing of errors
-        //video::Texture::addResource("nonfile");
-        //video::Texture::addResource("Texture_test.cpp");
-        //tex[0].open("test0");
+        // Testing of errors, uncomment to get various errors
+        //video::Texture::addResource("nonfile");       // non-existant file
+        //video::Texture::addResource("Texture_test.cpp");  // non-image file
+        //tex[0].open("badresource");       // opening of non-existant resource
         
-        tex[0].open("data/test.png");
-        tex[1].open("test2");
+        tex[0].open("data/icon.png");
+        tex[1].open("robo");
         tex[2] = tex[1];
         
     }
     
     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: " + 
@@ -57,14 +49,16 @@ public:
 
         video.clear();
 
+        // draw first texture at actual size
         tex[0].bind();
         glBegin(GL_QUADS);
         glTexCoord2f(0,0);  glVertex2f(0,0);
-        glTexCoord2f(1,0);  glVertex2f(100,0);
-        glTexCoord2f(1,1);  glVertex2f(100,100);
+        glTexCoord2f(1,0);  glVertex2f(tex[0].getWidth(),0);
+        glTexCoord2f(1,1);  glVertex2f(tex[0].getWidth(),tex[0].getHeight());
         glTexCoord2f(0,1);  glVertex2f(0,100);
         glEnd();
         
+        // draw second texture on a diamond shaped polygon
         tex[1].bind();
         glBegin(GL_QUADS);
         glTexCoord2f(0,0);  glVertex2f(250,200);
@@ -73,6 +67,7 @@ public:
         glTexCoord2f(0,1);  glVertex2f(200,250);
         glEnd();
         
+        // draw texture and test Texture's boolean operator
         if(tex[2])
         {
             tex[2].bind();
@@ -87,12 +82,12 @@ public:
 
 private:
     video::Texture tex[3];
-    
-    Log log;
+
     AppCore& app;
     video::VideoCore& video;
 };
 
+// standard application, creates window, registers task and runs
 class TextureTest : public Application
 {
 public: