Camera now moves quickier and slows down in less time.

This commit is contained in:
Xavier ASUS 2018-11-24 11:54:40 +01:00
parent d2dc5a7b15
commit d224f1c458
1 changed files with 19 additions and 11 deletions

View File

@ -10,7 +10,7 @@
* Defines * Defines
* *************************************/ * *************************************/
#define SPEED_CALCULATION_TIME 3 #define SPEED_CALCULATION_TIME 3
#define MAX_CAMERA_SPEED 5 #define MAX_CAMERA_SPEED 8
#define MIN_CAMERA_SPEED 1 #define MIN_CAMERA_SPEED 1
#define CAMERA_INITIAL_X_OFFSET (X_SCREEN_RESOLUTION >> 1) #define CAMERA_INITIAL_X_OFFSET (X_SCREEN_RESOLUTION >> 1)
#define CAMERA_INITIAL_X_OFFSET_2PLAYER (X_SCREEN_RESOLUTION >> 2) #define CAMERA_INITIAL_X_OFFSET_2PLAYER (X_SCREEN_RESOLUTION >> 2)
@ -66,7 +66,7 @@ void CameraUpdateSpeed(TYPE_PLAYER* const ptrPlayer)
{ {
if (ptrPlayer->Camera.X_Speed < 0) if (ptrPlayer->Camera.X_Speed < 0)
{ {
ptrPlayer->Camera.X_Speed += 2; ptrPlayer->Camera.X_Speed += 3;
} }
else if (ptrPlayer->Camera.X_Speed < MAX_CAMERA_SPEED) else if (ptrPlayer->Camera.X_Speed < MAX_CAMERA_SPEED)
{ {
@ -78,7 +78,7 @@ void CameraUpdateSpeed(TYPE_PLAYER* const ptrPlayer)
{ {
if (ptrPlayer->Camera.Y_Speed < 0) if (ptrPlayer->Camera.Y_Speed < 0)
{ {
ptrPlayer->Camera.Y_Speed += 2; ptrPlayer->Camera.Y_Speed += 3;
} }
else if (ptrPlayer->Camera.Y_Speed < MAX_CAMERA_SPEED) else if (ptrPlayer->Camera.Y_Speed < MAX_CAMERA_SPEED)
{ {
@ -115,28 +115,36 @@ void CameraUpdateSpeed(TYPE_PLAYER* const ptrPlayer)
&& &&
(ptrPlayer->PadKeyPressed_Callback(PAD_RIGHT) == false) ) (ptrPlayer->PadKeyPressed_Callback(PAD_RIGHT) == false) )
{ {
if (ptrPlayer->Camera.X_Speed > 0) if (ptrPlayer->Camera.X_Speed >= 2)
{ {
ptrPlayer->Camera.X_Speed--; ptrPlayer->Camera.X_Speed -= 2;
} }
else if (ptrPlayer->Camera.X_Speed < 0) else if (ptrPlayer->Camera.X_Speed <= -2)
{ {
ptrPlayer->Camera.X_Speed++; ptrPlayer->Camera.X_Speed += 2;
} }
else
{
ptrPlayer->Camera.X_Speed = 0;
}
} }
if ( (ptrPlayer->PadKeyPressed_Callback(PAD_UP) == false) if ( (ptrPlayer->PadKeyPressed_Callback(PAD_UP) == false)
&& &&
(ptrPlayer->PadKeyPressed_Callback(PAD_DOWN) == false) ) (ptrPlayer->PadKeyPressed_Callback(PAD_DOWN) == false) )
{ {
if (ptrPlayer->Camera.Y_Speed > 0) if (ptrPlayer->Camera.Y_Speed >= 2)
{ {
ptrPlayer->Camera.Y_Speed--; ptrPlayer->Camera.Y_Speed -= 2;
} }
else if (ptrPlayer->Camera.Y_Speed < 0) else if (ptrPlayer->Camera.Y_Speed <= -2)
{ {
ptrPlayer->Camera.Y_Speed++; ptrPlayer->Camera.Y_Speed += 2;
} }
else
{
ptrPlayer->Camera.Y_Speed = 0;
}
} }
} }