mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-26 23:10:38 +00:00
qt: Build Qt frontend with CMake. Requires Qt5.
This commit is contained in:
Florent Castelli
parent
789dc2fe49
commit
f02e2b59b0
@ -727,21 +727,48 @@ elseif(IOS)
|
||||
|
||||
set(TargetBin PPSSPP)
|
||||
elseif(USING_QT_UI)
|
||||
# Currently unused
|
||||
message(FATAL_ERROR "Cmake does not yet support Qt. Please use qmake instead.")
|
||||
find_package(Qt4 COMPONENTS QtMultimedia QtOpenGL QtGui QtCore)
|
||||
include(${QT_USE_FILE})
|
||||
qt4_wrap_cpp(nativeQtHeader ext/native/base/QtMain.h)
|
||||
set(nativeExtra ${nativeExtra} ext/native/base/QtMain.cpp ${nativeQtHeader})
|
||||
if(NOT MOBILE_DEVICE)
|
||||
qt4_wrap_cpp(nativeQtHeader Qt/mainwindow.h)
|
||||
set(nativeExtra ${nativeExtra} Qt/mainwindow.cpp)
|
||||
endif()
|
||||
set(nativeExtraLibs ${nativeExtraLibs} ${QT_LIBRARIES})
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
find_package(Qt5 COMPONENTS Multimedia OpenGL Gui Core)
|
||||
set(Qt_UI
|
||||
Qt/Debugger/debugger_disasm.ui
|
||||
Qt/Debugger/debugger_displaylist.ui
|
||||
Qt/Debugger/debugger_memory.ui
|
||||
Qt/Debugger/debugger_memorytex.ui
|
||||
Qt/Debugger/debugger_vfpu.ui
|
||||
)
|
||||
qt5_wrap_ui(QT_UI_GEN ${Qt_UI})
|
||||
list(APPEND NativeAppSource
|
||||
${QT_UI_GEN}
|
||||
ext/native/base/QtMain.cpp
|
||||
ext/native/base/QtMain.h
|
||||
Qt/mainwindow.cpp
|
||||
Qt/mainwindow.h
|
||||
Qt/desktop_assets.qrc
|
||||
Qt/Debugger/ctrldisasmview.cpp
|
||||
Qt/Debugger/ctrldisasmview.h
|
||||
Qt/Debugger/ctrlmemview.cpp
|
||||
Qt/Debugger/ctrlmemview.h
|
||||
Qt/Debugger/ctrlregisterlist.cpp
|
||||
Qt/Debugger/ctrlregisterlist.h
|
||||
Qt/Debugger/ctrlvfpuview.cpp
|
||||
Qt/Debugger/ctrlvfpuview.h
|
||||
Qt/Debugger/debugger_disasm.cpp
|
||||
Qt/Debugger/debugger_disasm.h
|
||||
Qt/Debugger/debugger_displaylist.cpp
|
||||
Qt/Debugger/debugger_displaylist.h
|
||||
Qt/Debugger/debugger_memory.cpp
|
||||
Qt/Debugger/debugger_memory.h
|
||||
Qt/Debugger/debugger_memorytex.cpp
|
||||
Qt/Debugger/debugger_memorytex.h
|
||||
Qt/Debugger/debugger_vfpu.cpp
|
||||
Qt/Debugger/debugger_vfpu.h
|
||||
)
|
||||
add_definitions(-DUSING_QT_UI)
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt Qt/Debugger)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} Qt5::Multimedia Qt5::OpenGL Qt5::Gui Qt5::Core)
|
||||
set(TargetBin PPSSPPQt)
|
||||
if(APPLE)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} "-framework CoreFoundation")
|
||||
endif()
|
||||
elseif(SDL2_FOUND)
|
||||
set(TargetBin PPSSPPSDL)
|
||||
# Require SDL
|
||||
@ -763,7 +790,7 @@ else()
|
||||
message(FATAL_ERROR "Could not find SDL2. Failing.")
|
||||
endif()
|
||||
|
||||
set(NativeAppSource
|
||||
list(APPEND NativeAppSource
|
||||
android/jni/TestRunner.cpp
|
||||
UI/NativeApp.cpp
|
||||
UI/BackgroundAudio.cpp
|
||||
@ -945,7 +972,7 @@ if (LINUX AND NOT ANDROID)
|
||||
SET(RT_LIB rt)
|
||||
endif()
|
||||
|
||||
target_link_libraries(native ${LIBZIP_LIBRARY} ${ZLIB_LIBRARY} ${PNG_LIBRARY} rg_etc1 vjson snappy udis86 ${RT_LIB} ${GLEW_LIBRARIES})
|
||||
target_link_libraries(native ${LIBZIP_LIBRARY} ${ZLIB_LIBRARY} ${PNG_LIBRARY} rg_etc1 vjson snappy udis86 ${RT_LIB} ${GLEW_LIBRARIES} ${nativeExtraLibs})
|
||||
|
||||
if(ANDROID)
|
||||
target_link_libraries(native log EGL)
|
||||
@ -1581,7 +1608,7 @@ set(NativeAssets
|
||||
assets/langregion.ini
|
||||
assets/gamecontrollerdb.txt
|
||||
assets/unknown.png)
|
||||
set(LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT} ${nativeExtraLibs})
|
||||
set(LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
|
||||
if(HEADLESS)
|
||||
|
||||
@ -39,10 +39,6 @@
|
||||
#include "GPU/Common/FramebufferCommon.h"
|
||||
#include "HLE/sceUtility.h"
|
||||
|
||||
#ifndef USING_QT_UI
|
||||
extern const char *PPSSPP_GIT_VERSION;
|
||||
#endif
|
||||
|
||||
// TODO: Find a better place for this.
|
||||
http::Downloader g_DownloadManager;
|
||||
|
||||
|
||||
@ -23,9 +23,7 @@
|
||||
|
||||
#include "CommonTypes.h"
|
||||
|
||||
#if !defined(USING_QT_UI)
|
||||
extern const char *PPSSPP_GIT_VERSION;
|
||||
#endif
|
||||
|
||||
const int PSP_MODEL_FAT = 0;
|
||||
const int PSP_MODEL_SLIM = 1;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file alias="assets/ui_atlas_lowmem.zim">../assets/ui_atlas_lowmem.zim</file>
|
||||
<file alias="assets/ui_atlas.zim">../assets/ui_atlas.zim</file>
|
||||
<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
|
||||
<file alias="assets/lang">../assets/lang</file>
|
||||
<file alias="assets/compat.ini">../assets/compat.ini</file>
|
||||
|
||||
@ -25,6 +25,8 @@ MainWindow::MainWindow(QWidget *parent, bool fullscreen) :
|
||||
memoryTexWindow(0),
|
||||
displaylistWindow(0)
|
||||
{
|
||||
Q_INIT_RESOURCE(desktop_assets);
|
||||
|
||||
QDesktopWidget *desktop = QApplication::desktop();
|
||||
int screenNum = QProcessEnvironment::systemEnvironment().value("SDL_VIDEO_FULLSCREEN_HEAD", "0").toInt();
|
||||
|
||||
@ -402,7 +404,7 @@ void MainWindow::forumAct()
|
||||
|
||||
void MainWindow::aboutAct()
|
||||
{
|
||||
QMessageBox::about(this, "About", QString::fromUtf8("PPSSPP Qt " PPSSPP_GIT_VERSION "\n\n"
|
||||
QMessageBox::about(this, "About", QString("PPSSPP Qt %1\n\n"
|
||||
"PSP emulator and debugger\n\n"
|
||||
"Copyright (c) by Henrik Rydg\xc3\xa5rd and the PPSSPP Project 2012-\n"
|
||||
"Qt port maintained by xSacha\n\n"
|
||||
@ -412,7 +414,7 @@ void MainWindow::aboutAct()
|
||||
" zlib by Jean-loup Gailly (compression) and Mark Adler (decompression)\n"
|
||||
" Qt project by Digia\n\n"
|
||||
"All trademarks are property of their respective owners.\n"
|
||||
"The emulator is for educational and development purposes only and it may not be used to play games you do not legally own."));
|
||||
"The emulator is for educational and development purposes only and it may not be used to play games you do not legally own.").arg(PPSSPP_GIT_VERSION));
|
||||
}
|
||||
|
||||
/* Private functions */
|
||||
@ -449,7 +451,7 @@ void MainWindow::SetWindowScale(int zoom) {
|
||||
|
||||
void MainWindow::SetGameTitle(QString text)
|
||||
{
|
||||
QString title = "PPSSPP " PPSSPP_GIT_VERSION;
|
||||
QString title = QString("PPSSPP %1").arg(PPSSPP_GIT_VERSION);
|
||||
if (text != "")
|
||||
title += QString(" - %1").arg(text);
|
||||
|
||||
|
||||
@ -579,13 +579,8 @@ void NativeInitGraphics(GraphicsContext *graphicsContext) {
|
||||
ui_draw2d.Init(thin3d);
|
||||
ui_draw2d_front.Init(thin3d);
|
||||
|
||||
#ifdef USING_QT_UI
|
||||
uiTexture = thin3d->CreateTextureFromFile("ui_atlas_lowmem.zim", T3DImageType::ZIM);
|
||||
if (!uiTexture) {
|
||||
#else
|
||||
uiTexture = thin3d->CreateTextureFromFile("ui_atlas.zim", T3DImageType::ZIM);
|
||||
if (!uiTexture) {
|
||||
#endif
|
||||
PanicAlert("Failed to load ui_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
|
||||
ELOG("Failed to load ui_atlas.zim");
|
||||
#ifdef _WIN32
|
||||
|
||||
157
UI/ui_atlas.cpp
157
UI/ui_atlas.cpp
@ -4,7 +4,6 @@
|
||||
|
||||
const AtlasChar font_UBUNTU24_chardata[] = {
|
||||
// RANGE: 0x20 - 0x80, start 0x29
|
||||
#ifndef USING_QT_UI
|
||||
{0.000000f, 0.000000f, 0.000488f, 0.000488f, -2.0000f, -4.0000f, 7.5000f, 1, 1}, // 0020
|
||||
{0.933594f, 0.212402f, 0.937500f, 0.226563f, 0.1875f, -28.1875f, 7.9375f, 8, 29}, // 0021
|
||||
{0.617676f, 0.084961f, 0.623535f, 0.091309f, 0.1250f, -28.1875f, 11.6875f, 12, 13}, // 0022
|
||||
@ -33923,110 +33922,9 @@ const AtlasChar font_UBUNTU24_chardata[] = {
|
||||
{0.354492f, 0.127930f, 0.362793f, 0.136230f, -0.9375f, -21.6875f, 15.0000f, 17, 17}, // ffed
|
||||
{0.340820f, 0.160156f, 0.349121f, 0.168457f, -0.9375f, -21.6875f, 15.0000f, 17, 17}, // ffee
|
||||
{0.103516f, 0.854492f, 0.116699f, 0.867676f, 1.7500f, -26.5000f, 30.0000f, 27, 27}, // ffef
|
||||
#else /* USING_QT_UI */
|
||||
{0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 7.5000f, 1, 1}, // 0020
|
||||
{0.187500f, 0.716797f, 0.203125f, 0.773438f, 0.1875f, -28.1875f, 7.9375f, 8, 29}, // 0021
|
||||
{0.498047f, 0.728516f, 0.521484f, 0.753906f, 0.1250f, -28.1875f, 11.6875f, 12, 13}, // 0022
|
||||
{0.923828f, 0.611328f, 0.962891f, 0.667969f, -1.0625f, -28.1875f, 18.0000f, 20, 29}, // 0023
|
||||
{0.212891f, 0.250000f, 0.248047f, 0.320313f, -0.2500f, -31.9375f, 17.3750f, 18, 36}, // 0024
|
||||
{0.658203f, 0.560547f, 0.705078f, 0.617188f, -0.3750f, -28.5000f, 22.7500f, 24, 29}, // 0025
|
||||
{0.599609f, 0.564453f, 0.642578f, 0.621094f, -0.8750f, -28.5000f, 19.7500f, 22, 29}, // 0026
|
||||
{0.523438f, 0.728516f, 0.539063f, 0.753906f, -0.2500f, -28.1875f, 6.7500f, 8, 13}, // 0027
|
||||
{0.394531f, 0.671875f, 0.417969f, 0.748047f, -0.0625f, -31.0000f, 10.0625f, 12, 39}, // 0028
|
||||
{0.419922f, 0.677734f, 0.443359f, 0.753906f, -1.6250f, -31.0000f, 10.1875f, 12, 39}, // 0029
|
||||
{0.718750f, 0.701172f, 0.748047f, 0.732422f, -0.9375f, -21.9375f, 13.1875f, 15, 16}, // 002a
|
||||
{0.626953f, 0.677734f, 0.664063f, 0.720703f, -0.8750f, -23.8125f, 17.1875f, 19, 22}, // 002b
|
||||
{0.802734f, 0.167969f, 0.820313f, 0.193359f, -1.0625f, -7.6250f, 6.8750f, 9, 13}, // 002c
|
||||
{0.904297f, 0.728516f, 0.929688f, 0.742188f, 0.2500f, -15.5625f, 13.0625f, 13, 7}, // 002d
|
||||
{0.482422f, 0.542969f, 0.498047f, 0.558594f, 0.3125f, -7.2500f, 8.3125f, 8, 8}, // 002e
|
||||
{0.964844f, 0.224609f, 0.996094f, 0.285156f, -1.8750f, -28.1875f, 12.1250f, 16, 31}, // 002f
|
||||
{0.000000f, 0.625000f, 0.037109f, 0.681641f, -0.3125f, -28.5000f, 17.5625f, 19, 29}, // 0030
|
||||
{0.074219f, 0.695313f, 0.099609f, 0.751953f, 1.1250f, -28.5000f, 17.5000f, 13, 29}, // 0031
|
||||
{0.039063f, 0.625000f, 0.076172f, 0.681641f, -0.3125f, -28.5000f, 17.5625f, 19, 29}, // 0032
|
||||
{0.835938f, 0.630859f, 0.873047f, 0.687500f, -0.4375f, -28.5000f, 17.5000f, 19, 29}, // 0033
|
||||
{0.343750f, 0.613281f, 0.382813f, 0.669922f, -1.0000f, -28.1875f, 17.5625f, 20, 29}, // 0034
|
||||
{0.759766f, 0.640625f, 0.794922f, 0.697266f, 0.0625f, -28.1875f, 17.5000f, 18, 29}, // 0035
|
||||
{0.875000f, 0.630859f, 0.912109f, 0.687500f, -0.0625f, -28.5000f, 17.5625f, 19, 29}, // 0036
|
||||
{0.212891f, 0.634766f, 0.250000f, 0.691406f, -0.6250f, -28.1875f, 17.5000f, 19, 29}, // 0037
|
||||
{0.251953f, 0.634766f, 0.289063f, 0.691406f, -0.5000f, -28.5000f, 17.5625f, 19, 29}, // 0038
|
||||
{0.291016f, 0.634766f, 0.328125f, 0.691406f, -0.5625f, -28.5000f, 17.5000f, 19, 29}, // 0039
|
||||
{0.058594f, 0.728516f, 0.074219f, 0.771484f, 0.3125f, -21.8125f, 7.9375f, 8, 22}, // 003a
|
||||
{0.626953f, 0.623047f, 0.644531f, 0.675781f, -0.1875f, -21.8125f, 7.8750f, 9, 27}, // 003b
|
||||
{0.212891f, 0.322266f, 0.244141f, 0.359375f, -1.0000f, -20.6875f, 15.1250f, 16, 19}, // 003c
|
||||
{0.617188f, 0.722656f, 0.650391f, 0.750000f, 0.1250f, -20.0625f, 16.8750f, 17, 14}, // 003d
|
||||
{0.767578f, 0.167969f, 0.800781f, 0.205078f, -0.1250f, -20.4375f, 15.4375f, 17, 19}, // 003e
|
||||
{0.964844f, 0.349609f, 0.998047f, 0.406250f, -1.2500f, -28.5000f, 14.3750f, 17, 29}, // 003f
|
||||
{0.865234f, 0.558594f, 0.921875f, 0.628906f, -0.8125f, -27.8125f, 27.5625f, 29, 36}, // 0040
|
||||
{0.000000f, 0.566406f, 0.042969f, 0.623047f, -1.4375f, -28.1875f, 18.6875f, 22, 29}, // 0041
|
||||
{0.384766f, 0.613281f, 0.423828f, 0.669922f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0042
|
||||
{0.425781f, 0.619141f, 0.464844f, 0.675781f, -0.3125f, -28.5625f, 18.8125f, 20, 29}, // 0043
|
||||
{0.466797f, 0.619141f, 0.505859f, 0.675781f, 0.3125f, -28.1875f, 19.7500f, 20, 29}, // 0044
|
||||
{0.796875f, 0.640625f, 0.832031f, 0.697266f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0045
|
||||
{0.914063f, 0.669922f, 0.949219f, 0.726563f, 0.3125f, -28.1875f, 16.3750f, 18, 29}, // 0046
|
||||
{0.257813f, 0.576172f, 0.298828f, 0.632813f, -0.3125f, -28.5000f, 19.8750f, 21, 29}, // 0047
|
||||
{0.300781f, 0.576172f, 0.341797f, 0.632813f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 0048
|
||||
{0.000000f, 0.728516f, 0.015625f, 0.785156f, 0.6250f, -28.1875f, 8.6250f, 8, 29}, // 0049
|
||||
{0.951172f, 0.669922f, 0.986328f, 0.726563f, -1.0625f, -28.1875f, 16.3750f, 18, 29}, // 004a
|
||||
{0.089844f, 0.578125f, 0.130859f, 0.634766f, 0.3125f, -28.1875f, 18.7500f, 21, 29}, // 004b
|
||||
{0.330078f, 0.671875f, 0.365234f, 0.728516f, 0.3125f, -28.1875f, 16.3750f, 18, 29}, // 004c
|
||||
{0.943359f, 0.105469f, 0.992188f, 0.162109f, 0.1875f, -28.1875f, 24.8125f, 25, 29}, // 004d
|
||||
{0.132813f, 0.578125f, 0.173828f, 0.634766f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 004e
|
||||
{0.707031f, 0.582031f, 0.748047f, 0.638672f, -0.3750f, -28.5000f, 20.2500f, 21, 29}, // 004f
|
||||
{0.644531f, 0.619141f, 0.683594f, 0.675781f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0050
|
||||
{0.505859f, 0.560547f, 0.550781f, 0.621094f, -0.3750f, -28.5000f, 20.6250f, 23, 31}, // 0051
|
||||
{0.507813f, 0.623047f, 0.546875f, 0.679688f, 0.3125f, -28.1250f, 18.8750f, 20, 29}, // 0052
|
||||
{0.548828f, 0.623047f, 0.587891f, 0.679688f, -0.5000f, -28.5000f, 18.1875f, 20, 29}, // 0053
|
||||
{0.750000f, 0.582031f, 0.791016f, 0.638672f, -1.3125f, -28.1875f, 17.3750f, 21, 29}, // 0054
|
||||
{0.792969f, 0.582031f, 0.833984f, 0.638672f, 0.0625f, -28.1875f, 20.1250f, 21, 29}, // 0055
|
||||
{0.552734f, 0.564453f, 0.597656f, 0.621094f, -1.6875f, -28.1875f, 18.6875f, 23, 29}, // 0056
|
||||
{0.447266f, 0.560547f, 0.503906f, 0.617188f, -1.4375f, -28.1875f, 25.8125f, 29, 29}, // 0057
|
||||
{0.044922f, 0.566406f, 0.087891f, 0.623047f, -1.2500f, -28.1875f, 18.6875f, 22, 29}, // 0058
|
||||
{0.212891f, 0.576172f, 0.255859f, 0.632813f, -1.5625f, -28.1875f, 18.6875f, 22, 29}, // 0059
|
||||
{0.078125f, 0.636719f, 0.115234f, 0.693359f, -0.7500f, -28.1875f, 16.6875f, 19, 29}, // 005a
|
||||
{0.666016f, 0.677734f, 0.685547f, 0.751953f, 0.1250f, -31.7500f, 8.4375f, 10, 38}, // 005b
|
||||
{0.964844f, 0.287109f, 0.996094f, 0.347656f, -1.6250f, -28.1875f, 12.3750f, 16, 31}, // 005c
|
||||
{0.281250f, 0.693359f, 0.300781f, 0.767578f, -1.7500f, -31.7500f, 8.4375f, 10, 38}, // 005d
|
||||
{0.687500f, 0.701172f, 0.716797f, 0.734375f, -1.1250f, -28.1875f, 12.7500f, 15, 17}, // 005e
|
||||
{0.447266f, 0.542969f, 0.480469f, 0.556641f, -1.8750f, -4.0000f, 13.3125f, 17, 7}, // 005f
|
||||
{0.707031f, 0.560547f, 0.728516f, 0.578125f, -0.8125f, -29.2500f, 9.8750f, 11, 9}, // 0060
|
||||
{0.474609f, 0.681641f, 0.509766f, 0.726563f, -0.7500f, -22.3125f, 16.0625f, 18, 23}, // 0061
|
||||
{0.175781f, 0.578125f, 0.210938f, 0.638672f, -0.0625f, -29.8750f, 16.7500f, 18, 31}, // 0062
|
||||
{0.964844f, 0.408203f, 0.998047f, 0.453125f, -0.7500f, -22.3125f, 15.3750f, 17, 23}, // 0063
|
||||
{0.589844f, 0.623047f, 0.625000f, 0.683594f, -0.6875f, -29.8750f, 16.7500f, 18, 31}, // 0064
|
||||
{0.511719f, 0.681641f, 0.546875f, 0.726563f, -0.7500f, -22.3125f, 15.5000f, 18, 23}, // 0065
|
||||
{0.445313f, 0.677734f, 0.472656f, 0.738281f, -1.2500f, -30.2500f, 10.1250f, 14, 31}, // 0066
|
||||
{0.117188f, 0.636719f, 0.152344f, 0.695313f, -0.6250f, -22.3125f, 16.7500f, 18, 30}, // 0067
|
||||
{0.964844f, 0.164063f, 0.998047f, 0.222656f, -0.1250f, -29.8750f, 16.7500f, 17, 30}, // 0068
|
||||
{0.814453f, 0.699219f, 0.830078f, 0.757813f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 0069
|
||||
{0.191406f, 0.640625f, 0.212891f, 0.714844f, -3.1250f, -30.0000f, 7.8125f, 11, 38}, // 006a
|
||||
{0.154297f, 0.640625f, 0.189453f, 0.699219f, -0.0625f, -29.8750f, 15.5000f, 18, 30}, // 006b
|
||||
{0.169922f, 0.701172f, 0.185547f, 0.759766f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 006c
|
||||
{0.765625f, 0.400391f, 0.816406f, 0.445313f, -0.0625f, -22.3125f, 25.6875f, 26, 23}, // 006d
|
||||
{0.582031f, 0.685547f, 0.615234f, 0.730469f, -0.0625f, -22.3125f, 16.7500f, 17, 23}, // 006e
|
||||
{0.419922f, 0.363281f, 0.457031f, 0.408203f, -0.7500f, -22.3125f, 16.7500f, 19, 23}, // 006f
|
||||
{0.685547f, 0.640625f, 0.720703f, 0.699219f, -0.0625f, -22.3125f, 16.7500f, 18, 30}, // 0070
|
||||
{0.722656f, 0.640625f, 0.757813f, 0.699219f, -0.6875f, -22.3125f, 16.7500f, 18, 30}, // 0071
|
||||
{0.787109f, 0.699219f, 0.812500f, 0.744141f, -0.0625f, -22.3125f, 10.4375f, 13, 23}, // 0072
|
||||
{0.833984f, 0.689453f, 0.867188f, 0.734375f, -0.9375f, -22.3125f, 15.0000f, 17, 23}, // 0073
|
||||
{0.759766f, 0.699219f, 0.785156f, 0.751953f, -1.4375f, -26.3750f, 10.1875f, 13, 27}, // 0074
|
||||
{0.869141f, 0.689453f, 0.902344f, 0.734375f, -0.1250f, -21.9375f, 16.7500f, 17, 23}, // 0075
|
||||
{0.000000f, 0.683594f, 0.035156f, 0.726563f, -1.4375f, -21.9375f, 15.0000f, 18, 22}, // 0076
|
||||
{0.212891f, 0.494141f, 0.261719f, 0.537109f, -1.3125f, -21.9375f, 22.0625f, 25, 22}, // 0077
|
||||
{0.037109f, 0.683594f, 0.072266f, 0.726563f, -1.4375f, -21.9375f, 15.0000f, 18, 22}, // 0078
|
||||
{0.728516f, 0.490234f, 0.765625f, 0.548828f, -1.6875f, -21.9375f, 15.0000f, 19, 30}, // 0079
|
||||
{0.101563f, 0.697266f, 0.134766f, 0.740234f, -0.7500f, -21.9375f, 15.0000f, 17, 22}, // 007a
|
||||
{0.466797f, 0.238281f, 0.492188f, 0.310547f, -1.1250f, -30.5000f, 10.0000f, 13, 37}, // 007b
|
||||
{0.652344f, 0.722656f, 0.666016f, 0.787109f, 0.1875f, -28.1875f, 7.4375f, 7, 33}, // 007c
|
||||
{0.367188f, 0.671875f, 0.392578f, 0.744141f, -1.5000f, -30.5000f, 10.0000f, 13, 37}, // 007d
|
||||
{0.017578f, 0.728516f, 0.056641f, 0.750000f, -0.1875f, -17.3125f, 19.6250f, 20, 11}, // 007e
|
||||
{0.302734f, 0.693359f, 0.330078f, 0.746094f, -0.8750f, -26.7500f, 12.4375f, 14, 27}, // 007f
|
||||
// RANGE: 0xfffd - 0xfffe, start 0x89
|
||||
{0.146484f, 0.375000f, 0.208984f, 0.470703f, -0.6250f, -39.6875f, 30.1875f, 32, 49}, // fffd
|
||||
#endif /* USING_QT_UI */
|
||||
};
|
||||
const AtlasCharRange font_UBUNTU24_ranges[] = {
|
||||
{ 32, 128, 0 },
|
||||
#ifndef USING_QT_UI
|
||||
{ 128, 129, 96 },
|
||||
{ 162, 256, 97 },
|
||||
{ 256, 384, 191 },
|
||||
@ -34046,33 +33944,21 @@ const AtlasCharRange font_UBUNTU24_ranges[] = {
|
||||
{ 19968, 40960, 1495 },
|
||||
{ 44032, 55204, 22487 },
|
||||
{ 65280, 65520, 33659 },
|
||||
#else /* USING_QT_UI */
|
||||
{ 65533, 65534, 96 },
|
||||
#endif /* USING_QT_UI */
|
||||
};
|
||||
const AtlasFont font_UBUNTU24 = {
|
||||
#ifndef USING_QT_UI
|
||||
-6.125000f, // padding
|
||||
#else /* USING_QT_UI */
|
||||
-3.437500f, // padding
|
||||
#endif /* USING_QT_UI */
|
||||
49.000000f, // height
|
||||
37.687500f, // ascend
|
||||
0.750000f, // distslope
|
||||
font_UBUNTU24_chardata,
|
||||
font_UBUNTU24_ranges,
|
||||
#ifndef USING_QT_UI
|
||||
20,
|
||||
#else /* USING_QT_UI */
|
||||
2,
|
||||
#endif /* USING_QT_UI */
|
||||
"UBUNTU24", // name
|
||||
};
|
||||
const AtlasFont *ui_fonts[1] = {
|
||||
&font_UBUNTU24,
|
||||
};
|
||||
const AtlasImage ui_images[41] = {
|
||||
#ifndef USING_QT_UI
|
||||
{0.321533f, 0.207764f, 0.328857f, 0.215088f, 16, 16, "I_SOLIDWHITE"},
|
||||
{0.958740f, 0.000244f, 0.976318f, 0.017822f, 37, 37, "I_CROSS"},
|
||||
{0.918701f, 0.000244f, 0.937256f, 0.018799f, 39, 39, "I_CIRCLE"},
|
||||
@ -34114,49 +34000,6 @@ const AtlasImage ui_images[41] = {
|
||||
{0.204346f, 0.968994f, 0.211670f, 0.980225f, 16, 24, "I_5"},
|
||||
{0.813721f, 0.818115f, 0.821533f, 0.829834f, 17, 25, "I_6"},
|
||||
{0.096924f, 0.075928f, 0.111084f, 0.083740f, 30, 17, "I_PSP_DISPLAY"},
|
||||
#else /* USING_QT_UI */
|
||||
{0.137695f, 0.702148f, 0.166992f, 0.731445f, 16, 16, "I_SOLIDWHITE"},
|
||||
{0.584961f, 0.491211f, 0.655273f, 0.561523f, 37, 37, "I_CROSS"},
|
||||
{0.747070f, 0.323242f, 0.821289f, 0.397461f, 39, 39, "I_CIRCLE"},
|
||||
{0.659180f, 0.491211f, 0.725586f, 0.557617f, 35, 35, "I_SQUARE"},
|
||||
{0.502930f, 0.491211f, 0.581055f, 0.557617f, 41, 35, "I_TRIANGLE"},
|
||||
{0.213867f, 0.543945f, 0.374023f, 0.573242f, 83, 16, "I_SELECT"},
|
||||
{0.729492f, 0.549805f, 0.862305f, 0.579102f, 69, 16, "I_START"},
|
||||
{0.965820f, 0.612305f, 0.993164f, 0.668945f, 15, 30, "I_ARROW"},
|
||||
{0.000977f, 0.483398f, 0.114258f, 0.563477f, 59, 42, "I_DIR"},
|
||||
{0.887695f, 0.454102f, 0.991211f, 0.555664f, 54, 53, "I_ROUND"},
|
||||
{0.346680f, 0.483398f, 0.499023f, 0.540039f, 79, 30, "I_RECT"},
|
||||
{0.708008f, 0.000977f, 0.875977f, 0.165039f, 87, 85, "I_STICK"},
|
||||
{0.254883f, 0.000977f, 0.493164f, 0.235352f, 123, 121, "I_STICK_BG"},
|
||||
{0.346680f, 0.413086f, 0.569336f, 0.479492f, 115, 35, "I_SHOULDER"},
|
||||
{0.000977f, 0.375977f, 0.143555f, 0.479492f, 74, 54, "I_DIR_LINE"},
|
||||
{0.213867f, 0.364258f, 0.342773f, 0.491211f, 67, 66, "I_ROUND_LINE"},
|
||||
{0.573242f, 0.413086f, 0.762695f, 0.487305f, 98, 39, "I_RECT_LINE"},
|
||||
{0.467773f, 0.323242f, 0.743164f, 0.409180f, 142, 45, "I_SHOULDER_LINE"},
|
||||
{0.497070f, 0.000977f, 0.704102f, 0.204102f, 107, 105, "I_STICK_LINE"},
|
||||
{0.000977f, 0.000977f, 0.250977f, 0.247070f, 129, 127, "I_STICK_BG_LINE"},
|
||||
{0.377930f, 0.543945f, 0.444336f, 0.610352f, 35, 35, "I_CHECKEDBOX"},
|
||||
{0.254883f, 0.239258f, 0.463867f, 0.360352f, 108, 63, "I_BG"},
|
||||
{0.000977f, 0.250977f, 0.209961f, 0.372070f, 108, 63, "I_BG_GOLD"},
|
||||
{0.475586f, 0.729492f, 0.495117f, 0.762695f, 11, 18, "I_L"},
|
||||
{0.344727f, 0.577148f, 0.374023f, 0.610352f, 16, 18, "I_R"},
|
||||
{0.118164f, 0.483398f, 0.209961f, 0.575195f, 48, 48, "I_DROP_SHADOW"},
|
||||
{0.924805f, 0.559570f, 0.995117f, 0.608398f, 37, 26, "I_LINES"},
|
||||
{0.346680f, 0.364258f, 0.416992f, 0.411133f, 37, 25, "I_GRID"},
|
||||
{0.497070f, 0.208008f, 0.819336f, 0.319336f, 166, 58, "I_LOGO"},
|
||||
{0.823242f, 0.168945f, 0.961914f, 0.307617f, 72, 72, "I_ICON"},
|
||||
{0.823242f, 0.311523f, 0.961914f, 0.450195f, 72, 72, "I_ICONGOLD"},
|
||||
{0.879883f, 0.000977f, 0.993164f, 0.102539f, 59, 53, "I_FOLDER"},
|
||||
{0.766602f, 0.454102f, 0.883789f, 0.545898f, 61, 48, "I_UP_DIRECTORY"},
|
||||
{0.879883f, 0.106445f, 0.940430f, 0.166992f, 32, 32, "I_GEAR"},
|
||||
{0.836914f, 0.583008f, 0.860352f, 0.627930f, 13, 24, "I_1"},
|
||||
{0.215820f, 0.694336f, 0.245117f, 0.739258f, 16, 24, "I_2"},
|
||||
{0.549805f, 0.682617f, 0.579102f, 0.729492f, 16, 25, "I_3"},
|
||||
{0.264648f, 0.495117f, 0.297852f, 0.540039f, 18, 24, "I_4"},
|
||||
{0.249023f, 0.694336f, 0.278320f, 0.739258f, 16, 24, "I_5"},
|
||||
{0.301758f, 0.495117f, 0.333008f, 0.541992f, 17, 25, "I_6"},
|
||||
{0.708008f, 0.168945f, 0.764648f, 0.200195f, 30, 17, "I_PSP_DISPLAY"},
|
||||
#endif /* USING_QT_UI */
|
||||
};
|
||||
const Atlas ui_atlas = {
|
||||
"ui_atlas.zim",
|
||||
|
||||
@ -50,6 +50,7 @@
|
||||
#include <crtdbg.h>
|
||||
#include <sstream>
|
||||
|
||||
#include "Core/Config.h"
|
||||
#include "Common/Vulkan/VulkanLoader.h"
|
||||
#include "Common/Vulkan/VulkanContext.h"
|
||||
|
||||
@ -58,8 +59,6 @@
|
||||
#include "util/text/parsers.h"
|
||||
#include "Windows/GPU/WindowsVulkanContext.h"
|
||||
|
||||
extern const char *PPSSPP_GIT_VERSION;
|
||||
|
||||
#ifdef _DEBUG
|
||||
static const bool g_validate_ = true;
|
||||
#else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user