Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix some type conversion warnings.

Browse Source
This commit is contained in:
Unknown W. Brackets 2014-06-15 10:01:54 -07:00
parent d7e5b7956e
commit 913914a4c1
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/HLE/HLE.cpp
View File

@ -481,7 +481,7 @@ const HLEFunction *GetSyscallInfo(MIPSOpcode op)
ERROR_LOG(HLE, "Unknown syscall: Module: %s", modulenum > (int) moduleDB.size() ? "(unknown)" : moduleDB[modulenum].name);
return NULL;
}
if (modulenum >= moduleDB.size()) {
if (modulenum >= (int)moduleDB.size()) {
ERROR_LOG(HLE, "Syscall had bad module number %i - probably executing garbage", modulenum);
return NULL;
}

2
UI/ControlMappingScreen.cpp
View File

@ -271,7 +271,7 @@ void ControlMappingScreen::dialogFinished(const Screen *dialog, DialogResult res
}
void ControlMappingScreen::KeyMapped(int pspkey) { // Notification to let us refocus the same one after recreating views.
for (int i = 0; i < mappers_.size(); i++) {
for (size_t i = 0; i < mappers_.size(); i++) {
if (mappers_[i]->GetPspKey() == pspkey)
SetFocusedView(mappers_[i]);
}

12
UI/TiltEventProcessor.cpp
View File

@ -28,7 +28,7 @@ inline Tilt dampTilt(const Tilt &tilt, float deadzone, float xSensitivity, float
//multiply sensitivity by 2 so that "overshoot" is possible. I personally prefer a
//sensitivity >1 for kingdom hearts and < 1 for Gods Eater. so yes, overshoot is nice
//to have.
return Tilt(tiltInputCurve(tilt.x_, deadzone, 2.0 * xSensitivity), tiltInputCurve(tilt.y_, deadzone, 2.0 * ySensitivity));
return Tilt(tiltInputCurve(tilt.x_, deadzone, 2.0f * xSensitivity), tiltInputCurve(tilt.y_, deadzone, 2.0f * ySensitivity));
}
inline float clamp(float f) {
@ -44,7 +44,7 @@ Tilt TiltEventProcessor::NormalizeTilt(const Tilt &tilt){
// Values are in metres per second. Divide by 9.8 to get 'g' value
float maxX = 9.8f, maxY = 9.8f;
#else
float maxX = 1.0, maxY = 1.0;
float maxX = 1.0f, maxY = 1.0f;
#endif
return Tilt(tilt.x_ / maxX, tilt.y_ / maxY);
@ -58,11 +58,11 @@ Tilt TiltEventProcessor::GenTilt(const Tilt &baseTilt, const Tilt &currentTilt,
//invert x and y axes if needed
if (invertX) {
transformedTilt.x_ *= -1.0;
transformedTilt.x_ *= -1.0f;
}
if (invertY) {
transformedTilt.y_ *= -1.0;
transformedTilt.y_ *= -1.0f;
}
//next, normalize the tilt values
@ -98,7 +98,7 @@ void TiltEventProcessor::GenerateDPadEvent(const Tilt &tilt) {
}
int ctrlMask = 0;
int direction = (int)(floorf((atan2f(tilt.y_, tilt.x_) / (2 * M_PI) * 8) + 0.5f)) & 7;
int direction = (int)(floorf((atan2f(tilt.y_, tilt.x_) / (2.0f * (float)M_PI) * 8.0f) + 0.5f)) & 7;
switch (direction) {
case 0: ctrlMask |= CTRL_RIGHT; break;
case 1: ctrlMask |= CTRL_RIGHT | CTRL_DOWN; break;
@ -135,7 +135,7 @@ void TiltEventProcessor::GenerateActionButtonEvent(const Tilt &tilt) {
return;
}
int direction = (int)(floorf((atan2f(tilt.y_, tilt.x_) / (2 * M_PI) * 4) + 0.5f)) & 3;
int direction = (int)(floorf((atan2f(tilt.y_, tilt.x_) / (2.0f * (float)M_PI) * 4.0f) + 0.5f)) & 3;
__CtrlButtonDown(buttons[direction]);
};

2
Windows/DinputDevice.cpp
View File

@ -149,7 +149,7 @@ DinputDevice::DinputDevice(int devnum) {
}
getDevices();
if ( (devnum >= devices.size()) || FAILED(getPDI()->CreateDevice(devices.at(devnum).guidInstance, &pJoystick, NULL)))
if ( (devnum >= (int)devices.size()) || FAILED(getPDI()->CreateDevice(devices.at(devnum).guidInstance, &pJoystick, NULL)))
{
return;
}

2
Windows/GEDebugger/VertexPreview.cpp
View File

@ -189,7 +189,7 @@ void CGEDebugger::UpdatePrimPreview(u32 op) {
};
Matrix4x4 ortho;
ortho.setOrtho(-(int)gstate_c.cutRTOffsetX, (frameWindow->TexWidth() - (int)gstate_c.cutRTOffsetX) * scale[0], frameWindow->TexHeight() * scale[1], 0, -1, 1);
ortho.setOrtho(-(float)gstate_c.cutRTOffsetX, (frameWindow->TexWidth() - (int)gstate_c.cutRTOffsetX) * scale[0], frameWindow->TexHeight() * scale[1], 0, -1, 1);
glUniformMatrix4fv(previewProgram->u_viewproj, 1, GL_FALSE, ortho.getReadPtr());
glEnableVertexAttribArray(previewProgram->a_position);
glVertexAttribPointer(previewProgram->a_position, 3, GL_FLOAT, GL_FALSE, sizeof(GPUDebugVertex), (float *)vertices.data() + 2);