From b9989aa38a46cf1d383766f7490868f27cbfaf3e Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 6 Jun 2009 16:21:58 +0100 Subject: [PATCH] More Windows porting --- msvc9/Lander/Lander.suo | Bin 24064 -> 30720 bytes msvc9/Lander/Lander/Lander.vcproj | 4 ++-- src/Fade.cpp | 28 ++++++++++++++-------------- src/Fade.hpp | 6 +++--- src/Main.cpp | 2 +- src/Platform.hpp | 10 ++++++---- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/msvc9/Lander/Lander.suo b/msvc9/Lander/Lander.suo index 96141615f42943c50322f36032567179d2b5fade..bb92aa319f9a70b033f683afd6c27621eb1ee83f 100644 GIT binary patch delta 2633 zcmcIkZ%k8H6u9Dm6h6enpEI+dV4L&kpPhLS@_AJ(Zpz8`(+ zH+&e&jhd|g$vvY(-)R3BZ%B%8YSgbj&Wb9WPK)%@V0J5CHi2ii8imzyiu#(f2;-)$ zxMlh%H-oSS7G@pvJGr!X&Br*ez~A$3p}`Xvo=14=q)ufP#>xL)nXzFKvA#VQv_2gF zJt^?(bas=75YllgogE~3({Ll5?Igw1@OS9EmxNY!nj`J78G z{|=YLPJ6ug1joTjPi7YzpbujUz@2sQ`|Om)t>ml`1FvLd?wZsV;7W0qmT({E+^63k z^w51zYebn(cMsxPTOA_7GFuPZO}Q4|Wo#E|TqN$VOT^JO1|F7bMc{X zA4bcpT*m6iPHx4arM-rutP3$yVb`0ipFaE8AbFeGcTy*IvPu?u3hiKTvtIhgZn8h1 z-|1$3WYJHtcT<{ol9ygO?IE3rYT~_4l-I^^&$k3yy=M{k4bXe7+)Pn@fJAeg8`1A= z(Gtb=3fv{ddef!SV&#j;ETkp;=M9UWesS&OzwTiXW@cHGmk@3*tHo%kh4N~^m9_@T zQ-t<*tX_94?%x#;H0O0wZ0}KQsahUy-4R7T+TL*;~lNfiw^Kq#-BYcQCnASzpv=F^yTi*_qb5|gQACyp{nh{%HYaXf&r>rEoCv5Oinn^ zFFohB?hT{WMewh1XyJ&OS>H>xq7}tTXICD@;SrRZhT8}$OvAO2#t}Z8;;NlAMI?fM z>E1HwEHJUsaluC#ANoqi!xU-df@kqF1YICeNz&{k)`?iSoI7wNoQqGYstuJvhD5j? z7rhbfaI?hYHHFx0b74m$BB|`+h75@xN9INsKZE5P>*V|754$(6$CpwR@}{$y4+!{` z9Dg>M3uX?2xcI#o*f--G6{XRXyGrYbT{@he+dExK|#7zr-i{N&XJ)nnPvnzhAdMc^+#yA zO#A!e0$xj41y2gGjGC1|L`z&5S6DRpLa-b0uelt|-Pp^aC9CjOMDlP1ukJOu?YjYC*e-M zh4(2}p%tI!A^25vkz0|!w-X)v%%VckQ>i^7)d^2}Cyj-O{5@T|FIAPf1S|u0kdc+m*m^c3{&xo&B>}dkSJYZN zdX87&Wl{_Z>k{d9EKoDddR~DNVoZ -const double Fade::DEFAULT_FADE_SPEED(0.05); +const float Fade::DEFAULT_FADE_SPEED(0.05f); -Fade::Fade(double s) - : state(fNone), alpha(0.0), speed(s) +Fade::Fade(float s) + : state(fNone), alpha(0.0f), speed(s) { } @@ -33,7 +33,7 @@ void Fade::BeginFadeIn() assert(state == fNone); state = fIn; - alpha = 1.0; + alpha = 1.0f; } void Fade::BeginFadeOut() @@ -41,7 +41,7 @@ void Fade::BeginFadeOut() assert(state == fNone); state = fOut; - alpha = 0.0; + alpha = 0.0f; } bool Fade::Process() @@ -49,7 +49,7 @@ bool Fade::Process() switch (state) { case fOut: alpha += speed; - if (alpha >= 1.0) { + if (alpha >= 1.0f) { state = fNone; return true; } @@ -57,7 +57,7 @@ bool Fade::Process() return false; case fIn: alpha -= speed; - if (alpha <= 0.0) { + if (alpha <= 0.0f) { state = fNone; return true; } @@ -70,17 +70,17 @@ bool Fade::Process() void Fade::Display() { - double w = OpenGL::GetInstance().GetWidth(); - double h = OpenGL::GetInstance().GetHeight(); + const int w = OpenGL::GetInstance().GetWidth(); + const int h = OpenGL::GetInstance().GetHeight(); glEnable(GL_BLEND); glDisable(GL_TEXTURE_2D); - glColor4d(0.0, 0.0, 0.0, alpha); + glColor4f(0.0f, 0.0f, 0.0f, alpha); glLoadIdentity(); glBegin(GL_QUADS); - glVertex3d(0.0, 0.0, 0.0); - glVertex3d(0.0, h, 0.0); - glVertex3d(w, h, 0.0); - glVertex3d(w, 0.0, 0.0); + glVertex3i(0, 0, 0); + glVertex3i(0, h, 0); + glVertex3i(w, h, 0); + glVertex3i(w, 0, 0); glEnd(); } diff --git a/src/Fade.hpp b/src/Fade.hpp index 76da4e5..70fc5f7 100644 --- a/src/Fade.hpp +++ b/src/Fade.hpp @@ -22,9 +22,9 @@ class Fade { public: - static const double DEFAULT_FADE_SPEED; + static const float DEFAULT_FADE_SPEED; - Fade(double s = DEFAULT_FADE_SPEED); + Fade(float s = DEFAULT_FADE_SPEED); void BeginFadeIn(); void BeginFadeOut(); @@ -34,7 +34,7 @@ private: enum State { fNone, fIn, fOut }; State state; - double alpha, speed; + float alpha, speed; }; #endif diff --git a/src/Main.cpp b/src/Main.cpp index 05f669b..72ac127 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -169,7 +169,7 @@ string LocateResource(const string& file) cfBase = CFStringCreateWithCString(NULL, copy, kCFStringEncodingASCII); cfExt = CFStringCreateWithCString(NULL, ext, kCFStringEncodingASCII); - free(copy); + free(copy); mainBundle = CFBundleGetMainBundle(); diff --git a/src/Platform.hpp b/src/Platform.hpp index 6c9245a..d89b2f2 100644 --- a/src/Platform.hpp +++ b/src/Platform.hpp @@ -1,5 +1,5 @@ // -// Platform.hpp -- Platform specific includes. +// Platform.hpp -- Platform specific hacks. // Copyright (C) 2006-2009 Nick Gasson // // This program is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ #define DATADIR "." #endif -// Windows specific constants and includes */ +// Windows specific constants and includes #ifdef WIN32 #define WIN32_LEAN_AND_MEAN @@ -49,7 +49,7 @@ #define PATH_MAX 256 -// Don't have these on Windows for some reason */ +// Don't have these on Windows for some reason #ifndef GL_BGRA #define GL_BGRA 0 #endif @@ -57,7 +57,7 @@ #define GL_BGR 0 #endif -// Define safe snprintf, etc. for MSCV8 */ +// Define safe snprintf, etc. for MSCV8 #if (_MSC_VER >= 1400) #define USE_FOPEN_S @@ -124,6 +124,8 @@ #endif /* #ifdef LINUX */ +#include + using namespace std; using namespace std::tr1; -- 2.39.2