From 2f333df09f7305a4b25d70c0e57892ac8a247a55 Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Wed, 1 Jun 2011 15:16:37 +0000 Subject: [PATCH] remove some warnings git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@20 47cf9a05-e0a8-4ed5-9e9b-101a649bc004 --- Haptic Metronome/Haptic Metronome.suo | Bin 31232 -> 33792 bytes .../Haptic Metronome/Haptic Metronome.vcxproj | 4 +- .../Haptic Metronome.vcxproj.filters | 3 - src/Mixer.cpp | 4 +- src/PaintGame.cpp | 60 ++---------------- src/Serial.cpp | 2 +- src/Track.cpp | 7 +- src/main.cpp | 2 +- 8 files changed, 18 insertions(+), 64 deletions(-) diff --git a/Haptic Metronome/Haptic Metronome.suo b/Haptic Metronome/Haptic Metronome.suo index 6db2e2cbbb797790d03d3691cb61c6e9c8307b08..6080ca3c055c7efe7d3269a9482a23664743a295 100644 GIT binary patch delta 1289 zcmah|YiLt<6#w6NuiV&o>#UL4ylR>@)h1TgN8(zaU2QdKEkb88X3bh-&4cD9)d{xZ z2Ahc39u-tn=-56ef;I&iI4IbG3|ZrceHm`YM5Wkjp z!{jbKE_Kp^P0SpVvNhrw9Z_oi^g#5GTI)9oCZMfaB%`cbDxn8O9#WbEGB|QgdPHqr zl8wv(*ZmLV^Gim7XL&S;lxb>LU{KL&@Rnh54}ON-OwJ* zZie2Z*>6F&Xm%TPyJq{Kw`8XK%Y?asMM+)>La$D$4*JFXpvplE+77r%3z2%T(5Mo8 zRes)h;@umc@9pRa?&<9M>yz%xsYBaExdo|w-F$}`HLQ=?tyfTv_>K8n?9dVQ$N)VQ z8%Y@pi0^Q4y0S5&j!g;`RrcRD&AP?LwP4E?$W80bbuB`H>v4>+y$^#3rJ?H;~E_w ztf$!`huE*d#SXw%;qVU$iF!JFpghxdtV+zc zeBP`4Fznhaqv2N5Sz(y9vmwOCS)7gHH^idM!bWJRu3CuF^Wv(qbiPswk)wztDdeaI zN0ajnGp`>;G@fTUxj#WqUyS}@==tdK?b&^X0WeriXa1kTo84vYI~ z)`Hq@79x+c%KjdDNV50A%Aeqqwf+9pPoF-tdsFv|+|Rrx=NLHcrgQ(rSr!GyaDLt- zct&V)&`z@zHn|6z+{?F#*F&nudgt<6w@Eg!kHfgV)Cl-a0WPu{*&g72{gEcb<_m{f zOU|U)E{m!$%O|Bl6+Ch@N)EADytp?p;{(#M^M86T_L`OcyRz zNE=7;5H6O))`nP^tgSs(evxsMh-ufqJ^AOChhC;;CZB#|$j)EwUd1mzlL}I>GBmTo zA~ch=dY`lzZC)-+HqkG&!n;`T#vJ@FAbEk@po*FvTAc7vXK9ekt3x!Eh*%Y{@vDvI ko96FY-HXE|*WHoq{hha58*ln3RAQ!ISC*5dCIoT(4WJW$X#fBK delta 504 zcmZqZU~2fnxZwp8>%ag1|Nq+YPXs7z4wahx#VLTp3dqrdsV#9<;otlt zh=XxrLc*qyBdi=C>#bq3Un2ckSQ#Zj+=)UulS|@&t^u0+B@XINVW`5%CGmd+O1J&+ zS2`nR+gPJmYmvp_zqv8NnT5j;sKg#_UJA@*SwIsUfWj_NsmWimLRj2koRaJSutU6{ z0-L{N*E0&9KNWRA!PKaF!m6ib2N%RHWS+cH)@Jg7+-8Vp^UhB`%x$>2B%hH@VD;CX z%oBe$smwi0J0joSC1H;_O mjg8Ke4OloPA8E9i%vhi~xhGm+vt@-l - Level3 + Level4 Disabled _MBCS;%(PreprocessorDefinitions);WIN32;FULLSCREEN + 4996 true @@ -79,7 +80,6 @@ - diff --git a/Haptic Metronome/Haptic Metronome/Haptic Metronome.vcxproj.filters b/Haptic Metronome/Haptic Metronome/Haptic Metronome.vcxproj.filters index 958c602..62ad99a 100644 --- a/Haptic Metronome/Haptic Metronome/Haptic Metronome.vcxproj.filters +++ b/Haptic Metronome/Haptic Metronome/Haptic Metronome.vcxproj.filters @@ -21,9 +21,6 @@ Header Files - - Header Files - Header Files diff --git a/src/Mixer.cpp b/src/Mixer.cpp index 538095b..7c6e562 100644 --- a/src/Mixer.cpp +++ b/src/Mixer.cpp @@ -134,7 +134,7 @@ bool Mixer::addSound(const String &s, const String &filename) { snd = _sounds[s]; } - catch(ExceptionNodeDontExist &e) + catch(ExceptionNodeDontExist &) { _sounds.addNode(s, new Sound); snd = _sounds[s]; @@ -153,7 +153,7 @@ void Mixer::playSound(const String &s) { snd = _sounds[s]; } - catch(ExceptionNodeDontExist &e) + catch(ExceptionNodeDontExist &) { _sounds.addNode(s, new Sound(s)); snd = _sounds[s]; diff --git a/src/PaintGame.cpp b/src/PaintGame.cpp index e2b3b27..c94205b 100644 --- a/src/PaintGame.cpp +++ b/src/PaintGame.cpp @@ -22,8 +22,8 @@ Uint32 start; using namespace std; GLfloat VIEWLENGTH = 250.f; -extern float SECONDSIZE; -float posz = 0; +extern double SECONDSIZE; +double posz = 0; Texture *texturebois, *texturefond, *texturesteel, *texturefrett; int resolution_x, resolution_y; @@ -81,7 +81,6 @@ void init() for (i=0 ; modes[i] ; i++) { SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Resolution available: %d x %d\n", modes[i]->w, modes[i]->h); - //if (modes[i]->w== 1600 && modes[i]->h == 900) //> resolution_x)// if (modes[i]->w * modes[i]->h > resolution_x * resolution_x) { resolution_x = modes[i]->w; @@ -89,12 +88,6 @@ void init() //break; } } -/* if (!modes[i]) - { - cout << "Resolution wanted not available" << endl; - resolution_x = 1024; - resolution_y = 768; - }*/ } #if 0//SDL_VERSION_ATLEAST(1,3,0) @@ -153,11 +146,8 @@ void init() resolution_y = 768; #endif SDL_Surface * screen; -// if (!(screen = SDL_SetVideoMode(resolution_x, resolution_y, 0, flags))) if (!(screen = SDL_SetVideoMode(resolution_x, resolution_y, 0, flags))) throw "Impossible to change the video mode"; -// resolution_x = 1600; -// resolution_y = 900; GLdouble ratio = (GLdouble) screen->w / screen->h; @@ -212,17 +202,7 @@ void initPaint() void draw(const Track &t, char diff) { -/*#ifdef WIN32 - struct { int tv_sec, tv_usec; } now; - DWORD tim = timeGetTime (); - now.tv_sec = tim / 1000; - now.tv_usec = (tim % 1000) * 1000; -#else - struct timeval now; - gettimeofday(&now, NULL); -#endif*/ Uint32 currenttime = SDL_GetTicks() - start; - //(now.tv_sec - start.tv_sec) * 1000 + (now.tv_usec - start.tv_usec) / 1000; posz = -SECONDSIZE * currenttime; @@ -257,7 +237,7 @@ void draw(const Track &t, char diff) //cout << "posz=" << posz << endl; gluLookAt(0, POSITION_HEIGHT, posz + POSITION_EYE, 0, 0, posz + POSITION_CENTER, 0.0f, 1.0f, 0.0f); // gluLookAt(posx-50, posy, posz-POSITION, 0, 0,posz-POSITION, 0.0,1.0,0.0); - GLfloat light_position[] = { 0.0, 10.0f , posz, 1.0f }; + GLfloat light_position[] = { 0.0f, 10.0f , float(posz), 1.0f }; glLightfv(GL_LIGHT1, GL_POSITION, light_position); // cout << "End: " << t.getEndOfTrack() << endl; @@ -281,7 +261,7 @@ void draw(const Track &t, char diff) glMatrixMode(GL_MODELVIEW); glPushMatrix(); - glTranslatef(0, 0, posz); + glTranslatef(0.f, 0.f, float(posz)); //draw the strings for (int i = 0 ; i < 5 ; i++) { @@ -333,7 +313,7 @@ void draw(const Track &t, char diff) glMatrixMode(GL_MODELVIEW); glPushMatrix(); - glTranslatef(0, 0, posz); + glTranslatef(0.f, 0.f, float(posz)); //Draw the position bar glBegin(GL_QUADS); glColor3f(0.8f, 0.8f, 0.8f); @@ -406,7 +386,7 @@ void drawCube(float pos, float size, float colorx, float colory, float colorz) void drawLong(float pos, float size, float length, float colorx, float colory, float colorz) { - float l = length*SECONDSIZE; + float l = length * float(SECONDSIZE); glEnable(GL_TEXTURE_2D); texturesteel->useTexture(); glBegin(GL_QUADS); @@ -480,7 +460,7 @@ void handleKeyOff(keys k, Uint32 currenttime) return; fromKeyboard.setEndTimestamp(currenttime); cout << fromKeyboard << endl; - fromKeyboard.log("Play", logfile); + fromKeyboard.log("Pull", logfile); fromKeyboard.setTimestamp(currenttime); fromKeyboard.setEndTimestamp(-1); @@ -523,20 +503,9 @@ void handleStrokeOff(Uint32 currenttime) bool processEvents() { -/*#ifdef WIN32 - struct { int tv_sec, tv_usec; } now; - DWORD tim = timeGetTime (); - now.tv_sec = tim / 1000; - now.tv_usec = (tim % 1000) * 1000; -#else - struct timeval now; - gettimeofday(&now, NULL); -#endif*/ Uint32 currenttime = SDL_GetTicks() - start; - //(now.tv_sec - start.tv_sec) * 1000 + (now.tv_usec - start.tv_usec) / 1000; SDL_Event event; -// bool quitProgram = false; while (SDL_PollEvent (&event)) { @@ -582,21 +551,6 @@ bool processEvents() Mixer::getInstance()->setMusicVolume(Mixer::getInstance()->getMusicVolume() - 10); Mixer::getInstance()->setSoundVolume(Mixer::getInstance()->getSoundVolume() - 10); break; -/* case SDLK_a: - handleKeyOn(KEY0); - break; - case SDLK_z: - handleKeyOn(KEY1); - break; - case SDLK_e: - handleKeyOn(KEY2); - break; - case SDLK_r: - handleKeyOn(KEY3); - break; - case SDLK_t: - handleKeyOn(KEY4); - break;*/ case SDLK_SPACE: handleStrokeOn(currenttime); break; diff --git a/src/Serial.cpp b/src/Serial.cpp index 7898324..e527263 100644 --- a/src/Serial.cpp +++ b/src/Serial.cpp @@ -1,6 +1,6 @@ #include "Serial.hpp" -Serial::Serial(char *portName) +Serial::Serial(char *) :_connected(false) { } diff --git a/src/Track.cpp b/src/Track.cpp index b5295a0..044ff1d 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -13,7 +13,7 @@ using namespace std; extern Texture* texturesteel, *texturefrett; extern FILE *logfile; -extern float SECONDSIZE; +extern double SECONDSIZE; extern GLfloat VIEWLENGTH; Track::Track() @@ -74,8 +74,11 @@ Track::Track(Uint8 nbbuttons, Uint8 repetitions, Uint8 nbspeeds, Uint32 *speeds) addTempo(tick, timestamp, tempo); vector configs; + //SECURITY + if (nbbuttons > 8) + nbbuttons = 8; //creates a block with repetitions of all the patterns (excluding the empty pattern) - for (int i = 1 ; i < (int)pow(2.0, (double)nbbuttons) ; i++) + for (Uint8 i = 1 ; i < (int)pow(2.0, (double)nbbuttons) ; i++) for (int j = 0 ; j < repetitions ; j++) configs.push_back(i); diff --git a/src/main.cpp b/src/main.cpp index 44dd25c..a72c74e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,7 @@ GameType gametype; #include #endif*/ -float SECONDSIZE = 0.050f; +double SECONDSIZE = 0.050f; FILE *logfile = NULL; void handleStrokeOff() -- 2.30.2