[Scummvm-cvs-logs] scummvm master -> 4c716539ad2a9cf361b076a9b811aa24f7b874cb
lordhoto
lordhoto at gmail.com
Mon Jun 2 01:02:37 CEST 2014
This automated email contains information about 10 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3630c588c6 BBVS: Silence double->float conversion warning.
f2685a8876 BBVS: Use floating point constants of type float.
703cfa536b AVALANCHE: Make GraphicManager::drawArc code consistently use float.
7b32db3b37 MOHAWK: Use float constants in Myst code.
59d0874ca9 SWORD25: Use float constant values in expressions which result in float.
ec6f00ed1d COMMON: Make Rad<->Deg conversion use float constants.
3c0c64f820 COMMON: Use float constants in RDFT code.
bab02dd42b COMMON: Some formatting fixes in RDFT code.
2bd2db10aa SCI: Silence double to float conversion warning.
4c716539ad COMMON: Use float constants in DCT code.
Commit: 3630c588c65e55d83f11c46980d6df500d18d2c4
https://github.com/scummvm/scummvm/commit/3630c588c65e55d83f11c46980d6df500d18d2c4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:14+02:00
Commit Message:
BBVS: Silence double->float conversion warning.
This might not be obvious to a C++ developer, but we use C's sin which is
*always* double. Thus, sin will return a double and therefore some compilers
might warn about this conversion.
Changed paths:
engines/bbvs/walk.cpp
diff --git a/engines/bbvs/walk.cpp b/engines/bbvs/walk.cpp
index 4d71d95..f3023b9 100644
--- a/engines/bbvs/walk.cpp
+++ b/engines/bbvs/walk.cpp
@@ -109,7 +109,7 @@ void BbvsEngine::updateWalkObject(SceneObject *sceneObject) {
void BbvsEngine::walkObject(SceneObject *sceneObject, const Common::Point &destPt, int walkSpeed) {
int deltaX = destPt.x - (sceneObject->x >> 16);
int deltaY = destPt.y - (sceneObject->y >> 16);
- float distance = sqrt((double)(deltaX * deltaX + deltaY * deltaY));
+ float distance = (float)sqrt((double)(deltaX * deltaX + deltaY * deltaY));
// NOTE The original doesn't have this check but without it the whole pathfinding breaks
if (distance > 0.0) {
sceneObject->walkCount = (int)(distance / ((((float)ABS(deltaX) / distance) + 1.0) * ((float)walkSpeed / 120)));
Commit: f2685a88769324044a843ebfd552f48f64675500
https://github.com/scummvm/scummvm/commit/f2685a88769324044a843ebfd552f48f64675500
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
BBVS: Use floating point constants of type float.
Changed paths:
engines/bbvs/minigames/bbtennis.cpp
engines/bbvs/walk.cpp
diff --git a/engines/bbvs/minigames/bbtennis.cpp b/engines/bbvs/minigames/bbtennis.cpp
index 6f680d0..ddd5cfc 100644
--- a/engines/bbvs/minigames/bbtennis.cpp
+++ b/engines/bbvs/minigames/bbtennis.cpp
@@ -412,10 +412,10 @@ bool MinigameBbTennis::updateStatus1(int mouseX, int mouseY, uint mouseButtons)
obj->targetY = mouseY;
obj->ballStep = 12;
obj->ballStepCtr = 0;
- obj->fltX = 160.0;
- obj->fltY = 240.0;
- obj->fltStepX = ((160 - mouseX) * 0.75) / 12.0;
- obj->fltStepY = ((240 - mouseY) * 0.75) / 12.0;
+ obj->fltX = 160.0f;
+ obj->fltY = 240.0f;
+ obj->fltStepX = ((160 - mouseX) * 0.75f) / 12.0f;
+ obj->fltStepY = ((240 - mouseY) * 0.75f) / 12.0f;
_newBallTimer = _initBallTimer;
++_numBalls;
playSound(31);
@@ -582,14 +582,14 @@ void MinigameBbTennis::updateTennisBall(int objIndex) {
obj->ballStep = 12;
++obj->ballStepCtr;
if (obj->ballStepCtr == 1) {
- obj->fltStepX = ((obj->fltX - (float)obj->targetX) * 0.75) / 12.0;
- obj->fltStepY = ((obj->fltY - (float)obj->targetY) * 0.75) / 12.0;
+ obj->fltStepX = ((obj->fltX - (float)obj->targetX) * 0.75f) / 12.0f;
+ obj->fltStepY = ((obj->fltY - (float)obj->targetY) * 0.75f) / 12.0f;
} else if (obj->ballStepCtr == 2) {
- obj->fltStepX = (obj->fltX - (float)obj->targetX) / 12.0;
- obj->fltStepY = (obj->fltY - (float)obj->targetY) / 12.0;
+ obj->fltStepX = (obj->fltX - (float)obj->targetX) / 12.0f;
+ obj->fltStepY = (obj->fltY - (float)obj->targetY) / 12.0f;
} else {
- obj->fltStepX = 0.0;
- obj->fltStepY = 0.0;
+ obj->fltStepX = 0.0f;
+ obj->fltStepY = 0.0f;
}
}
@@ -1087,11 +1087,11 @@ void MinigameBbTennis::updateEnemyTennisBall(int objIndex) {
obj->ballStep = 12;
--obj->ballStepCtr;
if (obj->ballStepCtr == 1) {
- obj->fltStepX = (obj->fltX - (float)obj->targetX) / 12.0;
- obj->fltStepY = (obj->fltY - (float)obj->targetY) / 12.0;
+ obj->fltStepX = (obj->fltX - (float)obj->targetX) / 12.0f;
+ obj->fltStepY = (obj->fltY - (float)obj->targetY) / 12.0f;
} else if (obj->ballStepCtr == 2) {
- obj->fltStepX = ((obj->fltX - (float)obj->targetX) * 0.18) / 12.0;
- obj->fltStepY = ((obj->fltY - (float)obj->targetY) * 0.18) / 12.0;
+ obj->fltStepX = ((obj->fltX - (float)obj->targetX) * 0.18f) / 12.0f;
+ obj->fltStepY = ((obj->fltY - (float)obj->targetY) * 0.18f) / 12.0f;
} else {
obj->kind = 0;
if (_numHearts > 0 && --_numHearts == 0)
@@ -1125,36 +1125,36 @@ void MinigameBbTennis::makeEnemyBall(int x, int y, int frameIndex) {
case 6:
obj->ballStep = 18;
obj->ballStepCtr = 3;
- obj->fltStepX = 0.0;
- obj->fltStepY = 0.0;
+ obj->fltStepX = 0.0f;
+ obj->fltStepY = 0.0f;
break;
case 5:
obj->ballStep = 12;
obj->ballStepCtr = 3;
- obj->fltStepX = ((float)(x - 160) * 0.07) / 12.0;
- obj->fltStepY = ((float)(y - 180) * 0.07) / 12.0;
+ obj->fltStepX = ((float)(x - 160) * 0.07f) / 12.0f;
+ obj->fltStepY = ((float)(y - 180) * 0.07f) / 12.0f;
break;
case 4:
obj->ballStep = 6;
obj->ballStepCtr = 3;
- obj->fltStepX = ((float)(x - 160) * 0.07) / 6.0;
- obj->fltStepY = ((float)(y - 180) * 0.07) / 6.0;
+ obj->fltStepX = ((float)(x - 160) * 0.07f) / 6.0f;
+ obj->fltStepY = ((float)(y - 180) * 0.07f) / 6.0f;
break;
case 3:
obj->ballStep = 12;
obj->ballStepCtr = 2;
- obj->fltStepX = ((float)(x - 160) * 0.18) / 12.0;
- obj->fltStepY = ((float)(y - 180) * 0.18) / 12.0;
+ obj->fltStepX = ((float)(x - 160) * 0.18f) / 12.0f;
+ obj->fltStepY = ((float)(y - 180) * 0.18f) / 12.0f;
break;
case 2:
obj->ballStep = 6;
obj->ballStepCtr = 2;
- obj->fltStepX = ((float)(x - 160) * 0.18) / 6.0;
- obj->fltStepY = ((float)(y - 180) * 0.18) / 6.0;
+ obj->fltStepX = ((float)(x - 160) * 0.18f) / 6.0f;
+ obj->fltStepY = ((float)(y - 180) * 0.18f) / 6.0f;
break;
case 1:
diff --git a/engines/bbvs/walk.cpp b/engines/bbvs/walk.cpp
index f3023b9..077110b 100644
--- a/engines/bbvs/walk.cpp
+++ b/engines/bbvs/walk.cpp
@@ -111,10 +111,10 @@ void BbvsEngine::walkObject(SceneObject *sceneObject, const Common::Point &destP
int deltaY = destPt.y - (sceneObject->y >> 16);
float distance = (float)sqrt((double)(deltaX * deltaX + deltaY * deltaY));
// NOTE The original doesn't have this check but without it the whole pathfinding breaks
- if (distance > 0.0) {
- sceneObject->walkCount = (int)(distance / ((((float)ABS(deltaX) / distance) + 1.0) * ((float)walkSpeed / 120)));
- sceneObject->xIncr = (int)(((float)deltaX / sceneObject->walkCount) * 65536.0);
- sceneObject->yIncr = (int)(((float)deltaY / sceneObject->walkCount) * 65536.0);
+ if (distance > 0.0f) {
+ sceneObject->walkCount = (int)(distance / ((((float)ABS(deltaX) / distance) + 1.0f) * ((float)walkSpeed / 120)));
+ sceneObject->xIncr = (int)(((float)deltaX / sceneObject->walkCount) * 65536.0f);
+ sceneObject->yIncr = (int)(((float)deltaY / sceneObject->walkCount) * 65536.0f);
sceneObject->x = (sceneObject->x & 0xFFFF0000) | 0x8000;
sceneObject->y = (sceneObject->y & 0xFFFF0000) | 0x8000;
} else
@@ -334,10 +334,10 @@ bool BbvsEngine::walkTestLineWalkable(const Common::Point &sourcePt, const Commo
return true;
if (walkInfo->direction) {
const float nDeltaY = wDeltaX * ptDeltaY / ptDeltaX + (float)sourcePt.y - (float)walkInfo->y;
- return (nDeltaY >= 0.0) && (nDeltaY < (float)walkInfo->delta);
+ return (nDeltaY >= 0.0f) && (nDeltaY < (float)walkInfo->delta);
} else {
const float nDeltaX = wDeltaY / ptDeltaX * ptDeltaY + (float)sourcePt.x - (float)walkInfo->x;
- return (nDeltaX >= 0.0) && (nDeltaX < (float)walkInfo->delta);
+ return (nDeltaX >= 0.0f) && (nDeltaX < (float)walkInfo->delta);
}
return false;
}
Commit: 703cfa536b06986fcf5674fb0928679d42e4c29f
https://github.com/scummvm/scummvm/commit/703cfa536b06986fcf5674fb0928679d42e4c29f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
AVALANCHE: Make GraphicManager::drawArc code consistently use float.
I use float over double here because all the changing values were already
stored in variables of type float. This also silences some float conversion
warnings.
Changed paths:
engines/avalanche/graphics.cpp
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index 513cd72..67a7061 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -198,7 +198,7 @@ void GraphicManager::drawToolbar() {
Common::Point GraphicManager::drawArc(Graphics::Surface &surface, int16 x, int16 y, int16 stAngle, int16 endAngle, uint16 radius, Color color) {
Common::Point endPoint;
- const double convfac = M_PI / 180.0;
+ const float convfac = (float)M_PI / 180.0f;
int32 xRadius = radius;
int32 yRadius = radius * kScreenWidth / (8 * kScreenHeight); // Just don't ask why...
@@ -231,7 +231,7 @@ Common::Point GraphicManager::drawArc(Graphics::Surface &surface, int16 x, int16
uint16 numOfPixels = (uint16)floor(sqrt(3.0) * sqrt(pow(double(xRadius), 2) + pow(double(yRadius), 2)) + 0.5);
// Calculate the angle precision required.
- float delta = 90.0 / numOfPixels;
+ float delta = 90.0f / numOfPixels;
// Always just go over the first 90 degrees. Could be optimized a
// bit if startAngle and endAngle lie in the same quadrant, left as an
Commit: 7b32db3b371f487c6b79c500aece05d9e8dcb48c
https://github.com/scummvm/scummvm/commit/7b32db3b371f487c6b79c500aece05d9e8dcb48c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
MOHAWK: Use float constants in Myst code.
This silences some float conversion warnings.
Changed paths:
engines/mohawk/myst_stacks/mechanical.cpp
diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp
index 3181b78..b5d1285 100644
--- a/engines/mohawk/myst_stacks/mechanical.cpp
+++ b/engines/mohawk/myst_stacks/mechanical.cpp
@@ -353,7 +353,7 @@ void Mechanical::o_elevatorRotationMove(uint16 op, uint16 var, uint16 argc, uint
int16 step = ((rect.bottom - mouse.y) * lever->getNumFrames()) / rect.height();
step = CLIP<int16>(step, 0, maxStep);
- _elevatorRotationSpeed = step * 0.1;
+ _elevatorRotationSpeed = step * 0.1f;
// Draw current frame
lever->drawFrame(step);
@@ -386,9 +386,9 @@ void Mechanical::o_elevatorRotationStop(uint16 op, uint16 var, uint16 argc, uint
// Decrease speed
while (speed > 2) {
- speed -= 0.5;
+ speed -= 0.5f;
- _elevatorRotationGearPosition += speed * 0.1;
+ _elevatorRotationGearPosition += speed * 0.1f;
if (_elevatorRotationGearPosition > 12)
break;
Commit: 59d0874ca958c2ff12210f9f18956a01d8719e80
https://github.com/scummvm/scummvm/commit/59d0874ca958c2ff12210f9f18956a01d8719e80
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
SWORD25: Use float constant values in expressions which result in float.
This silences some float conversion warnings.
Changed paths:
engines/sword25/sfx/soundengine.cpp
diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp
index 4029b4e..dcb29cb 100644
--- a/engines/sword25/sfx/soundengine.cpp
+++ b/engines/sword25/sfx/soundengine.cpp
@@ -114,7 +114,7 @@ float SoundEngine::getVolume(SOUND_TYPES type) {
error("Unknown SOUND_TYPE");
}
- return (float)val / 255.0;
+ return (float)val / 255.0f;
}
void SoundEngine::pauseAll() {
@@ -302,7 +302,7 @@ float SoundEngine::getSoundVolume(uint handle) {
SndHandle* sndHandle = findHandle(handle);
if (sndHandle == NULL)
return 0.f;
- return (float)_mixer->getChannelVolume(sndHandle->handle) / 255.0;
+ return (float)_mixer->getChannelVolume(sndHandle->handle) / 255.0f;
}
float SoundEngine::getSoundPanning(uint handle) {
@@ -311,7 +311,7 @@ float SoundEngine::getSoundPanning(uint handle) {
SndHandle* sndHandle = findHandle(handle);
if (sndHandle == NULL)
return 0.f;
- return (float)_mixer->getChannelBalance(sndHandle->handle) / 127.0;
+ return (float)_mixer->getChannelBalance(sndHandle->handle) / 127.0f;
}
Resource *SoundEngine::loadResource(const Common::String &fileName) {
Commit: ec6f00ed1d9a27dd56bc06a723e72cfbdf4e0304
https://github.com/scummvm/scummvm/commit/ec6f00ed1d9a27dd56bc06a723e72cfbdf4e0304
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
COMMON: Make Rad<->Deg conversion use float constants.
Since we take a float parameter and return a float value we will also just
work on float values all the way. This silences some float conversion
warnings.
Changed paths:
common/math.h
diff --git a/common/math.h b/common/math.h
index 04a0ba1..f91f7a2 100644
--- a/common/math.h
+++ b/common/math.h
@@ -108,11 +108,11 @@ inline int intLog2(uint32 v) {
#endif
inline float rad2deg(float rad) {
- return rad * 180.0 / M_PI;
+ return rad * 180.0f / (float)M_PI;
}
inline float deg2rad(float deg) {
- return deg * M_PI / 180.0;
+ return deg * (float)M_PI / 180.0f;
}
} // End of namespace Common
Commit: 3c0c64f820fb0338e2c968bea6f200bfadad27b3
https://github.com/scummvm/scummvm/commit/3c0c64f820fb0338e2c968bea6f200bfadad27b3
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
COMMON: Use float constants in RDFT code.
We use float types in variables, thus also use them for constants. Silences
some conversion warnings.
Changed paths:
common/rdft.cpp
diff --git a/common/rdft.cpp b/common/rdft.cpp
index d30fdd5..5a85406 100644
--- a/common/rdft.cpp
+++ b/common/rdft.cpp
@@ -49,8 +49,8 @@ RDFT::~RDFT() {
void RDFT::calc(float *data) {
const int n = 1 << _bits;
- const float k1 = 0.5;
- const float k2 = 0.5 - _inverse;
+ const float k1 = 0.5f;
+ const float k2 = 0.5f - _inverse;
if (!_inverse) {
_fft->permute((Complex *) data);
Commit: bab02dd42b31995a7385610a91c85241547e2512
https://github.com/scummvm/scummvm/commit/bab02dd42b31995a7385610a91c85241547e2512
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
COMMON: Some formatting fixes in RDFT code.
Changed paths:
common/rdft.cpp
diff --git a/common/rdft.cpp b/common/rdft.cpp
index 5a85406..89d3911 100644
--- a/common/rdft.cpp
+++ b/common/rdft.cpp
@@ -29,7 +29,7 @@
namespace Common {
RDFT::RDFT(int bits, TransformType trans) : _bits(bits), _sin(bits), _cos(bits), _fft(0) {
- assert ((_bits >= 4) && (_bits <= 16));
+ assert((_bits >= 4) && (_bits <= 16));
_inverse = trans == IDFT_C2R || trans == DFT_C2R;
_signConvention = trans == IDFT_R2C || trans == DFT_C2R ? 1 : -1;
@@ -53,8 +53,8 @@ void RDFT::calc(float *data) {
const float k2 = 0.5f - _inverse;
if (!_inverse) {
- _fft->permute((Complex *) data);
- _fft->calc ((Complex *) data);
+ _fft->permute((Complex *)data);
+ _fft->calc ((Complex *)data);
}
Complex ev, od;
@@ -91,8 +91,8 @@ void RDFT::calc(float *data) {
data[0] *= k1;
data[1] *= k1;
- _fft->permute((Complex *) data);
- _fft->calc ((Complex *) data);
+ _fft->permute((Complex *)data);
+ _fft->calc ((Complex *)data);
}
}
Commit: 2bd2db10aa96c7d6ee17f4132ee6d317ccc6cf62
https://github.com/scummvm/scummvm/commit/2bd2db10aa96c7d6ee17f4132ee6d317ccc6cf62
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
SCI: Silence double to float conversion warning.
Changed paths:
engines/sci/engine/kpathing.cpp
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 940bd38..67d814b 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -1921,7 +1921,7 @@ static int intersectDir(const Vertex *v1, const Vertex *v2) {
// Direction of edge in degrees from pos. x-axis, between -180 and 180
static int edgeDir(const Vertex *v) {
Common::Point p = v->_next->v - v->v;
- int deg = (int)Common::rad2deg(atan2((double)p.y, (double)p.x));
+ int deg = (int)Common::rad2deg((float)atan2((double)p.y, (double)p.x));
if (deg < -180) deg += 360;
if (deg > 180) deg -= 360;
return deg;
Commit: 4c716539ad2a9cf361b076a9b811aa24f7b874cb
https://github.com/scummvm/scummvm/commit/4c716539ad2a9cf361b076a9b811aa24f7b874cb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-02T01:00:15+02:00
Commit Message:
COMMON: Use float constants in DCT code.
Makes the DCT code use constants of type float in expressions which only use
type float values otherwise. This silences some floating point conversion
warnings in the DCT code.
Changed paths:
common/dct.cpp
diff --git a/common/dct.cpp b/common/dct.cpp
index dea75f4..27e0c0b 100644
--- a/common/dct.cpp
+++ b/common/dct.cpp
@@ -73,7 +73,7 @@ void DCT::calc(float *data) {
void DCT::calcDCTI(float *data) {
int n = 1 << _bits;
- float next = -0.5 * (data[0] - data[n]);
+ float next = -0.5f * (data[0] - data[n]);
for (int i = 0; i < (n / 2); i++) {
float tmp1 = data[i ];
@@ -87,7 +87,7 @@ void DCT::calcDCTI(float *data) {
next += c;
- tmp1 = (tmp1 + tmp2) * 0.5;
+ tmp1 = (tmp1 + tmp2) * 0.5f;
data[i ] = tmp1 - s;
data[n - i] = tmp1 + s;
@@ -113,7 +113,7 @@ void DCT::calcDCTII(float *data) {
s *= tmp1 - tmp2;
- tmp1 = (tmp1 + tmp2) * 0.5;
+ tmp1 = (tmp1 + tmp2) * 0.5f;
data[i ] = tmp1 + s;
data[n - i - 1] = tmp1 - s;
@@ -121,7 +121,7 @@ void DCT::calcDCTII(float *data) {
_rdft->calc(data);
- float next = data[1] * 0.5;
+ float next = data[1] * 0.5f;
data[1] *= -1;
@@ -143,7 +143,7 @@ void DCT::calcDCTIII(float *data) {
int n = 1 << _bits;
float next = data[n - 1];
- float inv_n = 1.0 / n;
+ float inv_n = 1.0f / n;
for (int i = n - 2; i >= 2; i -= 2) {
float val1 = data[i ];
@@ -184,7 +184,7 @@ void DCT::calcDSTI(float *data) {
float s = SIN(n, 2 * i);
s *= tmp1 + tmp2;
- tmp1 = (tmp1 - tmp2) * 0.5;
+ tmp1 = (tmp1 - tmp2) * 0.5f;
data[i ] = s + tmp1;
data[n - i] = s - tmp1;
@@ -194,7 +194,7 @@ void DCT::calcDSTI(float *data) {
_rdft->calc(data);
- data[0] *= 0.5;
+ data[0] *= 0.5f;
for (int i = 1; i < (n - 2); i += 2) {
data[i + 1] += data[i - 1];
More information about the Scummvm-git-logs
mailing list