-
-
Notifications
You must be signed in to change notification settings - Fork 3
Permalink
Choose a base ref
{{ refName }}
default
Choose a head ref
{{ refName }}
default
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
base repository: Sebanisu/Field-Map-Editor
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.1056
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: Sebanisu/Field-Map-Editor
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.1129
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
- 1 commit
- 53 files changed
- 1 contributor
Commits on Jun 5, 2025
-
Configure output paths need to diffs (#144)
* add ctre to conan. * read ffnx config. test regex for custom path parse. * add keys * add refresh for the test window for when path changes. * Update custom_paths_window.hpp I wasn't resetting changed back to false so the imgui item wouldn't draw. I decided to move changed override to the back as well so the input would always draw. * make the creator of field the primary owner * added alittle list of paths in the field. * progress on field file window and custom paths windows * update formatting add table. * saving settings improve ui. * add pupu_id fix order of begin and end child * Update custom_paths_window.hpp add tooltip messages. * prep for using conan for imgui-sfml newer version of imgui forced to docking so i can include imgui-sfml but imgui-sfml isn't correctly handling a macro. still need to use old method till this is fixed. * add selected path * root_path_types * root_path_types * root_path_types * disable some items. So instead of making it a like locked in value we'd have another item we choose and picks one of those items. * re order some things add new drop downs. we want to be able to pick which root directory we want to use. * imgui-sfml: Remove bad define conan-io/conan-center-index#26891 This pull request seems to have fixed the issue I was having. * add selections to batch move variables to selections. * safe_copy_string not sure if i'm setting the selections strings twice or not. heh. * Update batch.cpp I think it is already saving selections. * wip preview the input path examples. * add comments and doxygen * filters now has a bool * add comments doxygen and filters bool * FilterSettings starter_field deleting unneeded read from config because filter can read from config already. * removed unneeded functions * Update gui.cpp combined functions added comments and updated saving config for some things. * to_input_type to_output_type * FilterSettings and toggle save/load config * switch to singletons. log when saving * wip on batch rework * format fme::color * spdlog filter messages * add spdlog messages fix bg color mim draw * save_background_color IsItemDeactivatedAfterEdit is used to avoid over saving with the color picker could be used in more places. but now i gotta save manually after changing the color * default values for patterns * moved defaults to the header file for ffnx * save path when browsed. * add comments doxygen * fix wrapped text so it uses as_const. I guess it doesn't like getting non const temporary references. even though it's just making a string and going poof anyway. * wip fix up batch * get map path when saving using new method * moved replace_tags into key_value_data * use new code for loading map too. * move key_value_data to own files * remove key_value_data from this file * add key_value_data to cmakelists.txt * hide append_file_structure enable start button so you can click it. replace_tags wip * update saving for manual * handle saving by passing in the arguments needed. * add explore button for input too pass in selected path to deswizzle and upscale instead of a complete path and we'll use our new tools to complete the path on the other end. * restructure the load texture function alittle bit * allow taking in things that aren't paths transform to path. * map_sprite have access to selections. * max count * Update batch.cpp CollapsingHeader static examples rename varibles add tooltips to explore buttons. format_imgui_wrapped_text remove selections from function calls * Update gui.cpp remove selections from function calls * Update key_value_data.hpp add pupu_id remove string_view * Update key_value_data.cpp add pupu_id remove string_view static_replace_tag keys::selected_path * move tooltip into header and make it a template. * Update map_sprite.cpp remove selections from function comment out assert as it doesn't work anymore * Update map_sprite.hpp remove selections from function * tweaks to gui loop I wanted to send stop to m_batch though might not be needed. As some loops might still be inprogress when stopping. * attempt to fix events on startup m_window.setActive(true); i think will help with events not working on startup. comment out scrolling code. It really isn't used anymore might remove. It's from before we had a sepperate draw window. * remove scrolling * Update CMakeLists.txt * bug upstream had to fix in fork * white space changes formatting * made progress on loading upscales with new kvd class * concat function to wrap inserts * Update upscales.hpp instead of generating a std::vector of paths or merging the various arrays we'll just perform the operation on each array one at a time till we get a match. * Update upscales.hpp remove comments add new paths function * move patterns to selections * add functions to update and save array to configuration * load more config from toml assert * put a map to update each item. * add configkey to the fme namespace and add all case * PatternSelector update_configuration_key * key_to_string and other stuff * Update Selections.cpp * fix copy paste error sand sort code * more settings moved to selections * trying to fix the upscale paths parcing for when you manually add paths. * fix so if you add upscale/swizzle paths it'll work as expected remove menuitem_locate_custom_upscale add menuitem_load_swizzle_textures2 add tooltips fix so if you add paths it'll work as expected * removed open_viii::LangT coo from function call * deswizzle paths to match upscale paths. * wip on deswizzle menu * tweak sorting function * loading from deswizzle paths works. this is using the upscale pattern * added functions to see if loading textures was possible. though now we need to add ui that checks it. * comment out the batch pattern in this test. I was thinking oh we're testing a path by doing this. * tweaking the has path functions. * this seems to work * I don't trust MakeAvailable * Update conanfile.py * GenericComboClassWithFilterAndFixedToggles This was set up to disable options that won't work. We pass in a vector of bool and if it's false we disable that option. But we don't remove it from the list as it might work for another field. * add the enabled toggles to main menu. also fix being able to set both upscale and deswizzle together. * more tweaks to the menu * add_delete_button find_replacement_path_value handle_path_deletion * move code from selections.hpp to cpp * key_to_string consteval * do some optimization * timed load configuration * Update conanfile.py set the cmake version to 3.31.6 and I added my program's name to the conanfile.py also set the generator for cmake for windows since visual studio was defaulting to Ninja and vscode was not I couldn't get anything to work when using Ninja. I donno why. So now it's set to visual studio 17 2022 for windows. * I am trying to catch errors. * Update .gitignore ignore my backup of bin. * Update CMakeLists.txt enable profile * use cmake to get imgui-sfml I don't know why i can not make conan use the version of imgui i want to. * these shouldn't be in the repo * wip on the vectors of patterns. * Update custom_paths_window.cpp fill out the rest of the update calls * switch to pointer. * I just needed to remember to save the string to selections * add current_pattern_index will be used to index into the arrays. * get_current_string_value_from_index * wip add buttons vector_or_string get_current_string_vector_mutable * Update custom_paths_window.cpp editing the vectors works pretty good now. * Update custom_paths_window.cpp disabled tables when nothing is editable. * tweaks to custom_paths_window * add more defaults * wip add map selections * wip adding map * add map strings * fix output path not storing because of the textbox the path string is stored in two places. one gets saved to config the other is not. maybe i should only have the array but just move it into the selections. * wip on map picker * Update gui.cpp this code seems to be called in another place so i was calling it twice. * Update map_sprite.cpp * Update RangeConsumer.hpp * Update gui.cpp correctly displaying the various map paths because were including the upscale and deswizzle paths in searches. * new functions to copy the map from ff8 back onto the maphistory new functions to copy the map from ff8 back onto the maphistory * first_to_working_and_original basically restore the .map when you uncheck the map which can be undone in the history * Update map_sprite.cpp There if the map filter is enabled when the map_sprite is loaded then it's load the file. * Update upscales.cpp clean up the path checking by using status. * okay probably need this if we update the fields. * Update gui.cpp * Update gui.cpp * Update gui.cpp * Update generic_combo.hpp add explorer button and tooltip * Update gui.cpp formatted * generic_combo_settings * wip map paths * wip on menu for maps * wip menu paths * wip on map menu * on change of map in menu load the map. * Update gui.cpp * Update safedir.hpp use filesystem status * generate_(de)swizzle_map_paths with paths * wip on map from filebrowser * sort_and_remove_duplicates * tweaks to sort_and_remove_duplicates * fix batch to use operator= * formatting * update sorting also I wip on loading map directories from the main menu. * added path overload * wip on directory browser * lambda to simplify the 4 branches of this switch case * we add the paths to map search for ease of use. * fix delete me I was setting delete me to -1 so i fixed it. add explore button * Update gui.cpp add explore button * fix div by 0 * Update batch.cpp use the new functions to get .map file * Update gui.cpp disable filters if you manually load a map file. * batch_flatten_type and batch_compact_type were not loading and saving correctly. removed load_configuration function. * maps won't have some fields so i removed from example * load map logged so we know it worked. * map order 2 was broken * okay we can output swizzle as one image.
Configuration menu - View commit details
-
Copy full SHA for 25d6e23 - Browse repository at this point
Copy the full SHA 25d6e23View commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 1.0.1056...1.0.1129