From 3d4c051a02e16d79c3883708a1475e5949e947e9 Mon Sep 17 00:00:00 2001
From: nick <nick@a97b1542-0b21-0410-a459-e47997c36f34>
Date: Sat, 24 May 2008 18:34:03 +0000
Subject: [PATCH] Sort out Key class

git-svn-id: http://svn.nickg.me.uk/work/lander@419 a97b1542-0b21-0410-a459-e47997c36f34
---
 data/Makefile.am              |   3 ++-
 data/graphics/BlueArrow.bmp   | Bin 3126 -> 0 bytes
 data/graphics/GreenArrow.bmp  | Bin 3126 -> 0 bytes
 data/graphics/PinkArrow.bmp   | Bin 3126 -> 0 bytes
 data/graphics/RedArrow.bmp    | Bin 3126 -> 0 bytes
 data/graphics/YellowArrow.bmp | Bin 3126 -> 0 bytes
 src/Key.cpp                   |  34 +++++++---------------------------
 src/Key.hpp                   |   5 +++--
 8 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 data/graphics/BlueArrow.bmp
 delete mode 100644 data/graphics/GreenArrow.bmp
 delete mode 100644 data/graphics/PinkArrow.bmp
 delete mode 100644 data/graphics/RedArrow.bmp
 delete mode 100644 data/graphics/YellowArrow.bmp

diff --git a/data/Makefile.am b/data/Makefile.am
index 39d7bed..a342769 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,8 @@ EXTRA_DIST = images/ship.png images/star.png images/start_option.png \
 	images/score_option.png images/options_option.png \
 	images/exit_option.png images/keyblue.png images/keygreen.png \
 	images/keyyellow.png images/keygreen.png images/keypink.png \
-	images/keyred.png
+	images/keyred.png images/arrowred.png images/arrowblue.png \
+	images/arrowyellow.png images/arrowpink.png images/arrowgreen.png
 
 nobase_dist_pkgdata_DATA = $(EXTRA_DIST)
 
