Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-08 19:43:40 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Qt and Blackberry buildfix.

Browse Source
This commit is contained in:
Sacha 2013-07-07 17:47:50 +10:00
parent 3e8cb98a40
commit 43906e5e96
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -580,7 +580,6 @@ add_library(native STATIC
native/image/zim_save.h
native/input/gesture_detector.cpp
native/input/gesture_detector.h
native/input/input_state.cpp
native/input/keycodes.h
native/input/input_state.h
native/input/input_state.cpp

1
Qt/Native.pro
View File

@ -88,6 +88,7 @@ SOURCES += ../native/audio/*.cpp \
../native/i18n/*.cpp \
../native/image/*.cpp \
../native/input/gesture_detector.cpp \
../native/input/input_state.cpp \
../native/json/json_writer.cpp \
../native/math/curves.cpp \
../native/math/expression_parser.cpp \

11
Qt/mainwindow.cpp
View File

@ -82,6 +82,12 @@ void MainWindow::ShowMemory(u32 addr)
memoryWindow->Goto(addr);
}
inline float clamp1(float x) {
if (x > 1.0f) return 1.0f;
if (x < -1.0f) return -1.0f;
return x;
}
void MainWindow::Update()
{
emugl->updateGL();
@ -94,7 +100,10 @@ void MainWindow::Update()
else
__CtrlButtonUp(controllist[i].psp_id);
}
__CtrlSetAnalog(input_state.pad_lstick_x, input_state.pad_lstick_y);
__CtrlSetAnalogX(clamp1(input_state.pad_lstick_x), 0);
__CtrlSetAnalogY(clamp1(input_state.pad_lstick_y), 0);
__CtrlSetAnalogX(clamp1(input_state.pad_rstick_x), 1);
__CtrlSetAnalogY(clamp1(input_state.pad_rstick_y), 1);
if (lastUIState != globalUIState) {
lastUIState = globalUIState;

2
native

@ -1 +1 @@
Subproject commit 585081e1c0651c782411212464571691503239bd
Subproject commit 35ccbc6df3bcde28c30d838dc6f8ef5715d34114