Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce new functions range() and rangef() to clip a value into a certain range. 

Use that to cleanup some code.
Because of the lack of a local "math.h", it went into trig.h.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3483 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-01-15 18:02:54 +00:00
parent 8ce3b1fcce
commit ff34e1fb68
5 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/framework/trig.h
View File

@ -30,6 +30,32 @@
#define DEG_TO_RAD(x) (x * M_PI / 180.0)
#define RAD_TO_DEG(x) (x * 180.0 / M_PI)
/*!
* Moves x into the range 0 - y
* \param x Value to clip
* \param y Upper range
* \return Value in the range 0 - y
*/
static inline WZ_DECL_CONST int range(int x, int y)
{
while(x < 0) x += y;
while(x >= y) x -= y;
return x;
}
/*!
* Moves x into the range 0.0f - y
* \param x Value to clip
* \param y Upper range
* \return Value in the range 0.0f - y
*/
static inline WZ_DECL_CONST float rangef(float x, float y)
{
while(x < 0.0f) x += y;
while(x >= y) x -= y;
return x;
}
/* Initialise the Trig tables */
extern BOOL trigInitialise(void);

2
lib/ivis_common/pievector.h
View File

@ -56,7 +56,7 @@ static inline WZ_DECL_CONST Vector2i Vector2i_Add(const Vector2i op1, const Vect
{
Vector2i dest = {
op1.x + op2.x,
op1.y + op2.y
op1.y + op2.y
};
return dest;
}

6
src/display3d.c
View File

@ -3580,11 +3580,7 @@ static void renderSurroundings(void)
if(!gamePaused())
{
wind += timeAdjustedIncrement(0.5f, FALSE);
if(wind >= 360.0f)
{
wind = 0.0f;
}
wind = rangef(wind + timeAdjustedIncrement(0.5f, FALSE), 360.0f);
}
pie_DrawSkybox(skybox_scale, 0, 128, 256, 128);

42
src/move.c
View File

@ -323,7 +323,7 @@ void moveUpdateBaseSpeed(void)
((psNextRouteDroid->sMove.Status != MOVEROUTE) &&
(psNextRouteDroid->sMove.Status != MOVEROUTESHUFFLE)))
{
objTrace(LOG_MOVEMENT, psNextRouteDroid->id, "Waiting droid %d (player %d) reset",
objTrace(LOG_MOVEMENT, psNextRouteDroid->id, "Waiting droid %d (player %d) reset",
(int)psNextRouteDroid->id, (int)psNextRouteDroid->player);
psNextRouteDroid = NULL;
}
@ -377,7 +377,7 @@ static BOOL moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, BOOL bFormation)
x = psDroid->sMove.DestinationX;
y = psDroid->sMove.DestinationY;
objTrace(LOG_MOVEMENT, psDroid->id, "unit %d: path ok - base Speed %u, speed %f, target(%d, %d)",
objTrace(LOG_MOVEMENT, psDroid->id, "unit %d: path ok - base Speed %u, speed %f, target(%d, %d)",
(int)psDroid->id, psDroid->baseSpeed, psDroid->sMove.speed, (int)x, (int)y);
psDroid->sMove.Status = MOVENAVIGATE;
@ -389,7 +389,7 @@ static BOOL moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, BOOL bFormation)
// reset the next route droid
if (psDroid == psNextRouteDroid)
{
objTrace(LOG_MOVEMENT, psDroid->id, "Waiting droid %d (player %d) got route",
objTrace(LOG_MOVEMENT, psDroid->id, "Waiting droid %d (player %d) got route",
(int)psDroid->id, (int)psDroid->player);
psNextRouteDroid = NULL;
}
@ -448,7 +448,7 @@ static BOOL moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, BOOL bFormation)
if ((psDroid->sMove.Status != MOVEROUTE) &&
(psDroid->sMove.Status != MOVEROUTESHUFFLE))
{
objTrace(LOG_MOVEMENT, psDroid->id, "moveDroidToBase(%d): started waiting at %d",
objTrace(LOG_MOVEMENT, psDroid->id, "moveDroidToBase(%d): started waiting at %d",
(int)psDroid->id, (int)gameTime);
psDroid->sMove.Status = MOVEROUTE;
@ -462,13 +462,13 @@ static BOOL moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, BOOL bFormation)
// reset the next route droid
if (psDroid == psNextRouteDroid)
{
objTrace(LOG_MOVEMENT, psDroid->id, "moveDroidToBase(%d): out of time, waiting for next frame (we are next)",
objTrace(LOG_MOVEMENT, psDroid->id, "moveDroidToBase(%d): out of time, waiting for next frame (we are next)",
(int)psDroid->id);
psNextRouteDroid = NULL;
}
else
{
objTrace(LOG_MOVEMENT, psDroid->id, "moveDroidToBase(%d): out of time, waiting for next frame (we are not next)",
objTrace(LOG_MOVEMENT, psDroid->id, "moveDroidToBase(%d): out of time, waiting for next frame (we are not next)",
(int)psDroid->id);
}
@ -802,21 +802,11 @@ void updateDroidOrientation(DROID *psDroid)
/* Turn a vector into an angle - returns a float (!) */
static float vectorToAngle(float vx, float vy)
{
float angle; // Angle in degrees (0->360)
// Angle in degrees (0->360):
float angle = 360.0f * atan2f(-vy,vx) / (M_PI * 2.0f);
angle += 360.0f / 4.0f;
angle = (float)(TRIG_DEGREES * atan2(-vy,vx) / M_PI / 2);
angle += TRIG_DEGREES/4;
if (angle < 0)
{
angle += TRIG_DEGREES;
}
if(angle>=360.0f)
{
angle -= 360.0f;
}
return angle;
return rangef(angle, 360.0f);
}
@ -825,9 +815,9 @@ static void moveCalcTurn(float *pCurr, float target, UDWORD rate)
{
float diff, change, retval = *pCurr;
ASSERT( target < 360.0 && target >= 0.0,
ASSERT( target < 360.0f && target >= 0.0f,
"moveCalcTurn: target out of range %f", target );
ASSERT( retval < 360.0 && retval >= 0.0,
ASSERT( retval < 360.0f && retval >= 0.0f,
"moveCalcTurn: cur ang out of range %f", retval );
// calculate the difference in the angles
@ -871,13 +861,9 @@ static void moveCalcTurn(float *pCurr, float target, UDWORD rate)
}
}
while (retval < 0.0f)
{
retval += 360.0f;
}
retval = fmodf(retval, 360);
retval = rangef(retval, 360.0f);
ASSERT(retval < 360 && retval >= 0, "moveCalcTurn: bad angle %f from (%f, %f, %u)\n",
ASSERT(retval < 360.0f && retval >= 0.0f, "moveCalcTurn: bad angle %f from (%f, %f, %u)\n",
retval, *pCurr, target, rate);
*pCurr = retval;

5
src/projectile.c
View File

@ -2097,10 +2097,7 @@ static HIT_SIDE getHitSide(PROJECTILE *psObj, BASE_OBJECT *psTarget)
*/
impactAngle = abs(psTarget->direction - (180 * atan2f(deltaX, deltaY) / M_PI));
if (impactAngle >= 360)
{
impactAngle -= 360;
}
impactAngle range(impactAngle, 360);
// Use the impact angle to work out the side hit
// Right