diff --git a/data/graphics/BlueArrow.bmp b/data/graphics/BlueArrow.bmp
deleted file mode 100644
index 9abda1ece41fe2b3b19010b78498303df7568682..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3126
zcmZ?rHRE9b12Z700mKSW%*Y@CWZ?k+85oF05QW66CrKr;D@f8vjACTNsqPC*!>MQm
zF2ku}1%AURw1ODJ$+m)c!^yCMRKrQKf;_{Cw1N`D30gt9;drc|mf={fpswL)R?xz5
dxD~WB9Bu_M<>#oH(GVC7fzc2c4S``60stoD{k8xA

diff --git a/data/graphics/GreenArrow.bmp b/data/graphics/GreenArrow.bmp
deleted file mode 100644
index 4cf0a5f31d735c093817c0fb604bad2ac10e4c57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3126
zcmZ?rHRE9b12Z700mKSW%*Y@CWZ?k+85oF14;UDLh<NoRse~9#BP);%r@9rGhEvfB
zT!vG{3jBssXazBblWhg@hLd3hsfLqe1$l-OX$2*Q6SRVI!|_-_EyJ-|L0!Yqte}PA
da4TqMINS=7O6gI>qaiRF0;3@?8Un*21ORB)+{OR^

diff --git a/data/graphics/PinkArrow.bmp b/data/graphics/PinkArrow.bmp
deleted file mode 100644
index a6d20505e24832904d51de148a7d894cca52333c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3126
zcmZ?rHRE9b12Z700mKSW%*Y@CWZ?k+85oF0{~7)R5%KCtQVB7fMphsjPIW6V4X2_N
zxD2O?75ELO&<bJ<C)*0*4JX42QVl1`3i1pm(h5opCujxbhU2k<T83k_g1UyISwRcK
e;a1SjaJUsDmC~b%M?+vV1V%$(Gz5l62mk<%WDLXr

diff --git a/data/graphics/RedArrow.bmp b/data/graphics/RedArrow.bmp
deleted file mode 100644
index f90d5401f28577f3d0b216027311191c430ffeff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3126
zcmZ?rHRE9b12Z700mKSW%*Y@CWZ?k+85oF15T(ScCrKr;J4n(<jACTNsqPC*!>MQm
zF2ku}1%AURw1ODJ$+m)c!^yCMRKrQKf;_{Cw1N`D30gt9;drc|mf={fpswL)R?xz5
dxD~WB9Bu_M<>#oH(GVC7fzc2c4T0em0ssi+{k8xA

diff --git a/data/graphics/YellowArrow.bmp b/data/graphics/YellowArrow.bmp
deleted file mode 100644
index 2cdafd82accde90620cd0e7c13a7951979fe2eba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3126
zcmZ?rHRE9b12Z700mKSW%*Y@CWZ?k+85l@F{~7)R5lLEzR}3+nMphsjPIW6V4X2_N
zxD2O?75ELO&<bJ<C)*0*4JX42QVl1`3i1pm(h5opCujxbhU2k<T83k_g1UyISwRcK
e;a1SjaJUu37ty0CM?+vV1V%$(Gz5l82mk<oWemgs

diff --git a/src/Key.cpp b/src/Key.cpp
index 7a359b9..5f8a57b 100644
--- a/src/Key.cpp
+++ b/src/Key.cpp
@@ -17,14 +17,8 @@
 
 #include "Key.hpp"
 #include "OpenGL.hpp"
-#include "DataFile.hpp"
 #include "LoadOnce.hpp"
 
-extern DataFile *g_pData;
-
-GLuint Key::uBlueArrow, Key::uPinkArrow, Key::uRedArrow;
-GLuint Key::uYellowArrow, Key::uGreenArrow;
-
 AnimatedImage *Key::blueImage = NULL;
 AnimatedImage *Key::redImage = NULL;
 AnimatedImage *Key::greenImage = NULL;
@@ -42,8 +36,6 @@ Key::Key(bool active, int xpos, int ypos, ArrowColour acol)
 {
    // Static initialisation
    LOAD_ONCE {
-      OpenGL &opengl = OpenGL::GetInstance();
-
       blueImage = new AnimatedImage("images/keyblue.png", 32, KEY_FRAMES);
       redImage = new AnimatedImage("images/keyred.png", 32, KEY_FRAMES);
       greenImage = new AnimatedImage("images/keygreen.png", 32, KEY_FRAMES);
@@ -55,41 +47,32 @@ Key::Key(bool active, int xpos, int ypos, ArrowColour acol)
       greenArrow = new Image("images/arrowgreen.png");
       yellowArrow = new Image("images/arrowyellow.png");
       pinkArrow = new Image("images/arrowpink.png");
-      
-      uBlueArrow = opengl.LoadTextureAlpha(g_pData, "BlueArrow.bmp");
-      uRedArrow = opengl.LoadTextureAlpha(g_pData, "RedArrow.bmp");
-      uGreenArrow = opengl.LoadTextureAlpha(g_pData, "GreenArrow.bmp");
-      uYellowArrow = opengl.LoadTextureAlpha(g_pData, "YellowArrow.bmp");
-      uPinkArrow = opengl.LoadTextureAlpha(g_pData, "PinkArrow.bmp");
    }
    
    alpha = active ? 1.0 : 0.0;
 
-   current = 0;
    rotcount = KEY_ROTATION_SPEED;
 
    // Allocate arrow images
-   arrow.width = OBJ_GRID_SIZE;
-   arrow.height = OBJ_GRID_SIZE;
    switch (acol) {
    case acBlue:
-      arrow.uTexture = uBlueArrow;
+      arrow = blueArrow;
       image = blueImage;
       break;
    case acRed:
-      arrow.uTexture = uRedArrow;
+      arrow = redArrow;
       image = redImage;
       break;
    case acYellow:
-      arrow.uTexture = uYellowArrow;
+      arrow = yellowArrow;
       image = yellowImage;
       break;
    case acPink:
-      arrow.uTexture = uPinkArrow;
+      arrow = pinkArrow;
       image = pinkImage;
       break;
    case acGreen:
-      arrow.uTexture = uGreenArrow;
+      arrow = greenArrow;
       image = greenImage;
       break;
    }
@@ -135,11 +118,8 @@ void Key::DrawArrow(Viewport *viewport)
          ay = screenHeight - ARROW_SIZE;
          angle = 0;
       }
-      
-      arrow.x = ax;
-      arrow.y = ay;
-			
-      OpenGL::GetInstance().DrawRotate(&arrow, angle);
+
+      arrow->Draw(ax, ay, angle);
    }
 }
 
diff --git a/src/Key.hpp b/src/Key.hpp
index 30a1df7..e1cf767 100644
--- a/src/Key.hpp
+++ b/src/Key.hpp
@@ -41,10 +41,11 @@ private:
    static const int KEY_ROTATION_SPEED = 2;
    static const int ARROW_SIZE = 32;
    
-   int current, rotcount;
+   int rotcount;
    float alpha;
    bool active;
-   AnimatedImage *image, *arrow;
+   AnimatedImage *image;
+   Image *arrow;
 
    static AnimatedImage *blueImage, *redImage, *yellowImage,
       *pinkImage, *greenImage;
-- 
2.39.2