JailDoctor/jdd_opendingux
1
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Issues Pull Requests Projects Releases Wiki Activity

presets en postfx

Browse Source
This commit is contained in:
Sergio
2026-03-21 13:57:18 +01:00
parent 2b2eb31c67
commit 6996b3a82a
11 changed files with 206 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/core/input/global_inputs.cpp
View File

@@ -91,9 +91,17 @@ void handleIncWindowZoom() {
}
}
void handleToggleShaders() {
Screen::get()->toggleShaders();
Notifier::get()->show({"SHADERS " + std::string(Options::video.shaders ? "ENABLED" : "DISABLED")});
void handleTogglePostFX() {
Screen::get()->togglePostFX();
Notifier::get()->show({"POSTFX " + std::string(Options::video.postfx ? "ENABLED" : "DISABLED")});
}
void handleNextPostFXPreset() {
if (!Options::postfx_presets.empty()) {
Options::current_postfx_preset = (Options::current_postfx_preset + 1) % static_cast<int>(Options::postfx_presets.size());
Screen::get()->reloadPostFX();
Notifier::get()->show({"POSTFX " + Options::postfx_presets[static_cast<size_t>(Options::current_postfx_preset)].name});
}
}
void handleNextPalette() {
@@ -152,8 +160,11 @@ auto getPressedAction() -> InputAction {
return InputAction::WINDOW_INC_ZOOM;
}
}
if (Input::get()->checkAction(InputAction::TOGGLE_SHADERS, Input::DO_NOT_ALLOW_REPEAT)) {
return InputAction::TOGGLE_SHADERS;
if (Input::get()->checkAction(InputAction::TOGGLE_POSTFX, Input::DO_NOT_ALLOW_REPEAT)) {
if (Options::video.postfx && (SDL_GetModState() & SDL_KMOD_SHIFT)) {
return InputAction::NEXT_POSTFX_PRESET;
}
return InputAction::TOGGLE_POSTFX;
}
if (Input::get()->checkAction(InputAction::NEXT_PALETTE, Input::DO_NOT_ALLOW_REPEAT)) {
return InputAction::NEXT_PALETTE;
@@ -221,8 +232,12 @@ void handle() {
handleIncWindowZoom();
break;
case InputAction::TOGGLE_SHADERS:
handleToggleShaders();
case InputAction::TOGGLE_POSTFX:
handleTogglePostFX();
break;
case InputAction::NEXT_POSTFX_PRESET:
handleNextPostFXPreset();
break;
case InputAction::NEXT_PALETTE:

2
source/core/input/input.cpp
View File

@@ -43,7 +43,7 @@ Input::Input(std::string game_controller_db_path)
{Action::WINDOW_DEC_ZOOM, KeyState{.scancode = SDL_SCANCODE_F1}},
{Action::WINDOW_INC_ZOOM, KeyState{.scancode = SDL_SCANCODE_F2}},
{Action::TOGGLE_FULLSCREEN, KeyState{.scancode = SDL_SCANCODE_F3}},
{Action::TOGGLE_SHADERS, KeyState{.scancode = SDL_SCANCODE_F4}},
{Action::TOGGLE_POSTFX, KeyState{.scancode = SDL_SCANCODE_F4}},
{Action::NEXT_PALETTE, KeyState{.scancode = SDL_SCANCODE_F5}},
{Action::PREVIOUS_PALETTE, KeyState{.scancode = SDL_SCANCODE_F6}},
{Action::TOGGLE_INTEGER_SCALE, KeyState{.scancode = SDL_SCANCODE_F7}},

6
source/core/input/input_types.cpp
View File

@@ -20,7 +20,8 @@ const std::unordered_map<InputAction, std::string> ACTION_TO_STRING = {
{InputAction::TOGGLE_MUSIC, "TOGGLE_MUSIC"},
{InputAction::NEXT_PALETTE, "NEXT_PALETTE"},
{InputAction::PREVIOUS_PALETTE, "PREVIOUS_PALETTE"},
{InputAction::TOGGLE_SHADERS, "TOGGLE_SHADERS"},
{InputAction::TOGGLE_POSTFX, "TOGGLE_POSTFX"},
{InputAction::NEXT_POSTFX_PRESET, "NEXT_POSTFX_PRESET"},
{InputAction::SHOW_DEBUG_INFO, "SHOW_DEBUG_INFO"},
{InputAction::TOGGLE_DEBUG, "TOGGLE_DEBUG"},
{InputAction::NONE, "NONE"}};
@@ -42,7 +43,8 @@ const std::unordered_map<std::string, InputAction> STRING_TO_ACTION = {
{"TOGGLE_MUSIC", InputAction::TOGGLE_MUSIC},
{"NEXT_PALETTE", InputAction::NEXT_PALETTE},
{"PREVIOUS_PALETTE", InputAction::PREVIOUS_PALETTE},
{"TOGGLE_SHADERS", InputAction::TOGGLE_SHADERS},
{"TOGGLE_POSTFX", InputAction::TOGGLE_POSTFX},
{"NEXT_POSTFX_PRESET", InputAction::NEXT_POSTFX_PRESET},
{"SHOW_DEBUG_INFO", InputAction::SHOW_DEBUG_INFO},
{"TOGGLE_DEBUG", InputAction::TOGGLE_DEBUG},
{"NONE", InputAction::NONE}};

3
source/core/input/input_types.hpp
View File

@@ -24,7 +24,8 @@ enum class InputAction : int { // Acciones de entrada posibles en el juego
TOGGLE_FULLSCREEN,
TOGGLE_VSYNC,
TOGGLE_INTEGER_SCALE,
TOGGLE_SHADERS,
TOGGLE_POSTFX,
NEXT_POSTFX_PRESET,
TOGGLE_BORDER,
TOGGLE_MUSIC,
NEXT_PALETTE,

66
source/core/rendering/screen.cpp
View File

@@ -132,7 +132,7 @@ void Screen::render() {
// En el path SDL3GPU, los píxeles se suben directamente desde la Surface.
// En el path SDL_Renderer, primero copiamos la surface a la SDL_Texture.
if (!(Options::video.shaders && shader_backend_ && shader_backend_->isHardwareAccelerated())) {
if (!(Options::video.postfx && shader_backend_ && shader_backend_->isHardwareAccelerated())) {
surfaceToTexture();
}
@@ -209,17 +209,26 @@ void Screen::renderNotifications() const {
}
}
// Cambia el estado de los shaders
void Screen::toggleShaders() {
Options::video.shaders = !Options::video.shaders;
if (!Options::video.shaders && shader_backend_) {
// Al desactivar shaders, limpiar el backend para liberar el swapchain de GPU
// Cambia el estado del PostFX
void Screen::togglePostFX() {
Options::video.postfx = !Options::video.postfx;
if (!Options::video.postfx && shader_backend_) {
// Al desactivar PostFX, limpiar el backend para liberar el swapchain de GPU
shader_backend_->cleanup();
} else {
initShaders();
}
}
// Recarga el shader del preset actual sin toggle
void Screen::reloadPostFX() {
if (Options::video.postfx) {
vertex_shader_source_.clear();
fragment_shader_source_.clear();
initShaders();
}
}
// Actualiza la lógica de la clase (versión nueva con delta_time para escenas migradas)
void Screen::update(float delta_time) {
fps_.calculate(SDL_GetTicks());
@@ -319,7 +328,7 @@ void Screen::surfaceToTexture() {
void Screen::textureToRenderer() {
SDL_Texture* texture_to_render = Options::video.border.enabled ? border_texture_ : game_texture_;
if (Options::video.shaders && shader_backend_ && shader_backend_->isHardwareAccelerated()) {
if (Options::video.postfx && shader_backend_ && shader_backend_->isHardwareAccelerated()) {
// ---- SDL3 GPU path: convertir Surface → ARGB → upload → PostFX → present ----
if (Options::video.border.enabled) {
// El border_surface_ solo tiene el color de borde; hay que componer encima el game_surface_
@@ -439,16 +448,32 @@ auto loadData(const std::string& filepath) -> std::vector<uint8_t> {
// Carga el contenido de los archivos GLSL
void Screen::loadShaders() {
// Obtener nombres de fichero desde el preset actual (o usar fallback)
std::string preset_vertex = "crtpi_vertex.glsl";
std::string preset_fragment = "crtpi_fragment.glsl";
if (!Options::postfx_presets.empty()) {
const auto& preset = Options::postfx_presets[static_cast<size_t>(Options::current_postfx_preset)];
if (!preset.vertex.empty()) {
preset_vertex = preset.vertex;
}
if (!preset.fragment.empty()) {
preset_fragment = preset.fragment;
}
}
if (vertex_shader_source_.empty()) {
// Detectar si necesitamos OpenGL ES (Raspberry Pi)
// Intentar cargar versión ES primero si existe
std::string vertex_file = "crtpi_vertex_es.glsl";
auto data = loadData(Resource::List::get()->get(vertex_file));
// Intentar cargar versión ES primero si existe (reemplaza .glsl por _es.glsl)
std::string vertex_es = preset_vertex;
auto pos = vertex_es.rfind(".glsl");
if (pos != std::string::npos) {
vertex_es.insert(pos, "_es");
}
auto data = loadData(Resource::List::get()->get(vertex_es));
if (data.empty()) {
// Si no existe versión ES, usar versión Desktop
vertex_file = "crtpi_vertex.glsl";
data = loadData(Resource::List::get()->get(vertex_file));
data = loadData(Resource::List::get()->get(preset_vertex));
std::cout << "Usando shaders OpenGL Desktop 3.3\n";
} else {
std::cout << "Usando shaders OpenGL ES 3.0 (Raspberry Pi)\n";
@@ -460,13 +485,16 @@ void Screen::loadShaders() {
}
if (fragment_shader_source_.empty()) {
// Intentar cargar versión ES primero si existe
std::string fragment_file = "crtpi_fragment_es.glsl";
auto data = loadData(Resource::List::get()->get(fragment_file));
std::string fragment_es = preset_fragment;
auto pos = fragment_es.rfind(".glsl");
if (pos != std::string::npos) {
fragment_es.insert(pos, "_es");
}
auto data = loadData(Resource::List::get()->get(fragment_es));
if (data.empty()) {
// Si no existe versión ES, usar versión Desktop
fragment_file = "crtpi_fragment.glsl";
data = loadData(Resource::List::get()->get(fragment_file));
data = loadData(Resource::List::get()->get(preset_fragment));
}
if (!data.empty()) {
@@ -477,7 +505,7 @@ void Screen::loadShaders() {
// Inicializa los shaders
void Screen::initShaders() {
if (!Options::video.shaders) {
if (!Options::video.postfx) {
return;
}
@@ -619,8 +647,8 @@ auto Screen::initSDLVideo() -> bool {
return false;
}
// Sin OpenGL garantizado, deshabilitar shaders
Options::video.shaders = false;
std::cout << "WARNING: Shaders disabled (OpenGL not available)\n";
Options::video.postfx = false;
std::cout << "WARNING: PostFX disabled (OpenGL not available)\n";
}
// Configurar renderer

5
source/core/rendering/screen.hpp
View File

@@ -53,11 +53,12 @@ class Screen {
static void setBorderEnabled(bool value); // Establece si se ha de ver el borde
void toggleBorder(); // Cambia entre borde visible y no visible
// Paletas y shaders
// Paletas y PostFX
void nextPalette(); // Cambia a la siguiente paleta
void previousPalette(); // Cambia a la paleta anterior
void setPalete(); // Establece la paleta actual
void toggleShaders(); // Cambia el estado de los shaders
void togglePostFX(); // Cambia el estado del PostFX
void reloadPostFX(); // Recarga el shader del preset actual sin toggle
// Surfaces y notificaciones
void setRendererSurface(const std::shared_ptr<Surface>& surface = nullptr); // Establece el renderizador para las surfaces

4
source/core/system/director.cpp
View File

@@ -122,6 +122,10 @@ Director::Director(std::vector<std::string> const& args) {
Options::setConfigFile(Resource::List::get()->get("config.yaml"));
Options::loadFromFile();
// Configura la ruta y carga los presets de PostFX
Options::setPostFXFile(Resource::List::get()->get("postfx.yaml"));
Options::loadPostFXFromFile();
// En mode quiosc, forçar pantalla completa independentment de la configuració
if (Options::kiosk.enabled) {
Options::video.fullscreen = true;