ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More warnings: mark/avert truncating conversions from float.

This commit is contained in:
comex 2013-08-30 00:43:21 -04:00
parent 4f5729dd59
commit 2630169229
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
View File

@ -364,7 +364,7 @@ void CUCode_AXWii::GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nv
for (size_t i = 0; i < nvals; ++i) for (size_t i = 0; i < nvals; ++i)
{ {
curr += (vol2 - vol1) / (float)nvals; curr += (vol2 - vol1) / (float)nvals;
output[i] = curr; output[i] = (u16) curr;
} }
} }

2
Source/Core/Core/Src/HW/GCPadEmu.cpp
View File

@ -119,7 +119,7 @@ void GCPad::GetInput(SPADStatus* const pad)
void GCPad::SetMotor(const u8 on) void GCPad::SetMotor(const u8 on)
{ {
float state = (float)on / 255; float state = (float)on / 255;
float force = abs(state - 0.5) * 2; float force = abs(state - 0.5f) * 2;
if (state < 0.5) if (state < 0.5)
force = -force; force = -force;

12
Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
View File

@ -109,18 +109,18 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
if (strcmp((*g)->control_group->name, "Main Stick") == 0) if (strcmp((*g)->control_group->name, "Main Stick") == 0)
{ {
max = (87.0 / 127.0) * 100; max = (87.0f / 127.0f) * 100;
diagonal = (55.0 / 127.0) * 100.0; diagonal = (55.0f / 127.0f) * 100.0;
} }
else if (strcmp((*g)->control_group->name,"C-Stick") == 0) else if (strcmp((*g)->control_group->name,"C-Stick") == 0)
{ {
max = (74.0 / 127.0) * 100; max = (74.0f / 127.0f) * 100;
diagonal = (46.0 / 127.0) * 100; diagonal = (46.0f / 127.0f) * 100;
} }
else else
{ {
max = (82.0 / 127.0) * 100; max = (82.0f / 127.0f) * 100;
diagonal = (58.0 / 127.0) * 100; diagonal = (58.0f / 127.0f) * 100;
} }
// polygon corners // polygon corners

2
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -1318,7 +1318,7 @@ void Renderer::SetLineWidth()
// We can't change line width in D3D unless we use ID3DXLine // We can't change line width in D3D unless we use ID3DXLine
float fratio = xfregs.viewport.wd != 0 ? Renderer::EFBToScaledXf(1.f) : 1.0f; float fratio = xfregs.viewport.wd != 0 ? Renderer::EFBToScaledXf(1.f) : 1.0f;
float psize = bpmem.lineptwidth.pointsize * fratio / 6.0f; float psize = bpmem.lineptwidth.pointsize * fratio / 6.0f;
psize = psize > 0 ? psize : 1.0; psize = psize > 0 ? psize : 1.0f;
if (psize > m_fMaxPointSize) if (psize > m_fMaxPointSize)
{ {
psize = m_fMaxPointSize; psize = m_fMaxPointSize;

6
Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
View File

@ -189,8 +189,8 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
int usage = 0; int usage = 0;
GLfloat delta_x = GLfloat(2*char_width)/GLfloat(bbWidth); GLfloat delta_x = GLfloat(2*char_width)/GLfloat(bbWidth);
GLfloat delta_y = GLfloat(2*char_height)/GLfloat(bbHeight); GLfloat delta_y = GLfloat(2*char_height)/GLfloat(bbHeight);
GLfloat border_x = 2.0/GLfloat(bbWidth); GLfloat border_x = 2.0f/GLfloat(bbWidth);
GLfloat border_y = 4.0/GLfloat(bbHeight); GLfloat border_y = 4.0f/GLfloat(bbHeight);
GLfloat x = GLfloat(start_x); GLfloat x = GLfloat(start_x);
GLfloat y = GLfloat(start_y); GLfloat y = GLfloat(start_y);
@ -199,7 +199,7 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
u8 c = text[i]; u8 c = text[i];
if(c == '\n') { if(c == '\n') {
x = start_x; x = GLfloat(start_x);
y -= delta_y + border_y; y -= delta_y + border_y;
continue; continue;
} }

2
Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
View File

@ -755,7 +755,7 @@ void Tev::Draw()
// First, calculate the offset from the viewport center (normalized to 0..1) // First, calculate the offset from the viewport center (normalized to 0..1)
float offset = (Position[0] - (bpmem.fogRange.Base.Center - 342)) / (float)swxfregs.viewport.wd; float offset = (Position[0] - (bpmem.fogRange.Base.Center - 342)) / (float)swxfregs.viewport.wd;
// Based on that, choose the index such that points which are far away from the z-axis use the 10th "k" value and such that central points use the first value. // Based on that, choose the index such that points which are far away from the z-axis use the 10th "k" value and such that central points use the first value.
int index = 9 - std::abs(offset) * 9.f; int index = (int) (9 - std::abs(offset) * 9.f);
index = (index < 0) ? 0 : (index > 9) ? 9 : index; // TODO: Shouldn't be necessary! index = (index < 0) ? 0 : (index > 9) ? 9 : index; // TODO: Shouldn't be necessary!
// Look up coefficient... Seems like multiplying by 4 makes Fortune Street work properly (fog is too strong without the factor) // Look up coefficient... Seems like multiplying by 4 makes Fortune Street work properly (fog is too strong without the factor)
float k = bpmem.fogRange.K[index/2].GetValue(index%2) * 4.f; float k = bpmem.fogRange.K[index/2].GetValue(index%2) * 4.f;