From 7fd4665bda664496132d95dc3f09adb0c7abbab5 Mon Sep 17 00:00:00 2001
From: nick <nick@a97b1542-0b21-0410-a459-e47997c36f34>
Date: Sat, 19 Apr 2008 18:25:51 +0000
Subject: [PATCH] Tidy up menu a bit

git-svn-id: http://svn.nickg.me.uk/work/lander@348 a97b1542-0b21-0410-a459-e47997c36f34
---
 trunk/data/Makefile.am     |   2 +-
 trunk/data/images/star.png | Bin 0 -> 4026 bytes
 trunk/src/Image.cpp        |  13 +++++++-----
 trunk/src/Image.hpp        |   3 ++-
 trunk/src/Makefile.am      |   2 +-
 trunk/src/Menu.cpp         |  40 +++++++++++++++----------------------
 trunk/src/Menu.hpp         |  12 +++++------
 7 files changed, 33 insertions(+), 39 deletions(-)
 create mode 100644 trunk/data/images/star.png

diff --git a/trunk/data/Makefile.am b/trunk/data/Makefile.am
index 29ec90c..4750887 100644
--- a/trunk/data/Makefile.am
+++ b/trunk/data/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = images/ship.png
+EXTRA_DIST = images/ship.png images/star.png
 
 nobase_dist_pkgdata_DATA = $(EXTRA_DIST)
 
diff --git a/trunk/data/images/star.png b/trunk/data/images/star.png
new file mode 100644
index 0000000000000000000000000000000000000000..dac1a1a3ed40db8d5c6a9b5ec6f2540c38bcb740
GIT binary patch
literal 4026
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
QEVTg(vumbg6Ssu_13rMsPXGV_

literal 0
HcmV?d00001

diff --git a/trunk/src/Image.cpp b/trunk/src/Image.cpp
index 0e2f77c..17cb3fe 100644
--- a/trunk/src/Image.cpp
+++ b/trunk/src/Image.cpp
@@ -76,17 +76,20 @@ Image::~Image()
    glDeleteTextures(1, &texture);
 }
 
-void Image::Draw(int x, int y) const
+void Image::Draw(int x, int y, double rotate, double scale, double alpha) const
 {
    glEnable(GL_TEXTURE_2D);
    glEnable(GL_BLEND);
    glBindTexture(GL_TEXTURE_2D, texture);
    glLoadIdentity();
    glTranslated((double)(x + width/2), (double)(y + height/2), 0.0);
+   glScaled(scale, scale, 0);
+   glRotated(rotate, 0.0, 0.0, 1.0);
+   glColor4d(1.0, 1.0, 1.0, alpha);
    glBegin(GL_QUADS);
-   glTexCoord2f(0.0f, 0.0f); glVertex2i(-(width/2), -(height/2));
-   glTexCoord2f(0.0f, 1.0f); glVertex2i(-(width/2), height/2);
-   glTexCoord2f(1.0f, 1.0f); glVertex2i(width/2, height/2);
-   glTexCoord2f(1.0f, 0.0f); glVertex2i(width/2, -(height/2));
+   glTexCoord2d(0.0, 0.0); glVertex2i(-(width/2), -(height/2));
+   glTexCoord2d(0.0, 1.0); glVertex2i(-(width/2), height/2);
+   glTexCoord2d(1.0, 1.0); glVertex2i(width/2, height/2);
+   glTexCoord2d(1.0, 0.0); glVertex2i(width/2, -(height/2));
    glEnd();
 }
diff --git a/trunk/src/Image.hpp b/trunk/src/Image.hpp
index 5bc5a86..65ff880 100644
--- a/trunk/src/Image.hpp
+++ b/trunk/src/Image.hpp
@@ -25,7 +25,8 @@ public:
    Image(const char *file);
    ~Image();
 
-   void Draw(int x, int y) const;
+   void Draw(int x, int y, double rotate=0.0, double scale=1.0,
+             double alpha=1.0) const;
 
    int GetWidth() const { return width; }
    int GetHeight() const { return height; }
diff --git a/trunk/src/Makefile.am b/trunk/src/Makefile.am
index e009667..343231f 100644
--- a/trunk/src/Makefile.am
+++ b/trunk/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = lander
 
-AM_CXXFLAGS=$(LANDER_CFLAGS) $(SDL_CFLAGS) 
+AM_CXXFLAGS=$(LANDER_CFLAGS) $(SDL_CFLAGS) -Wall
 AM_LDFLAGS=$(LANDER_LIBS) $(SDL_LIBS) -lGLU $(LTLIBINTL)
 lander_SOURCES = Main.cpp Lander.hpp Game.cpp \
 	Bitmap.cpp Bitmap.hpp FreeType.cpp FreeType.hpp \
