From efe93334bb1a2ea160d9074c488a8503fb5bcf06 Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Mon, 10 Feb 2003 05:15:33 +0000
Subject: [PATCH] Added overloads to Draw/DrawRotated for int and float.

---
 include/ZE_ZImage.h | 22 +++++++++++++++++++++-
 src/ZE_ZImage.cpp   | 12 +++++++++++-
 test/ZMusicTest.cpp |  4 ++--
 test/ZSoundTest.cpp |  4 ++--
 test/ZTimerTest.cpp |  4 ++--
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/include/ZE_ZImage.h b/include/ZE_ZImage.h
index 1f49fa4..c2501bf 100644
--- a/include/ZE_ZImage.h
+++ b/include/ZE_ZImage.h
@@ -13,7 +13,7 @@
 File: ZE_ZImage.h <br>
 Description: Header file for core ZEngine Image and Texture Object. <br>
 Author(s): James Turk, Gamer Tazar <br>
-$Id: ZE_ZImage.h,v 1.14 2003/02/10 04:55:48 cozman Exp $<br>
+$Id: ZE_ZImage.h,v 1.15 2003/02/10 05:15:33 cozman Exp $<br>
 
     \file ZE_ZImage.h
     \brief Definition file for ZImage.
@@ -249,6 +249,16 @@ class ZImage
             \param x X coord to draw Image to.
             \param y Y coord to draw Image to.
         **/
+        void Draw(int x, int y) const;
+
+        /*!
+            \brief Draw Image to Screen.
+
+            Draw Image to screen at specified location.
+            \since 0.8.3
+            \param x X coord to draw Image to.
+            \param y Y coord to draw Image to.
+        **/
         void Draw(float x, float y) const;
 
         /*!
@@ -261,6 +271,16 @@ class ZImage
         **/
         void DrawRotated(int x, int y, float angle) const;
 
+        /*!
+            \brief Draw Image rotated to screen.
+
+            Image is rotated about it's own center by specified angle, then drawn to screen.
+            \param x X coord to draw Image to.
+            \param y Y coord to draw Image to.
+            \param angle Angle in degrees to rotate image.
+        **/
+        void DrawRotated(float x, float y, float angle) const;
+
         /////////////
         //Accessors//
         /////////////
diff --git a/src/ZE_ZImage.cpp b/src/ZE_ZImage.cpp
index 223a9e6..228901e 100644
--- a/src/ZE_ZImage.cpp
+++ b/src/ZE_ZImage.cpp
@@ -13,7 +13,7 @@
 File: ZE_ZImage.cpp <br>
 Description: Implementation source file for core ZEngine Image or Texture Object. <br>
 Author(s): James Turk, Gamer Tazar <br>
-$Id: ZE_ZImage.cpp,v 1.25 2003/02/10 04:55:48 cozman Exp $<br>
+$Id: ZE_ZImage.cpp,v 1.26 2003/02/10 05:15:33 cozman Exp $<br>
 
     \file ZE_ZImage.cpp
     \brief Source file for ZImage.
@@ -235,6 +235,11 @@ void ZImage::Bind() const
     }
 }
 
+void ZImage::Draw(int x, int y) const
+{
+    Draw(static_cast<float>(x),static_cast<float>(y));
+}
+
 void ZImage::Draw(float x, float y) const
 {
     Bind();
@@ -248,6 +253,11 @@ void ZImage::Draw(float x, float y) const
 }
 
 void ZImage::DrawRotated(int x, int y, float angle) const
+{
+    DrawRotated(static_cast<float>(x),static_cast<float>(y),angle);
+}
+
+void ZImage::DrawRotated(float x, float y, float angle) const
 {
     float cX,cY; //center variables
 
diff --git a/test/ZMusicTest.cpp b/test/ZMusicTest.cpp
index 59ec9a5..5808235 100644
--- a/test/ZMusicTest.cpp
+++ b/test/ZMusicTest.cpp
@@ -8,7 +8,7 @@
      and the home of this Library is http://www.zengine.sourceforge.net
 *******************************************************************************/
 
-/*$Id: ZMusicTest.cpp,v 1.13 2003/01/12 19:00:19 cozman Exp $*/
+/*$Id: ZMusicTest.cpp,v 1.14 2003/02/10 05:16:30 cozman Exp $*/
 
 #include <ZEngine.h>
 #include <string> 
@@ -95,7 +95,7 @@ void Test()
 
                 engine->Clear();    //clear screen
                 for(int i=0; i < 4; i++)
-                    text[i].Draw(0,i*50.0f);
+                    text[i].Draw(0,i*50);
                 engine->Update();    //update the screen
             }
         } while(!engine->QuitRequested());    //quit only when engine has encountered a quit request
diff --git a/test/ZSoundTest.cpp b/test/ZSoundTest.cpp
index 38e8e39..44d4422 100644
--- a/test/ZSoundTest.cpp
+++ b/test/ZSoundTest.cpp
@@ -8,7 +8,7 @@
      and the home of this Library is http://www.zengine.sourceforge.net
 *******************************************************************************/
 
-/*$Id: ZSoundTest.cpp,v 1.11 2003/01/12 19:00:22 cozman Exp $*/
+/*$Id: ZSoundTest.cpp,v 1.12 2003/02/10 05:16:30 cozman Exp $*/
 
 #include <ZEngine.h>
 #include <string> 
@@ -91,7 +91,7 @@ void Test()
 
             engine->Clear();    //clear screen
             for(int i=0; i < 6; i++)
-                text[i].Draw(0,i*50.0f);
+                text[i].Draw(0,i*50);
             engine->Update();    //update the screen
         }
 
diff --git a/test/ZTimerTest.cpp b/test/ZTimerTest.cpp
index c4d2b9b..51fdd22 100644
--- a/test/ZTimerTest.cpp
+++ b/test/ZTimerTest.cpp
@@ -8,7 +8,7 @@
      and the home of this Library is http://www.zengine.sourceforge.net
 *******************************************************************************/
 
-/*$Id: ZTimerTest.cpp,v 1.11 2003/01/12 19:00:25 cozman Exp $*/
+/*$Id: ZTimerTest.cpp,v 1.12 2003/02/10 05:16:30 cozman Exp $*/
 
 #include <ZEngine.h>
 #include <string> 
@@ -108,7 +108,7 @@ void Test()
             engine->Clear();    //clear screen
 
             for(int i=0; i <= 4; i++)
-                text[i].Draw(0,i*50.0f);
+                text[i].Draw(0,i*50);
             
             engine->Update();    //update the screen
         }