From 32545a4b9aa6d942fdcda439bf64ef202ae7f849 Mon Sep 17 00:00:00 2001 From: Yan Pujante Date: Mon, 12 Feb 2024 06:18:53 -0800 Subject: [PATCH] fixed contrast not being saved issue --- CMakeLists.txt | 2 +- README.md | 4 ++++ external/btzy/nativefiledialog-extended/CMakeLists.txt | 2 +- src/cpp/re/edit/Graphics.cpp | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae954fc..5b48d47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24) set(re-edit_VERSION_MAJOR 1) set(re-edit_VERSION_MINOR 6) -set(re-edit_VERSION_PATCH 2) +set(re-edit_VERSION_PATCH 3) set(re-edit_VERSION "${re-edit_VERSION_MAJOR}.${re-edit_VERSION_MINOR}.${re-edit_VERSION_PATCH}") execute_process(COMMAND git describe --long --dirty --abbrev=10 --tags diff --git a/README.md b/README.md index 593373f..d54b04f 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,10 @@ pongasoft produces a variety of high quality and free/open source software. If y Release Notes ------------- +* #### 1.6.3 - 2024/02/12 + +- Fixed issue with contrast not being saved + * #### 1.6.2 - 2023/08/28 - Added "Commit All Effects", at the widget level as well as at the global level, to be able to remove all `re_edit_*` entries from `device_2D.lua` once the effects are applied (permanent/no more undo) diff --git a/external/btzy/nativefiledialog-extended/CMakeLists.txt b/external/btzy/nativefiledialog-extended/CMakeLists.txt index 21ed6f5..b10860c 100644 --- a/external/btzy/nativefiledialog-extended/CMakeLists.txt +++ b/external/btzy/nativefiledialog-extended/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.24) project(nativefiledialog-extended VERSION 1.0.0) set(nfd_ROOT_PROJECT OFF) diff --git a/src/cpp/re/edit/Graphics.cpp b/src/cpp/re/edit/Graphics.cpp index 6625dad..094e9b7 100644 --- a/src/cpp/re/edit/Graphics.cpp +++ b/src/cpp/re/edit/Graphics.cpp @@ -64,12 +64,13 @@ std::string graphics_device2D_path(Texture const *iTexture, texture::FX const &i stl::roundToInt(iEffects.fSizeOverride->y)) : ""; - path = re::mock::fmt::printf(R"(path = "%s"%s, re_edit_path = "%s"%s%s%s%s%s)", + path = re::mock::fmt::printf(R"(path = "%s"%s, re_edit_path = "%s"%s%s%s%s%s%s)", iTexture->computeKey(iEffects), iTexture->numFrames() > 1 ? re::mock::fmt::printf(", frames = %d", iTexture->numFrames()) : "", iTexture->key(), iEffects.hasTint() ? re::mock::fmt::printf(", re_edit_tint = { %d, %d, %d }", tint.fRed, tint.fGreen, tint.fBlue) : "", iEffects.hasBrightness() ? re::mock::fmt::printf(", re_edit_brightness = %d", iEffects.fBrightness) : "", + iEffects.hasContrast() ? re::mock::fmt::printf(", re_edit_contrast = %d", iEffects.fContrast) : "", iEffects.isFlippedX() ? ", re_edit_flip_x = true" : "", iEffects.isFlippedY() ? ", re_edit_flip_y = true" : "", sizeOverride