diff --git a/trunk/src/Menu.cpp b/trunk/src/Menu.cpp
index da6a459..14d14ea 100644
--- a/trunk/src/Menu.cpp
+++ b/trunk/src/Menu.cpp
@@ -19,14 +19,15 @@
 
 #include "Lander.hpp"
 
-const float MenuStar::ROTATE_SPEED(0.005f);
-const float MenuStar::ENLARGE_RATE(0.003f);
-const float MenuStar::INIT_SCALE(0.1f);
-const float MenuStar::SPEED(4.0f);
-const int MenuStar::TEXTURE_SIZE(20);
+const double MenuStar::ROTATE_SPEED(0.005);
+const double MenuStar::ENLARGE_RATE(0.001);
+const double MenuStar::INIT_SCALE(0.01);
+const double MenuStar::SPEED(4.0);
 
 extern DataFile *g_pData;
 
+Image *MenuStar::starImage = NULL;
+
 void MainMenu::Load()
 {
    OpenGL &opengl = OpenGL::GetInstance();
@@ -268,23 +269,16 @@ void MainMenu::Display()
             hints[hintidx][1]);
 }
 
-bool MenuStar::hasLoaded = false;
-float MenuStar::starRotate = 0.0f;
-GLuint MenuStar::uStarTexture = 0;
+double MenuStar::starRotate = 0.0;
 
 MenuStar::MenuStar()
-   : active(false),
-     scale(INIT_SCALE)
-{
-   OpenGL &opengl = OpenGL::GetInstance();
-   
-   if (!hasLoaded) {
-      uStarTexture = opengl.LoadTextureAlpha(g_pData, "Star.bmp");
-      hasLoaded = true;
-   }
+   : scale(INIT_SCALE), active(false)
+{   
+   if (NULL == starImage)
+      starImage = new Image("images/star.png");
 
-   const int screenWidth = opengl.GetWidth();
-   const int screenHeight = opengl.GetHeight();
+   const int screenWidth = OpenGL::GetInstance().GetWidth();
+   const int screenHeight = OpenGL::GetInstance().GetHeight();
 
    pos = Position((float)(rand()%(screenWidth/2) + screenWidth/4),
                   (float)(rand()%(screenHeight/2) + screenHeight/4));
@@ -296,9 +290,7 @@ MenuStar::MenuStar()
 
 void MenuStar::Display(float fade)
 {
-   TextureQuad quad(pos.GetX(), pos.GetY(), TEXTURE_SIZE, TEXTURE_SIZE,
-                    uStarTexture);
-   OpenGL::GetInstance().DrawRotateBlendScale(&quad, starRotate, fade, scale);
+   starImage->Draw(pos.GetX(), pos.GetY(), starRotate, scale);
    starRotate += ROTATE_SPEED;
 }
 
@@ -314,6 +306,6 @@ bool MenuStar::Move()
    // Has it left the screen?
    return (pos.GetX() > OpenGL::GetInstance().GetWidth()
            || pos.GetY() > OpenGL::GetInstance().GetHeight()
-           || pos.GetX() + TEXTURE_SIZE < 0
-           || pos.GetY() + TEXTURE_SIZE < 0);
+           || pos.GetX() + starImage->GetWidth() < 0
+           || pos.GetY() + starImage->GetWidth() < 0);
 }
diff --git a/trunk/src/Menu.hpp b/trunk/src/Menu.hpp
index 9351393..6065709 100644
--- a/trunk/src/Menu.hpp
+++ b/trunk/src/Menu.hpp
@@ -36,17 +36,15 @@ public:
    void Display(float fade=1.0f);
 
 private:
-   static const float ROTATE_SPEED, ENLARGE_RATE, INIT_SCALE, SPEED;
-   static const int TEXTURE_SIZE;
+   static const double ROTATE_SPEED, ENLARGE_RATE, INIT_SCALE, SPEED;
    
-   float scale;
+   double scale;
    bool active;
    Position pos;
    Velocity vel;
 
-   static float starRotate;
-   static bool hasLoaded;
-   static GLuint uStarTexture;
+   static double starRotate;
+   static Image *starImage;
 };
 
 class MainMenu : public Screen {
@@ -69,7 +67,7 @@ private:
 	
    int hint_timeout, hintidx;
 
-   static const int MAX_STARS = 80;
+   static const unsigned MAX_STARS = 80;
    typedef vector<MenuStar> StarList;
    typedef StarList::iterator StarListIt;
    vector<MenuStar> stars;
-- 
2.39.2