jaildesigner-jailgames/aee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

tidy-fix automàtic (sense naming)

Browse Source
This commit is contained in:
Sergio Valor
2026-05-14 18:28:23 +02:00
parent 358e91ea30
commit b7a551c158
81 changed files with 1549 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/core/rendering/screen.cpp
+104 -41
View File
@@ -1,5 +1,6 @@
#include "core/rendering/screen.hpp"
#include <algorithm>
#include <cstdio>
#include <iostream>
@@ -76,15 +77,15 @@ Screen::Screen() {
calculateMaxZoom();
if (zoom_ < 1) zoom_ = 1;
if (zoom_ > max_zoom_) zoom_ = max_zoom_;
zoom_ = std::max(zoom_, 1);
zoom_ = std::min(zoom_, max_zoom_);
// Clamp de la resolució interna a [1, max_zoom_]. Llegir del YAML i
// ajustar aquí és l'únic moment en què es fa — el menú re-clampa cada
// canvi. Si la pantalla és més petita que el valor desat (p.ex. canvi
// de monitor), baixem al màxim suportat.
if (Options::video.internal_resolution < 1) Options::video.internal_resolution = 1;
if (Options::video.internal_resolution > max_zoom_) Options::video.internal_resolution = max_zoom_;
Options::video.internal_resolution = std::max(Options::video.internal_resolution, 1);
Options::video.internal_resolution = std::min(Options::video.internal_resolution, max_zoom_);
int w = GAME_WIDTH * zoom_;
int h = Options::video.aspect_ratio_4_3 ? static_cast<int>(GAME_HEIGHT * 1.2F) * zoom_ : GAME_HEIGHT * zoom_;
@@ -124,15 +125,25 @@ Screen::~Screen() {
if (shader_backend_) {
#ifndef NO_SHADERS
auto* gpu = dynamic_cast<Rendering::SDL3GPUShader*>(shader_backend_.get());
if (gpu) gpu->destroy();
if (gpu != nullptr) {
gpu->destroy();
}
#endif
shader_backend_.reset();
}
if (internal_texture_sdl_) SDL_DestroyTexture(internal_texture_sdl_);
if (texture_) SDL_DestroyTexture(texture_);
if (renderer_) SDL_DestroyRenderer(renderer_);
if (window_) SDL_DestroyWindow(window_);
if (internal_texture_sdl_ != nullptr) {
SDL_DestroyTexture(internal_texture_sdl_);
}
if (texture_ != nullptr) {
SDL_DestroyTexture(texture_);
}
if (renderer_ != nullptr) {
SDL_DestroyRenderer(renderer_);
}
if (window_ != nullptr) {
SDL_DestroyWindow(window_);
}
}
void Screen::initShaders() {
@@ -143,7 +154,9 @@ void Screen::initShaders() {
// curtcircuiten cap al fallback SDL_Renderer.
return;
#else
if (!Options::video.gpu_acceleration) return;
if (!Options::video.gpu_acceleration) {
return;
}
shader_backend_ = std::make_unique<Rendering::SDL3GPUShader>();
@@ -282,19 +295,25 @@ void Screen::toggleFullscreen() {
}
void Screen::incZoom() {
if (fullscreen_ || zoom_ >= max_zoom_) return;
if (fullscreen_ || zoom_ >= max_zoom_) {
return;
}
zoom_++;
adjustWindowSize();
}
void Screen::decZoom() {
if (fullscreen_ || zoom_ <= 1) return;
if (fullscreen_ || zoom_ <= 1) {
return;
}
zoom_--;
adjustWindowSize();
}
void Screen::setZoom(int zoom) {
if (zoom < 1 || zoom > max_zoom_ || fullscreen_) return;
if (zoom < 1 || zoom > max_zoom_ || fullscreen_) {
return;
}
zoom_ = zoom;
adjustWindowSize();
}
@@ -310,9 +329,15 @@ auto Screen::toggleSupersampling() -> bool {
// SS només té sentit amb shaders on i pipeline PostFX (el Lanczos downscale
// i el camí SS s'apliquen al pas de PostFX; CRTPI fa el seu propi
// submostreig intern i no usa aquesta via).
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) return false;
if (!Options::video.shader_enabled) return false;
if (shader_backend_->getActiveShader() != Rendering::ShaderType::POSTFX) return false;
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) {
return false;
}
if (!Options::video.shader_enabled) {
return false;
}
if (shader_backend_->getActiveShader() != Rendering::ShaderType::POSTFX) {
return false;
}
Options::video.supersampling = !Options::video.supersampling;
shader_backend_->setOversample(Options::video.supersampling ? 3 : 1);
return true;
@@ -366,9 +391,11 @@ void Screen::cycleTextureFilter(int dir) {
void Screen::changeInternalResolution(int dir) {
int next = Options::video.internal_resolution + (dir >= 0 ? 1 : -1);
if (next < 1) next = 1;
if (next > max_zoom_) next = max_zoom_;
if (next == Options::video.internal_resolution) return;
next = std::max(next, 1);
next = std::min(next, max_zoom_);
if (next == Options::video.internal_resolution) {
return;
}
Options::video.internal_resolution = next;
// Propaga al backend actiu. Al fallback path, la textura es recrea al
@@ -381,8 +408,12 @@ void Screen::changeInternalResolution(int dir) {
}
auto Screen::nextShaderType() -> bool {
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) return false;
if (!Options::video.shader_enabled) return false;
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) {
return false;
}
if (!Options::video.shader_enabled) {
return false;
}
if (shader_backend_->getActiveShader() == Rendering::ShaderType::POSTFX) {
shader_backend_->setActiveShader(Rendering::ShaderType::CRTPI);
@@ -397,16 +428,24 @@ auto Screen::nextShaderType() -> bool {
}
auto Screen::nextPreset() -> bool {
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) return false;
if (!Options::video.shader_enabled) return false;
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) {
return false;
}
if (!Options::video.shader_enabled) {
return false;
}
if (shader_backend_->getActiveShader() == Rendering::ShaderType::POSTFX) {
if (Options::postfx_presets.empty()) return false;
if (Options::postfx_presets.empty()) {
return false;
}
Options::current_postfx_preset = (Options::current_postfx_preset + 1) % static_cast<int>(Options::postfx_presets.size());
Options::video.current_postfx_preset = Options::postfx_presets[Options::current_postfx_preset].name;
applyCurrentPostFXPreset();
} else {
if (Options::crtpi_presets.empty()) return false;
if (Options::crtpi_presets.empty()) {
return false;
}
Options::current_crtpi_preset = (Options::current_crtpi_preset + 1) % static_cast<int>(Options::crtpi_presets.size());
Options::video.current_crtpi_preset = Options::crtpi_presets[Options::current_crtpi_preset].name;
applyCurrentCrtPiPreset();
@@ -420,17 +459,25 @@ auto Screen::prevShaderType() -> bool {
}
auto Screen::prevPreset() -> bool {
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) return false;
if (!Options::video.shader_enabled) return false;
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) {
return false;
}
if (!Options::video.shader_enabled) {
return false;
}
if (shader_backend_->getActiveShader() == Rendering::ShaderType::POSTFX) {
if (Options::postfx_presets.empty()) return false;
if (Options::postfx_presets.empty()) {
return false;
}
int n = static_cast<int>(Options::postfx_presets.size());
Options::current_postfx_preset = (Options::current_postfx_preset - 1 + n) % n;
Options::video.current_postfx_preset = Options::postfx_presets[Options::current_postfx_preset].name;
applyCurrentPostFXPreset();
} else {
if (Options::crtpi_presets.empty()) return false;
if (Options::crtpi_presets.empty()) {
return false;
}
int n = static_cast<int>(Options::crtpi_presets.size());
Options::current_crtpi_preset = (Options::current_crtpi_preset - 1 + n) % n;
Options::video.current_crtpi_preset = Options::crtpi_presets[Options::current_crtpi_preset].name;
@@ -440,13 +487,17 @@ auto Screen::prevPreset() -> bool {
}
auto Screen::getCurrentPresetName() const -> const char* {
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) return "---";
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) {
return "---";
}
if (shader_backend_->getActiveShader() == Rendering::ShaderType::POSTFX) {
if (Options::current_postfx_preset < static_cast<int>(Options::postfx_presets.size()))
if (Options::current_postfx_preset < static_cast<int>(Options::postfx_presets.size())) {
return Options::postfx_presets[Options::current_postfx_preset].name.c_str();
}
} else {
if (Options::current_crtpi_preset < static_cast<int>(Options::crtpi_presets.size()))
if (Options::current_crtpi_preset < static_cast<int>(Options::crtpi_presets.size())) {
return Options::crtpi_presets[Options::current_crtpi_preset].name.c_str();
}
}
return "---";
}
@@ -458,7 +509,9 @@ void Screen::setActiveShader(Rendering::ShaderType type) {
}
void Screen::applyCurrentPostFXPreset() {
if (!shader_backend_ || Options::postfx_presets.empty()) return;
if (!shader_backend_ || Options::postfx_presets.empty()) {
return;
}
const auto& preset = Options::postfx_presets[Options::current_postfx_preset];
Rendering::PostFXParams p;
p.vignette = preset.vignette;
@@ -473,7 +526,9 @@ void Screen::applyCurrentPostFXPreset() {
}
void Screen::applyCurrentCrtPiPreset() {
if (!shader_backend_ || Options::crtpi_presets.empty()) return;
if (!shader_backend_ || Options::crtpi_presets.empty()) {
return;
}
const auto& preset = Options::crtpi_presets[Options::current_crtpi_preset];
Rendering::CrtPiParams p;
p.scanline_weight = preset.scanline_weight;
@@ -498,7 +553,9 @@ auto Screen::isHardwareAccelerated() const -> bool {
}
auto Screen::getActiveShaderName() const -> const char* {
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) return "SENSE GPU";
if (!shader_backend_ || !shader_backend_->isHardwareAccelerated()) {
return "SENSE GPU";
}
return shader_backend_->getActiveShader() == Rendering::ShaderType::POSTFX ? "POSTFX" : "CRT-PI";
}
@@ -534,7 +591,7 @@ void Screen::updateRenderInfo() {
fps_driver.c_str(),
shader_seg.empty() ? nullptr : shader_seg.c_str(),
ss_seg,
time_buf[0] ? time_buf : nullptr,
(time_buf[0] != 0) ? time_buf : nullptr,
0b1001);
}
@@ -544,7 +601,9 @@ void Screen::applyFallbackPresentation() {
SDL_ScaleMode scale = (Options::video.texture_filter == Options::TextureFilter::LINEAR)
? SDL_SCALEMODE_LINEAR
: SDL_SCALEMODE_NEAREST;
if (texture_) SDL_SetTextureScaleMode(texture_, scale);
if (texture_ != nullptr) {
SDL_SetTextureScaleMode(texture_, scale);
}
// Si 4:3 actiu, la finestra ja té aspect 4:3 (alçada × 1.2); STRETCH és
// l'única opció viable al path fallback (el GPU path fa l'upscale 4:3 abans
@@ -578,7 +637,9 @@ void Screen::applyFallbackPresentation() {
}
void Screen::ensureFallbackInternalTexture() {
if (renderer_ == nullptr) return;
if (renderer_ == nullptr) {
return;
}
const int mult = Options::video.internal_resolution;
if (mult <= 1) {
// No cal textura intermèdia — recicla si la teníem.
@@ -589,7 +650,9 @@ void Screen::ensureFallbackInternalTexture() {
}
return;
}
if (internal_texture_sdl_ != nullptr && internal_texture_mult_ == mult) return;
if (internal_texture_sdl_ != nullptr && internal_texture_mult_ == mult) {
return;
}
if (internal_texture_sdl_ != nullptr) {
SDL_DestroyTexture(internal_texture_sdl_);
@@ -620,11 +683,11 @@ void Screen::adjustWindowSize() {
void Screen::calculateMaxZoom() {
SDL_DisplayID display = SDL_GetPrimaryDisplay();
const SDL_DisplayMode* mode = SDL_GetCurrentDisplayMode(display);
if (mode) {
if (mode != nullptr) {
int max_w = mode->w / GAME_WIDTH;
int max_h = mode->h / GAME_HEIGHT;
max_zoom_ = (max_w < max_h) ? max_w : max_h;
if (max_zoom_ < 1) max_zoom_ = 1;
max_zoom_ = std::max(max_zoom_, 1);
}
}