Update codebase with changes for Zelda 64: Recompiled 1.2

include/banjo_render.h

@@ -14,6 +14,8 @@ namespace RT64 {
 
 namespace banjo {
     namespace renderer {
+        inline const std::string special_option_texture_pack_enabled = "_recomp_texture_pack_enabled";
+
         class RT64Context final : public ultramodern::renderer::RendererContext {
         public:
             ~RT64Context() override;
@@ -30,9 +32,12 @@ namespace banjo {
             uint32_t get_display_framerate() const override;
             float get_resolution_scale() const override;
 
-        protected:
+        private:
             std::unique_ptr<RT64::Application> app;
-            std::unordered_set<std::filesystem::path> enabled_texture_packs;
+            std::unordered_set<std::string> enabled_texture_packs;
+            std::unordered_set<std::string> secondary_disabled_texture_packs;
+
+            void check_texture_pack_actions();
         };
 
         std::unique_ptr<ultramodern::renderer::RendererContext> create_render_context(uint8_t *rdram, ultramodern::renderer::WindowHandle window_handle, bool developer_mode);
@@ -41,8 +46,15 @@ namespace banjo {
         bool RT64SamplePositionsSupported();
         bool RT64HighPrecisionFBEnabled();
 
-        void enable_texture_pack(const recomp::mods::ModHandle& mod);
+        void trigger_texture_pack_update();
+        void enable_texture_pack(const recomp::mods::ModContext& context, const recomp::mods::ModHandle& mod);
         void disable_texture_pack(const recomp::mods::ModHandle& mod);
+        void secondary_enable_texture_pack(const std::string& mod_id);
+        void secondary_disable_texture_pack(const std::string& mod_id);
+
+        // Texture pack enable option. Must be an enum with two options.
+        // The first option is treated as disabled and the second option is treated as enabled.
+        bool is_texture_pack_enable_config_option(const recomp::mods::ConfigOption& option, bool show_errors);
     }
 }
 

include/banjo_support.h

@@ -0,0 +1,26 @@
+#ifndef __BANJO_SUPPORT_H__
+#define __BANJO_SUPPORT_H__
+
+#include <functional>
+#include <filesystem>
+#include <vector>
+#include <optional>
+#include <list>
+
+namespace banjo {
+    std::filesystem::path get_program_path();
+    std::filesystem::path get_asset_path(const char* asset);
+    void open_file_dialog(std::function<void(bool success, const std::filesystem::path& path)> callback);
+    void open_file_dialog_multiple(std::function<void(bool success, const std::list<std::filesystem::path>& paths)> callback);
+    void show_error_message_box(const char *title, const char *message);
+
+// Apple specific methods that usually require Objective-C. Implemented in support_apple.mm.
+#ifdef __APPLE__
+    void dispatch_on_ui_thread(std::function<void()> func);
+    std::optional<std::filesystem::path> get_application_support_directory();
+    std::filesystem::path get_bundle_resource_directory();
+    std::filesystem::path get_bundle_directory();
+#endif
+}
+
+#endif

include/overloaded.h

@@ -0,0 +1,10 @@
+#ifndef __OVERLOADED_H__
+#define __OVERLOADED_H__
+
+// Helper for std::visit
+template<class... Ts>
+struct overloaded : Ts... { using Ts::operator()...; };
+template<class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
+
+#endif

include/recomp_data.h

@@ -1,9 +1,11 @@
 #ifndef __RECOMP_DATA_H__
 #define __RECOMP_DATA_H__
 
-namespace recomp {
+namespace recomputil {
     void init_extended_actor_data();
     void reset_actor_data();
+
+    void register_data_api_exports();
 }
 
 #endif

include/recomp_ui.h

@@ -4,6 +4,7 @@
 #include <memory>
 #include <string>
 #include <string_view>
+#include <list>
 
 // TODO move this file into src/ui
 
@@ -29,7 +30,7 @@ namespace recompui {
     class MenuController {
     public:
         virtual ~MenuController() {}
-        virtual Rml::ElementDocument* load_document(Rml::Context* context) = 0;
+        virtual void load_document() = 0;
         virtual void register_events(UiEventListenerInstancer& listener) = 0;
         virtual void make_bindings(Rml::Context* context) = 0;
     };
@@ -49,13 +50,14 @@ namespace recompui {
     void hide_context(ContextId context);
     void hide_all_contexts();
     bool is_context_shown(ContextId context);
-    bool is_context_taking_input();
+    bool is_context_capturing_input();
+    bool is_context_capturing_mouse();
     bool is_any_context_shown();
+    ContextId try_close_current_context();
 
     ContextId get_launcher_context_id();
     ContextId get_config_context_id();
     ContextId get_config_sub_menu_context_id();
-    ContextId get_close_prompt_context_id();
 
     enum class ConfigTab {
         General,
@@ -67,6 +69,11 @@ namespace recompui {
     };
 
     void set_config_tab(ConfigTab tab);
+    int config_tab_to_index(ConfigTab tab);
+    Rml::ElementTabSet* get_config_tabset();
+    Rml::Element* get_mod_tab();
+    void set_config_tabset_mod_nav();
+    void focus_mod_configure_button();
 
     enum class ButtonVariant {
         Primary,
@@ -78,19 +85,37 @@ namespace recompui {
         NumVariants,
     };
 
-    void open_prompt(
-        const std::string& headerText,
-        const std::string& contentText,
-        const std::string& confirmLabelText,
-        const std::string& cancelLabelText,
-        std::function<void()> confirmCb,
-        std::function<void()> cancelCb,
-        ButtonVariant _confirmVariant = ButtonVariant::Success,
-        ButtonVariant _cancelVariant = ButtonVariant::Error,
-        bool _focusOnCancel = true,
-        const std::string& _returnElementId = ""
+    void init_styling(const std::filesystem::path& rcss_file);
+    void init_prompt_context();
+    void open_choice_prompt(
+        const std::string& header_text,
+        const std::string& content_text,
+        const std::string& confirm_label_text,
+        const std::string& cancel_label_text,
+        std::function<void()> confirm_action,
+        std::function<void()> cancel_action,
+        ButtonVariant confirm_variant = ButtonVariant::Success,
+        ButtonVariant cancel_variant = ButtonVariant::Error,
+        bool focus_on_cancel = true,
+        const std::string& return_element_id = ""
     );
+    void open_info_prompt(
+        const std::string& header_text,
+        const std::string& content_text,
+        const std::string& okay_label_text,
+        std::function<void()> okay_action,
+        ButtonVariant okay_variant = ButtonVariant::Error,
+        const std::string& return_element_id = ""
+    );
+    void open_notification(
+        const std::string& header_text,
+        const std::string& content_text,
+        const std::string& return_element_id = ""
+    );
+    void close_prompt();
     bool is_prompt_open();
+    void update_mod_list(bool scan_mods = true);
+    void process_game_started();
 
     void apply_color_hack();
     void get_window_size(int& width, int& height);
@@ -109,8 +134,13 @@ namespace recompui {
     Rml::ElementPtr create_custom_element(Rml::Element* parent, std::string tag);
     Rml::ElementDocument* load_document(const std::filesystem::path& path);
     Rml::ElementDocument* create_empty_document();
-    void queue_image_from_bytes(const std::string &src, const std::vector<char> &bytes);
+    Rml::Element* get_child_by_tag(Rml::Element* parent, const std::string& tag);
+
+    void queue_image_from_bytes_rgba32(const std::string &src, const std::vector<char> &bytes, uint32_t width, uint32_t height);
+    void queue_image_from_bytes_file(const std::string &src, const std::vector<char> &bytes);
     void release_image(const std::string &src);
+
+    void drop_files(const std::list<std::filesystem::path> &file_list);
 }
 
 #endif