From 370cc0e8d393ea4624fd251657493e7b2e4bca0a Mon Sep 17 00:00:00 2001 From: Lorenzooone Date: Mon, 1 Jun 2026 15:06:01 +0200 Subject: [PATCH] a --- CMakeLists.txt | 2 +- source/TextRectangle.cpp | 6 +++--- source/WindowScreen.cpp | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee0b330..35425a6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -543,7 +543,7 @@ else() set_source_files_properties(source/conversions.cpp PROPERTIES COMPILE_OPTIONS "$<$:-O3;-funroll-loops>") endif() -set(EXECUTABLE_SOURCE_FILES source/test.cpp source/utils.cpp source/audio_data.cpp source/audio.cpp source/frontend.cpp source/TextRectangle.cpp source/TextRectanglePool.cpp source/WindowScreen.cpp source/WindowScreen_Menu.cpp source/devicecapture.cpp source/conversions.cpp source/ExtraButtons.cpp source/Menus/ConnectionMenu.cpp source/Menus/OptionSelectionMenu.cpp source/Menus/MainMenu.cpp source/Menus/VideoMenu.cpp source/Menus/CropMenu.cpp source/Menus/PARMenu.cpp source/Menus/RotationMenu.cpp source/Menus/OffsetMenu.cpp source/Menus/AudioMenu.cpp source/Menus/BFIMenu.cpp source/Menus/RelativePositionMenu.cpp source/Menus/ResolutionMenu.cpp source/Menus/FileConfigMenu.cpp source/Menus/ExtraSettingsMenu.cpp source/Menus/StatusMenu.cpp source/Menus/LicenseMenu.cpp source/WindowCommands.cpp source/Menus/ShortcutMenu.cpp source/Menus/ActionSelectionMenu.cpp source/Menus/ScalingRatioMenu.cpp source/Menus/ISNitroMenu.cpp source/Menus/PartnerCTRMenu.cpp source/Menus/VideoEffectsMenu.cpp source/CaptureDataBuffers.cpp source/Menus/InputMenu.cpp source/Menus/AudioDeviceMenu.cpp source/Menus/SeparatorMenu.cpp source/Menus/ColorCorrectionMenu.cpp source/Menus/Main3DMenu.cpp source/Menus/SecondScreen3DRelativePositionMenu.cpp source/Menus/USBConflictResolutionMenu.cpp source/Menus/Optimize3DSMenu.cpp source/Menus/OptimizeSerialKeyAddMenu.cpp source/Menus/OptimizeOldFWConfigMenu.cpp source/libgpiod_compat.cpp ${TOOLS_DATA_DIR}/optimize_serial_key_add_table.cpp ${TOOLS_DATA_DIR}/optimize_serial_key_next_char_table.cpp ${TOOLS_DATA_DIR}/optimize_serial_key_prev_char_table.cpp ${TOOLS_DATA_DIR}/font_ttf.cpp ${TOOLS_DATA_DIR}/font_mono_ttf.cpp ${TOOLS_DATA_DIR}/shaders_list.cpp ${SOURCE_CPP_EXTRA_FILES}) +set(EXECUTABLE_SOURCE_FILES source/cc3dsfs.cpp source/utils.cpp source/audio_data.cpp source/audio.cpp source/frontend.cpp source/TextRectangle.cpp source/TextRectanglePool.cpp source/WindowScreen.cpp source/WindowScreen_Menu.cpp source/devicecapture.cpp source/conversions.cpp source/ExtraButtons.cpp source/Menus/ConnectionMenu.cpp source/Menus/OptionSelectionMenu.cpp source/Menus/MainMenu.cpp source/Menus/VideoMenu.cpp source/Menus/CropMenu.cpp source/Menus/PARMenu.cpp source/Menus/RotationMenu.cpp source/Menus/OffsetMenu.cpp source/Menus/AudioMenu.cpp source/Menus/BFIMenu.cpp source/Menus/RelativePositionMenu.cpp source/Menus/ResolutionMenu.cpp source/Menus/FileConfigMenu.cpp source/Menus/ExtraSettingsMenu.cpp source/Menus/StatusMenu.cpp source/Menus/LicenseMenu.cpp source/WindowCommands.cpp source/Menus/ShortcutMenu.cpp source/Menus/ActionSelectionMenu.cpp source/Menus/ScalingRatioMenu.cpp source/Menus/ISNitroMenu.cpp source/Menus/PartnerCTRMenu.cpp source/Menus/VideoEffectsMenu.cpp source/CaptureDataBuffers.cpp source/Menus/InputMenu.cpp source/Menus/AudioDeviceMenu.cpp source/Menus/SeparatorMenu.cpp source/Menus/ColorCorrectionMenu.cpp source/Menus/Main3DMenu.cpp source/Menus/SecondScreen3DRelativePositionMenu.cpp source/Menus/USBConflictResolutionMenu.cpp source/Menus/Optimize3DSMenu.cpp source/Menus/OptimizeSerialKeyAddMenu.cpp source/Menus/OptimizeOldFWConfigMenu.cpp source/libgpiod_compat.cpp ${TOOLS_DATA_DIR}/optimize_serial_key_add_table.cpp ${TOOLS_DATA_DIR}/optimize_serial_key_next_char_table.cpp ${TOOLS_DATA_DIR}/optimize_serial_key_prev_char_table.cpp ${TOOLS_DATA_DIR}/font_ttf.cpp ${TOOLS_DATA_DIR}/font_mono_ttf.cpp ${TOOLS_DATA_DIR}/shaders_list.cpp ${SOURCE_CPP_EXTRA_FILES}) if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") add_compile_flag("SFML_SYSTEM_ANDROID") diff --git a/source/TextRectangle.cpp b/source/TextRectangle.cpp index b5f5171..2284b28 100755 --- a/source/TextRectangle.cpp +++ b/source/TextRectangle.cpp @@ -434,19 +434,19 @@ void TextRectangle::updateText(int x_limit) { sf::Color color_text = sf::Color(255, 255, 255, 255); switch(this->loaded_data.kind) { case TEXT_KIND_NORMAL: - this->curr_color = sf::Color(40, 40, 80, 255); + this->curr_color = sf::Color(40, 40, 80, 192); break; case TEXT_KIND_SELECTED: this->curr_color = sf::Color(90, 150, 210, 192); break; case TEXT_KIND_SUCCESS: - this->curr_color = sf::Color(0, 255, 0, 255); + this->curr_color = sf::Color(90, 210, 90, 192); break; case TEXT_KIND_WARNING: this->curr_color = sf::Color(200, 200, 90, 192); break; case TEXT_KIND_ERROR: - this->curr_color = sf::Color(255, 0, 0, 255); + this->curr_color = sf::Color(210, 90, 90, 192); break; case TEXT_KIND_OPAQUE_ERROR: this->curr_color = sf::Color(160, 60, 60, 192); diff --git a/source/WindowScreen.cpp b/source/WindowScreen.cpp index 85d6a2a..3e01bdb 100755 --- a/source/WindowScreen.cpp +++ b/source/WindowScreen.cpp @@ -84,7 +84,7 @@ WindowScreen::WindowScreen(ScreenType stype, CaptureStatus* capture_status, Disp full_width = bottom_width; full_height = bottom_height; } - this->shared_texture_available = this->full_in_tex.resize({(unsigned int)full_width, (unsigned int)full_height}); + this->shared_texture_available = false; //this->full_in_tex.resize({(unsigned int)full_width, (unsigned int)full_height}); if(this->shared_texture_available) { this->m_in_rect_top.setTexture(&this->full_in_tex); this->m_in_rect_top_right.setTexture(&this->full_in_tex); @@ -366,7 +366,7 @@ void WindowScreen::draw(double frame_time, VideoOutputData* out_buf, InputVideoD FPSArrayInsertElement(&this->draw_fps, diff.count()); this->last_draw_time = curr_time; printf("OUT: %f\n", diff.count()); - print_time_since_start_draw("TOTAL DRAW TIME"); + print_time_since_start_draw("DISPLAY TIME"); } else this->was_last_frame_null = true; @@ -376,6 +376,7 @@ void WindowScreen::print_time_since_start_draw(std::string text) { auto curr_time = std::chrono::high_resolution_clock::now(); std::chrono::duration diff = curr_time - this->start_draw_time; printf("%s: %f\n", text.c_str(), diff.count()); + this->start_draw_time = curr_time; } void WindowScreen::update_connection() {