Changeset 11755 for code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc

Timestamp:

Feb 16, 2018, 12:37:37 AM (7 years ago)

Author:

landauf

Message:

[FlappyOrx_HS17] fixed some warnings (MSVC)

File:

• code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) (6 diffs)

code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc

@@ -67 +67 @@
         firstGame = true;                   //needed for the HUD
 
-        tubeDistance=200;                  //distance between tubes
-        tubeOffsetX=500;                    //tube offset (so that we can't see them spawn)
+        tubeDistance=200.0f;                  //distance between tubes
+        tubeOffsetX=500.0f;                    //tube offset (so that we can't see them spawn)
 
         circlesUsed=0;
@@ -74 +74 @@
     }
     
-    void FlappyOrx::updatePlayerPos(int x){
+    void FlappyOrx::updatePlayerPos(float x){
 
         //Spawn a new Tube when the spawn distance is reached
@@ -116 +116 @@
             return;
 
-        int space = 130;    //vertical space between top and bottom tube
-        int height = (float(rand())/RAND_MAX-0.5)*(280-space);  //Randomize height
+        float space = 130.0f;    //vertical space between top and bottom tube
+        float height = (rnd()-0.5f)*(280.0f-space);  //Randomize height
            
         Vector3 pos = player->getPosition();
 
         //create the two Asteroid fields (Tubes)
-        asteroidField(pos.x+tubeOffsetX,height-space/2,0.8);  //bottom  
-        asteroidField(pos.x+tubeOffsetX,height+space/2,-0.8); //top
+        asteroidField(pos.x+tubeOffsetX,height-space/2,0.8f);  //bottom
+        asteroidField(pos.x+tubeOffsetX,height+space/2,-0.8f); //top
     }
 
     //Creates a new asteroid Field
-    void FlappyOrx::asteroidField(int x, int y, float slope){
-        int r = 20;     //Radius of added Asteroids
+    void FlappyOrx::asteroidField(float x, float y, float slope){
+        float r = 20.0f;     //Radius of added Asteroids
         int noadd = 0;  //how many times we failed to add a new asteroid
 
@@ -141 +141 @@
         while(noadd<5&&circlesUsed<nCircles){
             if(slope>0)
-                newAsteroid.y=float(rand())/RAND_MAX*(150+y)-150;   //create asteroid on bottom
+                newAsteroid.y=rnd(150+y)-150;   //create asteroid on bottom
             else
-                newAsteroid.y=float(rand())/RAND_MAX*(150-y)+y;     //create asteroid on top
+                newAsteroid.y=rnd(150-y)+y;     //create asteroid on top
             
-            newAsteroid.x=x+(float(rand())/RAND_MAX-0.5)*(y-newAsteroid.y)/slope;
+            newAsteroid.x=x+(rnd()-0.5f)*(y-newAsteroid.y)/slope;
             newAsteroid.r=r;
            
@@ -174 +174 @@
 
         //Randomize orientation
-        newAsteroid->setOrientation(Vector3::UNIT_Z, Degree(rand()%360));
-        newAsteroid->setOrientation(Vector3::UNIT_Y, Degree(rand()%360));
+        newAsteroid->setOrientation(Vector3::UNIT_Z, Degree(rnd(360)));
+        newAsteroid->setOrientation(Vector3::UNIT_Y, Degree(rnd(360)));
 
         //add to Queue (so that we can delete it again)
@@ -193 +193 @@
         if(c1.r<=0 || c2.r<=0)
             return false;
-        int x = c1.x - c2.x;
-        int y = c1.y - c2.y;
-        int r = c1.r + c2.r;
+        float x = c1.x - c2.x;
+        float y = c1.y - c2.y;
+        float r = c1.r + c2.r;
 
         return x*x+y*y<r*r*1.5;