mirror of
https://github.com/scp-fs2open/fs2open.github.com.git
synced 2026-11-07 18:31:26 -10:00
* Updates the AxisInverted hooks to use the new CC_bind. Currently assumes only Joy0, so this may need further tweaking or replacement * * Add ability to claim up to 4 joysticks for player use, using the launcher (via registry or fs2_open.ini) or the new menu system * Hack into existing control polling system to get the new primary/secondary binding schema to work. This should be reworked into a reverse-lookup system. * Finally break the mouse loose from overlapping with Joystick binidngs * Fix bug where joy button wouldn't register on search function * Fix bug with mousewheel not always decaying as it should. * Fix rebase conflict with selecting item during search mode * Fix bug where mouse buttons were incorrectly labeled. * Move some enums around * Fix bug with joy axis labels being displayed as buttons. * Fix possible bug where Other conflict axis wouldn't clear * Updated default joystick axis text. A new strings.tbl will need to be supplied for localization support * Deprecate nAxisInverted ADE functions and replace with AxisInverted(int, int, bool) * Merge Axis mappings into Control_config * More utility functions for CC_bind and CCB * Adds another ADE function for inverting the axis action, instead of individual bindings * Hacks to get plr file to compile. Currently slices out many of the new features like secondary axis and the mouse axis, and the additional joystick bindings (joy1, joy2, joy3) * Fix bug with uncontrollable spin (slopily) * Fix some warnings * Add flags for Hats and Balls for future implementation * Fix bug where inverting an axis would trigger an assert * Fix bug where joy wasn't detected as present * Most axis actions should be relative, instead of absolute * Hopefully optimize joy_get_unscaled_reading * Properly break out of double-for search function for search and bind modes in config menu * Refactor control_get_axes_readings to provide more consistent behavior * Use JOY_REL_THROTTLE instead of Action::REL_THROTTLE when indexing into Control_config * Bank axis has a default binding, Throttle does not. * Fix bug where conflicts weren't being detected. Fix bug where default presets weren't being detectd * Elegantly break out of double fors with goto. Fix bug with bind mode not detecting axis * Save new binding scheme to playerfile * Add cid_assign() to standardize cid assignment with shorts * Add write and read handlers for int8_t * Remove saving controls to csg. This will be replaced by presets. * Fix bug with reading pilotfile * Use "Joy-n" instead of "joystick n" to match default identifiers in config menu * Fix bug with CC_TYPE_TRIGGER controls always marked as used, if not bound with a key. Fix bug with Joy-0 btn 1 triggering multiple controls that are not bound to it. * Improve readibility of the joy info output to log * Message when a joystick connects and using legacy system. * Fix bug where system joystick 0 was mapped in pJoystick that should've been nullptr * Fix bug where *not* having a joystick will cause bind mode in the config menu to immediately cancel. * Add reverse lookup functions for actions. mActionToVal[] does string -> int, mValToAction() does int -> string * Add the foundation for writing the presets files. * Adds a bunch of reverse lookup functions to get the stringified version of various enums, etc. * presets.h and presets.cpp are in something of a barebones at this point * Add new subdir for preset files 'player/presets' * add utility for finding the distance of a bitfield/bitmask. Used to translate mouse button masks into mouse button id's * Write PresetFileHandler as standalone, instead of a subclass. Still mostly a copy of JSONFileHandler * Make functions to map and reverse-map the bindings for use with the preset files and ultimately the ControlConfigDefaults.tbl as well * Check presets from file to see if they are duplicate with an existing preset. * Check for uniqueness of presets fron controlconfigdefaults.tbl before adding them, and warn the user if there are duplicates. * Rename the test functions into proper load/save. * save function has some standard checks * load function is called on init * make finding duplicates its own function outside of the preset label rendering function * Initial draft of saving presets in-game * Fix bug where all loaded presets were thought to be duplicate of defaults. * Fix bug where preset cycling would get stuck on the first preset other than default * Fix bug where saving a mouse button saves the wrong textified string. * Prevent preset names from being too long. * Crash still occurs if the name is too long, as if set outside of FSO * Workaround text running off the popups in 640x480. Doesn't look as nice, sadly * CSG's now track preset names instead of containing bindings * remake control_config_reset_defaults() into control_config_use_preset() * provide a function to get the currently selected preset. * Do PLR backward compatibility, hopefully. * PLR now tracks presets instead of saving the bindings. * On Loading pre PLR3 or CSG6 data, create a new preset. * Strip off file extension before saving preset files. Jason.json.json just looks dumb * Add "-joy_info" commandline option. Will output SDL joystick info of all detected joysticks to stdout * Fix non-standard behavior with registry_read_string(). * Returning NULL instead of the default value, or an empty string, will trigger an access violation with SCP_string and other string copy functions. * Modify io::joystick::init() to take an optional param, no_register, to use with -joy_info * Address CI complaints * Address CI issues 2. * Supress preset duplicate warning if in unit tests. * Address scripting unittest failure due to incorrect argument type. (Ints don't technically exist in LUA) * Use Mouse enums instead of Joy enums or magic numbers * More signed/unsigned madness * Address CI issues 3 * Address gcc-5 issues. (No auto in lambdas) * Fix bug with bit_distance() * Address gcc-5 issues 2 * Address clang issues * Address clang-tidy issues * Address clang-tidy issues in undosys. May need to be cherry picked to Controls2. * Address clang-tidy issues * Improve logic of preset name prompt. * Fix bug with selected presets not being saved * No, a cstr is not a std::string. * Can't use i there because its already defined. * Fix bug where CSG's wouldn't save selected preset * Fix bug where presets wouldn't be loaded correctly from player files * Fix bug where loaded preset files would not update the preset cycle position correctly * Some QoL changes for the preset name prompt * Address Appveyor issues. * Add forward compatibility for player file. This is required because currently any "missing" data in the pilotfile will trigger an Error, and crash FSO. * Fix bug where mouse X axis was unusable. Apparently stating that MOUSE_Z_AXIS IS MOUSE_Z_AXIS doesn't get the point across. * Address CI issues. * Address CI issues. * sel default assigned to -1 * static_cast enum to an int * Assimilate -joy_info int -get_flags, replacing the existing method that launchers use to get joystick information. * Add '\n' to PST log messages. * Change logic of checking joystick .ini keys: Should the multi-joy key not be found, try legacy joy key. * Add some more missing '\n' to mprintf messages. * Notify the player when converting to the new multi-joy system. (Using ReleaseWarning for now...) * Warn the player if a preset defined in their .PLR could not be found. * Actually disable control items without a valid tab, instead of relying on the fact that they're disabled by default. * Add CC_preset::is_duplicate_of() method to make checking for preset uniqueness less of a brain teaser. * Doxy the first_override param of control_config_common_read_section * Adds the os::dialogs::Information() method, which displays an information-only dialog in similar format to Warning and Error dialogs. Does not throw Warning nor Error exceptions * load_player now uses os::dialogs::Information() instead of ::ReleaseWarning, thus not halting unit tests. * Breaks retail localization support for Joystick and Mice labels - This is because the new multi-joy axis end up very confusing "Joy-0 Joystick/Mouse X Axis" * Renames Joy_axis_text to Axis_text, intended to be used both by joysticks and the mouse. * Moves mouse axis and button labels into an array to ease future XSTR support * Adds asserts to ensure indices are within the array sizes of label arrays * Adds XSTR indices for Axis labels, mouse buttons, and mouse wheels. * Seperates conflict check comparisons from equality comparisons. * Conflict checks can ignore certain combinations of CC_bind::flag's; i.e. an Axis bound to a different control but is inverted or relative will still cause a conflict with another control that has the same axis * Equality comparisons is exact equality, allowing presets to check if binds have the same binding and flag configurations. * More UI string changes and localization * Tweaks positioning of top button labels in CC menu * Adds the following XSTR's: 1659 "Preset: %s" 1660 "Preset: custom" 1661 "Next Preset" * Fix bug where mouse axis turned into mouse button when inverting control by its control name. * Fix bug with the new conflict checking subroutine not working with non-axis controls * Address CI issues. * Don't trigger modal popups while in unit tests. * Address clang tidy issues * use nullptr * be consistent with conditional style * use booleans to stuff debug states, methods with just Assertions in it will trigger a false positive on clang tidy * use string::empty() instead of checking for "". * Remove dead code of -joy_info. Functionality has been merged with -get_flags * Address clang-tidy [readability-simplify-boolean-expr] --z64 says "I don't like it!" * fix axis check * Implement revised axis action virtvars for scripting. Also protect against a control mismatch in the CSG file due to a script-inverted control * Encapsulate CC_bind properly * Add mouse and joystick cid's to AxisInverted description * Update translate_key() and its user to correctly translate multijoy bindings for training messages. * Prompt user trying to escape from config menu when they have changes. * Remove dead function. * Fix crash during training missions due to key translation that would overflow internal buffer. * Went back with cstring as return value instead of SCP string, because caller would need a significant refactor * Update doxy of the textify functions * Unify textify_scancode() and textify_scancode_universal() to ensure common code path. * Add "Multijoy" entry to json caps. (For Knossos) * Make CI happy. * Remove unused lambda captures. * Instead of overwrite during plr2 => plr3 conversion, try to use the existing preset file. * Fix conditional for checking if file exists within presets::save_preset_file() * Revert Majority of PR#3739 * PLR and CSG versions are incremented past versions set by 3739 * Forward compatibility feature of #3739 (Only save sexp containers into the CSG if they are used) is removed * Remove forward compatibilty of PLR file when going in between pre- and post-Controls5 FSO versions * Add missing startSection() and endSection() for csg_write_controls() * Fix clang-tidy error #1 * Fix clang-tidy error #2 * fix clandy tidy error #1 part 2/2 * Fix clang tidy error 3 Co-authored-by: Goober5000 <[email protected]> Co-authored-by: Tyler Blount <[email protected]> Co-authored-by: wookieejedi <[email protected]> Co-authored-by: BMagnu <[email protected]>
378 lines
12 KiB
C++
378 lines
12 KiB
C++
|
|
#include <jansson.h>
|
|
#include "pilotfile/JSONFileHandler.h"
|
|
#include "libs/jansson.h"
|
|
#include "parse/parselo.h"
|
|
|
|
namespace {
|
|
const SCP_vector<std::pair<Section, const char*>> SectionMapping {
|
|
std::pair<Section, const char*>(Section::Unnamed, nullptr),
|
|
std::pair<Section, const char*>(Section::Flags, "flags"),
|
|
std::pair<Section, const char*>(Section::Info, "info"),
|
|
std::pair<Section, const char*>(Section::Loadout, "loadout"),
|
|
std::pair<Section, const char*>(Section::Controls, "controls"),
|
|
std::pair<Section, const char*>(Section::Multiplayer, "multiplayer"),
|
|
std::pair<Section, const char*>(Section::Scoring, "scoring"),
|
|
std::pair<Section, const char*>(Section::ScoringMulti, "scoring_multi"),
|
|
std::pair<Section, const char*>(Section::Techroom, "techroom"),
|
|
std::pair<Section, const char*>(Section::HUD, "hud"),
|
|
std::pair<Section, const char*>(Section::Settings, "settings"),
|
|
std::pair<Section, const char*>(Section::RedAlert, "red_alert"),
|
|
std::pair<Section, const char*>(Section::Variables, "variables"),
|
|
std::pair<Section, const char*>(Section::Missions, "missions"),
|
|
std::pair<Section, const char*>(Section::Cutscenes, "cutscenes"),
|
|
std::pair<Section, const char*>(Section::LastMissions, "last_mission"),
|
|
std::pair<Section, const char*>(Section::Containers, "containers")
|
|
};
|
|
|
|
const char* lookupSectionName(Section s) {
|
|
for (auto& pair : SectionMapping) {
|
|
if (pair.first == s) {
|
|
return pair.second;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
Section lookupSectionValue(const char* name) {
|
|
Assertion(name != nullptr, "Key name must be a valid pointer!");
|
|
|
|
for (auto& pair : SectionMapping) {
|
|
if (pair.second == nullptr) {
|
|
// Skip the unnamed section
|
|
continue;
|
|
}
|
|
if (!strcmp(pair.second, name)) {
|
|
return pair.first;
|
|
}
|
|
}
|
|
return Section::Invalid;
|
|
}
|
|
}
|
|
|
|
pilot::JSONFileHandler::JSONFileHandler(CFILE* cfp, bool reading) : _cfp(cfp) {
|
|
Assertion(cfp != nullptr, "File pointer must be valid!");
|
|
|
|
if (reading) {
|
|
json_error_t error;
|
|
_rootObj = json_load_cfile(cfp, 0, &error);
|
|
|
|
if (!_rootObj) {
|
|
SCP_string errorStr;
|
|
sprintf(errorStr, "Error while reading pilot file! %d: %s", error.line, error.text);
|
|
throw std::runtime_error(errorStr);
|
|
}
|
|
} else {
|
|
_rootObj = json_object();
|
|
}
|
|
_currentEl = _rootObj;
|
|
_elementStack.push_back(_currentEl);
|
|
}
|
|
|
|
pilot::JSONFileHandler::~JSONFileHandler() {
|
|
json_decref(_rootObj);
|
|
|
|
cfclose(_cfp);
|
|
_cfp = nullptr;
|
|
}
|
|
void pilot::JSONFileHandler::pushElement(json_t* t) {
|
|
Assertion(t != nullptr, "Invalid JSON element pointer passed!");
|
|
|
|
_currentEl = t;
|
|
_elementStack.push_back(_currentEl);
|
|
}
|
|
void pilot::JSONFileHandler::popElement() {
|
|
Assertion(_elementStack.size() > 1, "Element stack may not get smaller than one element!");
|
|
|
|
_elementStack.pop_back();
|
|
_currentEl = _elementStack.back();
|
|
}
|
|
void pilot::JSONFileHandler::writeByte(const char* name, std::int8_t value) {
|
|
writeInteger(name, value);
|
|
}
|
|
void pilot::JSONFileHandler::writeUByte(const char* name, std::uint8_t value) {
|
|
writeInteger(name, value);
|
|
}
|
|
void pilot::JSONFileHandler::writeShort(const char* name, std::int16_t value) {
|
|
writeInteger(name, value);
|
|
}
|
|
void pilot::JSONFileHandler::writeInt(const char* name, std::int32_t value) {
|
|
writeInteger(name, value);
|
|
}
|
|
void pilot::JSONFileHandler::writeUInt(const char* name, std::uint32_t value) {
|
|
writeInteger(name, value);
|
|
}
|
|
void pilot::JSONFileHandler::writeFloat(const char* name, float value) {
|
|
ensureNotExists(name);
|
|
json_object_set_new(_currentEl, name, json_real(value));
|
|
}
|
|
void pilot::JSONFileHandler::writeString(const char* name, const char* str) {
|
|
ensureNotExists(name);
|
|
json_t *jstr = nullptr;
|
|
|
|
if (str) {
|
|
// if this string isn't proper UTF-8, try to convert it
|
|
auto len = strlen(str);
|
|
if (utf8::find_invalid(str, str + len) != str + len) {
|
|
SCP_string buffer;
|
|
coerce_to_utf8(buffer, str);
|
|
jstr = json_string(buffer.c_str());
|
|
} else {
|
|
jstr = json_string(str);
|
|
}
|
|
}
|
|
|
|
json_object_set_new(_currentEl, name, jstr);
|
|
}
|
|
void pilot::JSONFileHandler::beginWritingSections() {
|
|
ensureNotExists("sections");
|
|
|
|
json_t* obj = json_object();
|
|
|
|
Assertion(json_typeof(_currentEl) == JSON_OBJECT, "Sections can only be written into a JSON object!");
|
|
|
|
json_object_set_new(_currentEl, "sections", obj);
|
|
|
|
pushElement(obj);
|
|
}
|
|
void pilot::JSONFileHandler::startSectionWrite(Section id) {
|
|
auto key_name = lookupSectionName(id);
|
|
|
|
json_t* obj = json_object();
|
|
|
|
if (json_is_array(_currentEl)) {
|
|
// We are in an array, section must be unnamed
|
|
Assertion(key_name == nullptr, "Inside an array there can be no named section!");
|
|
json_array_append_new(_currentEl, obj);
|
|
} else {
|
|
Assertion(key_name != nullptr, "Section outside of arrays must be named!");
|
|
json_object_set_new(_currentEl, key_name, obj);
|
|
}
|
|
pushElement(obj);
|
|
}
|
|
void pilot::JSONFileHandler::endSectionWrite() {
|
|
Assertion(json_is_object(_currentEl), "Section ended while not in a section!");
|
|
|
|
popElement();
|
|
}
|
|
void pilot::JSONFileHandler::endWritingSections() {
|
|
Assertion(json_is_object(_currentEl), "Section writing ended while not in object!");
|
|
|
|
popElement();
|
|
}
|
|
void pilot::JSONFileHandler::startArrayWrite(const char* name, size_t, bool) {
|
|
auto array = json_array();
|
|
|
|
if (json_is_array(_currentEl)) {
|
|
// We are in an array, section must be unnamed
|
|
Assertion(name == nullptr, "Inside an array there can be no named section!");
|
|
json_array_append_new(_currentEl, array);
|
|
} else {
|
|
Assertion(name != nullptr, "Section outside of arrays must be named!");
|
|
json_object_set_new(_currentEl, name, array);
|
|
}
|
|
pushElement(array);
|
|
}
|
|
void pilot::JSONFileHandler::endArrayWrite() {
|
|
Assertion(json_is_array(_currentEl), "Array ended while not in an array!");
|
|
|
|
popElement();
|
|
}
|
|
void pilot::JSONFileHandler::flush() {
|
|
Assertion(_elementStack.size() == 1, "Not all sections or arrays have been ended!");
|
|
|
|
json_dump_cfile(_rootObj, _cfp, JSON_INDENT(4));
|
|
}
|
|
void pilot::JSONFileHandler::writeInteger(const char* name, json_int_t val) {
|
|
ensureNotExists(name);
|
|
|
|
json_object_set_new(_currentEl, name, json_integer(val));
|
|
}
|
|
void pilot::JSONFileHandler::ensureNotExists(const char* name) {
|
|
Assertion(json_is_object(_currentEl), "Currently not in an element that supports keys!");
|
|
// Make sure we don't overwrite previous values
|
|
Assertion(json_object_get(_currentEl, name) == nullptr, "Entry with name %s already exists!", name);
|
|
}
|
|
|
|
json_int_t pilot::JSONFileHandler::readInteger(const char* name) {
|
|
auto el = json_object_get(_currentEl, name);
|
|
|
|
if (el == nullptr || json_typeof(el) != JSON_INTEGER) {
|
|
Error(LOCATION, "JSON element %s must be an integer but it is not valid!", name);
|
|
return 0;
|
|
}
|
|
|
|
return json_integer_value(el);
|
|
}
|
|
void pilot::JSONFileHandler::ensureExists(const char* name) {
|
|
if (json_typeof(_currentEl) != JSON_OBJECT) {
|
|
Error(LOCATION, "JSON reading requires a value with name '%s' but the current element is not an object!", name);
|
|
}
|
|
if (json_object_get(_currentEl, name) == nullptr) {
|
|
Error(LOCATION, "JSON reading requires a value with name '%s' but there is no such value!", name);
|
|
}
|
|
}
|
|
std::int8_t pilot::JSONFileHandler::readByte(const char* name) {
|
|
return (std::int8_t)readInteger(name);
|
|
}
|
|
std::uint8_t pilot::JSONFileHandler::readUByte(const char* name) {
|
|
return (std::uint8_t)readInteger(name);
|
|
}
|
|
std::int16_t pilot::JSONFileHandler::readShort(const char* name) {
|
|
return (std::int16_t)readInteger(name);
|
|
}
|
|
std::int32_t pilot::JSONFileHandler::readInt(const char* name) {
|
|
return (std::int32_t)readInteger(name);
|
|
}
|
|
std::uint32_t pilot::JSONFileHandler::readUInt(const char* name) {
|
|
return (std::uint32_t)readInteger(name);
|
|
}
|
|
float pilot::JSONFileHandler::readFloat(const char* name) {
|
|
auto el = json_object_get(_currentEl, name);
|
|
|
|
if (el == nullptr || json_typeof(el) != JSON_REAL) {
|
|
Error(LOCATION, "JSON element %s must be a float but it is not valid!", name);
|
|
return 0.0f;
|
|
}
|
|
|
|
return (float)json_real_value(el);
|
|
}
|
|
SCP_string pilot::JSONFileHandler::readString(const char* name) {
|
|
auto el = json_object_get(_currentEl, name);
|
|
|
|
if (el == nullptr || json_typeof(el) != JSON_STRING) {
|
|
Error(LOCATION, "JSON element %s must be a string but it is not valid!", name);
|
|
return SCP_string();
|
|
}
|
|
auto json_str = json_string_value(el);
|
|
SCP_string val;
|
|
val.assign(json_str, json_str + json_string_length(el));
|
|
|
|
return val;
|
|
}
|
|
void pilot::JSONFileHandler::beginSectionRead() {
|
|
ensureExists("sections");
|
|
|
|
auto sections = json_object_get(_currentEl, "sections");
|
|
if (json_typeof(sections) != JSON_OBJECT) {
|
|
Error(LOCATION, "Sections must be a JSON object!");
|
|
}
|
|
|
|
pushElement(sections);
|
|
|
|
Assertion(_sectionIterator == nullptr, "Section nesting is not yet supported!");
|
|
_sectionIterator = json_object_iter(_currentEl);
|
|
// Signals to nextSection that we just started iterating though the sections since it needs to do something special in that case
|
|
_startingSectionIteration = true;
|
|
}
|
|
bool pilot::JSONFileHandler::hasMoreSections() {
|
|
return _sectionIterator != nullptr;
|
|
}
|
|
Section pilot::JSONFileHandler::nextSection() {
|
|
Assertion(_sectionIterator != nullptr, "Section iterator must be valid for this function!");
|
|
|
|
// If we just started our iteration then there is no previous element we need to pop from the stack
|
|
if (!_startingSectionIteration) {
|
|
// We have to pop the previous section first
|
|
popElement();
|
|
|
|
Assertion(json_typeof(_currentEl) == JSON_OBJECT, "The previous element should have been an object!");
|
|
} else {
|
|
// We are now in normal operations so we can reset this flag
|
|
_startingSectionIteration = false;
|
|
}
|
|
|
|
auto key = json_object_iter_key(_sectionIterator);
|
|
auto section = lookupSectionValue(key);
|
|
|
|
auto el = json_object_iter_value(_sectionIterator);
|
|
if (json_typeof(el) != JSON_OBJECT) {
|
|
Error(LOCATION, "The section element of '%s' must be an object but it's a different type!", key);
|
|
return Section::Invalid;
|
|
}
|
|
|
|
// Move the iterator to the next object for the next iteration
|
|
_sectionIterator = json_object_iter_next(_currentEl, _sectionIterator);
|
|
|
|
// Move into the current section element
|
|
pushElement(el);
|
|
|
|
return section;
|
|
}
|
|
void pilot::JSONFileHandler::endSectionRead() {
|
|
// First, remove the element we are currently in, if there is one
|
|
if (json_typeof(_currentEl) != JSON_ARRAY) {
|
|
popElement();
|
|
}
|
|
|
|
Assertion(json_typeof(_currentEl) == JSON_OBJECT, "Current element for section reading is not an object!");
|
|
|
|
popElement();
|
|
_sectionIterator = nullptr;
|
|
}
|
|
size_t pilot::JSONFileHandler::startArrayRead(const char* name, bool /*short_index*/) {
|
|
Assertion(_arrayIndex == INVALID_SIZE, "Array nesting is not supported yet!");
|
|
|
|
ensureExists(name);
|
|
|
|
auto array = json_object_get(_currentEl, name);
|
|
if (json_typeof(array) != JSON_ARRAY) {
|
|
Error(LOCATION, "Expected an array for '%s' but it was a different type!", name);
|
|
return 0;
|
|
}
|
|
|
|
pushElement(array);
|
|
auto size = json_array_size(array);
|
|
|
|
if (size == 0) {
|
|
// Nothing to do here, avoid calling nextArraySection since that assumes that there is at least one element
|
|
return size;
|
|
}
|
|
_arrayIndex = 0;
|
|
nextArraySection(false);
|
|
|
|
return size;
|
|
}
|
|
void pilot::JSONFileHandler::nextArraySection(bool in_section) {
|
|
Assertion(_arrayIndex != INVALID_SIZE, "Array index must be valid for this function!");
|
|
|
|
if (in_section) {
|
|
// We have to pop the previous section first
|
|
popElement();
|
|
|
|
Assertion(json_typeof(_currentEl) == JSON_ARRAY, "The previous element should have been an array!");
|
|
}
|
|
|
|
auto max = json_array_size(_currentEl);
|
|
Assertion(_arrayIndex <= max, "Invalid array index detected!");
|
|
|
|
// Silently ignore if we are one past the last element since this function is used in a for loop where this function
|
|
// is executed one time after the index is incremented past the last element
|
|
if (_arrayIndex == max) {
|
|
// Increment the index so we catch usage errors the next time someone tries to call this function
|
|
++_arrayIndex;
|
|
return;
|
|
}
|
|
|
|
// We use the current array index and then increment it to avoid skipping the first element
|
|
auto el = json_array_get(_currentEl, _arrayIndex);
|
|
++_arrayIndex;
|
|
|
|
pushElement(el);
|
|
}
|
|
void pilot::JSONFileHandler::nextArraySection() {
|
|
nextArraySection(true);
|
|
}
|
|
void pilot::JSONFileHandler::endArrayRead() {
|
|
// First, remove the element we are currently in if it exists
|
|
if (json_typeof(_currentEl) != JSON_ARRAY) {
|
|
popElement();
|
|
}
|
|
|
|
Assertion(json_typeof(_currentEl) == JSON_ARRAY, "Current element must be an array!");
|
|
|
|
popElement();
|
|
_arrayIndex = INVALID_SIZE;
|
|
}
|
|
|