diff --git a/.github/mac-bundle-qt.sh b/.github/mac-bundle-qt.sh index e18be8a5..f8083936 100644 --- a/.github/mac-bundle-qt.sh +++ b/.github/mac-bundle-qt.sh @@ -5,16 +5,16 @@ PATH="$PATH:/usr/libexec" # Construct the app iconset. mkdir alber.iconset -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 16x16 alber.iconset/icon_16x16.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 32x32 alber.iconset/icon_16x16@2x.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 32x32 alber.iconset/icon_32x32.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 64x64 alber.iconset/icon_32x32@2x.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 128x128 alber.iconset/icon_128x128.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 256x256 alber.iconset/icon_128x128@2x.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 256x256 alber.iconset/icon_256x256.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 512x512 alber.iconset/icon_256x256@2x.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 512x512 alber.iconset/icon_512x512.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 1024x1024 alber.iconset/icon_512x512@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 16x16 alber.iconset/icon_16x16.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 32x32 alber.iconset/icon_16x16@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 32x32 alber.iconset/icon_32x32.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 64x64 alber.iconset/icon_32x32@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 128x128 alber.iconset/icon_128x128.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 256x256 alber.iconset/icon_128x128@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 256x256 alber.iconset/icon_256x256.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 512x512 alber.iconset/icon_256x256@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 512x512 alber.iconset/icon_512x512.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 1024x1024 alber.iconset/icon_512x512@2x.png iconutil --convert icns alber.iconset # Set up the .app directory diff --git a/.github/mac-bundle.sh b/.github/mac-bundle.sh index 314b30f7..3349d6d3 100755 --- a/.github/mac-bundle.sh +++ b/.github/mac-bundle.sh @@ -5,16 +5,16 @@ PATH="$PATH:/usr/libexec" # Construct the app iconset. mkdir alber.iconset -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 16x16 alber.iconset/icon_16x16.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 32x32 alber.iconset/icon_16x16@2x.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 32x32 alber.iconset/icon_32x32.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 64x64 alber.iconset/icon_32x32@2x.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 128x128 alber.iconset/icon_128x128.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 256x256 alber.iconset/icon_128x128@2x.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 256x256 alber.iconset/icon_256x256.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 512x512 alber.iconset/icon_256x256@2x.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 512x512 alber.iconset/icon_512x512.png -convert docs/img/alber-icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 1024x1024 alber.iconset/icon_512x512@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 16x16 alber.iconset/icon_16x16.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 32x32 alber.iconset/icon_16x16@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 32x32 alber.iconset/icon_32x32.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 64x64 alber.iconset/icon_32x32@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 128x128 alber.iconset/icon_128x128.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 256x256 alber.iconset/icon_128x128@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 256x256 alber.iconset/icon_256x256.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 512x512 alber.iconset/icon_256x256@2x.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 512x512 alber.iconset/icon_512x512.png +convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 1024x1024 alber.iconset/icon_512x512@2x.png iconutil --convert icns alber.iconset # Set up the .app directory diff --git a/.github/workflows/Linux_AppImage_Build.yml b/.github/workflows/Linux_AppImage_Build.yml index 51c4a933..3c5af88a 100644 --- a/.github/workflows/Linux_AppImage_Build.yml +++ b/.github/workflows/Linux_AppImage_Build.yml @@ -24,7 +24,7 @@ jobs: run: git submodule update --init --recursive - name: Install misc packages - run: sudo apt-get update && sudo apt install libx11-dev libgl1 libglx-mesa0 mesa-common-dev libfuse2 + run: sudo apt-get update && sudo apt install libx11-dev libgl1 libglx-mesa0 mesa-common-dev libfuse2 libwayland-dev - name: Install newer Clang run: | diff --git a/.github/workflows/Linux_Build.yml b/.github/workflows/Linux_Build.yml index dfcb6954..61f7eafa 100644 --- a/.github/workflows/Linux_Build.yml +++ b/.github/workflows/Linux_Build.yml @@ -24,7 +24,7 @@ jobs: run: git submodule update --init --recursive - name: Install misc packages - run: sudo apt-get update && sudo apt install libx11-dev libgl1 libglx-mesa0 mesa-common-dev + run: sudo apt-get update && sudo apt install libx11-dev libgl1 libglx-mesa0 mesa-common-dev libwayland-dev - name: Install newer Clang run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index f4808366..d5e1d070 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,12 @@ if(APPLE) enable_language(OBJC) endif() +# Enable RC support in order to use resource files for application icons +if(WIN32) + enable_language(RC) + set(APP_RESOURCES docs/img/windows_icon.rc) +endif() + if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral -Wno-format-security -Wno-invalid-offsetof") endif() @@ -668,7 +674,7 @@ if(NOT BUILD_HYDRA_CORE AND NOT BUILD_LIBRETRO_CORE) endif() target_link_libraries(Alber PRIVATE AlberCore) - target_sources(Alber PRIVATE ${FRONTEND_SOURCE_FILES} ${FRONTEND_HEADER_FILES}) + target_sources(Alber PRIVATE ${FRONTEND_SOURCE_FILES} ${FRONTEND_HEADER_FILES} ${APP_RESOURCES}) elseif(BUILD_HYDRA_CORE) target_compile_definitions(AlberCore PRIVATE PANDA3DS_HYDRA_CORE=1) include_directories(third_party/hydra_core/include) diff --git a/docs/img/alber-icon.ico b/docs/img/mac_icon.ico similarity index 100% rename from docs/img/alber-icon.ico rename to docs/img/mac_icon.ico diff --git a/docs/img/windows_icon.ico b/docs/img/windows_icon.ico new file mode 100644 index 00000000..340f251e Binary files /dev/null and b/docs/img/windows_icon.ico differ diff --git a/docs/img/windows_icon.rc b/docs/img/windows_icon.rc new file mode 100644 index 00000000..22dc105e --- /dev/null +++ b/docs/img/windows_icon.rc @@ -0,0 +1 @@ +AlberIcon ICON "windows_icon.ico" \ No newline at end of file diff --git a/src/core/audio/hle_core.cpp b/src/core/audio/hle_core.cpp index 70a8e71d..85eee97a 100644 --- a/src/core/audio/hle_core.cpp +++ b/src/core/audio/hle_core.cpp @@ -643,8 +643,8 @@ namespace Audio { response.command = request.command; response.mode = request.mode; - // TODO: Make this a toggle in config.toml. Currently we have it off by default until we finish the DSP mixer. - constexpr bool enableAAC = false; + // TODO: Make this a toggle in config.toml. Currently we have it on by default. + constexpr bool enableAAC = true; if (enableAAC) { aacDecoder->decode(response, request, [this](u32 paddr) { return getPointerPhys(paddr); }); } diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp index 88417a91..28a704e6 100644 --- a/src/panda_qt/main_window.cpp +++ b/src/panda_qt/main_window.cpp @@ -15,6 +15,8 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent), keyboardMappings(InputMappings::defaultKeyboardMappings()) { setWindowTitle("Alber"); + setWindowIcon(QIcon(":/docs/img/rpog_icon.png")); + // Enable drop events for loading ROMs setAcceptDrops(true); resize(800, 240 * 4); diff --git a/src/panda_sdl/frontend_sdl.cpp b/src/panda_sdl/frontend_sdl.cpp index 1aa79e87..98978954 100644 --- a/src/panda_sdl/frontend_sdl.cpp +++ b/src/panda_sdl/frontend_sdl.cpp @@ -40,11 +40,18 @@ FrontendSDL::FrontendSDL() : keyboardMappings(InputMappings::defaultKeyboardMapp printf("Welcome to Panda3DS v%s!\n", PANDA3DS_VERSION); } + // Positions of the window + int windowX, windowY; + // Apply window size settings if the appropriate option is enabled if (config.windowSettings.rememberPosition) { + windowX = config.windowSettings.x; + windowY = config.windowSettings.y; windowWidth = config.windowSettings.width; windowHeight = config.windowSettings.height; } else { + windowX = SDL_WINDOWPOS_CENTERED; + windowY = SDL_WINDOWPOS_CENTERED; windowWidth = 400; windowHeight = 480; } @@ -56,7 +63,7 @@ FrontendSDL::FrontendSDL() : keyboardMappings(InputMappings::defaultKeyboardMapp SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, config.rendererType == RendererType::Software ? 3 : 4); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, config.rendererType == RendererType::Software ? 3 : 1); - window = SDL_CreateWindow(windowTitle, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, windowWidth, windowHeight, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE); + window = SDL_CreateWindow(windowTitle, windowX, windowY, windowWidth, windowHeight, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE); if (window == nullptr) { Helpers::panic("Window creation failed: %s", SDL_GetError()); @@ -76,9 +83,7 @@ FrontendSDL::FrontendSDL() : keyboardMappings(InputMappings::defaultKeyboardMapp #ifdef PANDA3DS_ENABLE_VULKAN if (config.rendererType == RendererType::Vulkan) { - window = SDL_CreateWindow( - windowTitle, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, windowWidth, windowHeight, SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE - ); + window = SDL_CreateWindow(windowTitle, windowX, windowY, windowWidth, windowHeight, SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE); if (window == nullptr) { Helpers::warn("Window creation failed: %s", SDL_GetError()); @@ -126,8 +131,6 @@ void FrontendSDL::run() { // Remember window position & size for future runs auto& windowSettings = emu.getConfig().windowSettings; - // Note: For the time being we currently don't actually apply the x/y positions to the window, and center it instead - // This is subject to change in the future, so let's save the x/y positions to the config file anyways SDL_GetWindowPosition(window, &windowSettings.x, &windowSettings.y); SDL_GetWindowSize(window, &windowSettings.width, &windowSettings.height); return; diff --git a/src/pandroid/app/src/main/ic_launcher-playstore.png b/src/pandroid/app/src/main/ic_launcher-playstore.png new file mode 100644 index 00000000..04b65284 Binary files /dev/null and b/src/pandroid/app/src/main/ic_launcher-playstore.png differ diff --git a/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755b..036d09bc 100644 --- a/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755b..036d09bc 100644 --- a/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78e..61d2084a 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..9cae8387 Binary files /dev/null and b/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d1..c3c7e5a2 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d64..3f5d5d42 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..3c486012 Binary files /dev/null and b/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611da..b11dd67f 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a3070..eebe375d 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..aef35be5 Binary files /dev/null and b/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a6956..a52a83b3 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77f..9368d16c 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..95242200 Binary files /dev/null and b/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f508..56373697 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d6427..408caf75 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..df4f2156 Binary files /dev/null and b/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae37..9c7b64f0 100644 Binary files a/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/src/pandroid/app/src/main/res/values/ic_launcher_background.xml b/src/pandroid/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..28382334 --- /dev/null +++ b/src/pandroid/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #C45F5F + \ No newline at end of file