williamjcm/MassBuilderSaveTool
williamjcm/MassBuilderSaveTool
1
0
Fork 0
Code Issues 15 Pull requests Releases 21 Wiki Activity

1.5: Fuckin' UE5... #38

Manually merged
williamjcm merged 126 commits from one-point-five into master 2024-07-22 11:06:13 +02:00
Conversation 0 Commits 126 Files changed 199 +39 -39
13 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fd9f9e5e36 - Show all commits

10
src/Gvas/File.cpp
View file

@ -31,7 +31,7 @@ namespace Gvas {
File::File(Containers::String filepath):
_propSerialiser{PropertySerialiser::instance()}
{
_filepath = std::move(filepath);
_filepath = Utility::move(filepath);
loadData();
}
@ -65,9 +65,9 @@ File::saveType() {
void
File::appendProperty(Types::UnrealPropertyBase::ptr prop) {
auto none_prop = std::move(_properties.back());
_properties.back() = std::move(prop);
arrayAppend(_properties, std::move(none_prop));
auto none_prop = Utility::move(_properties.back());
_properties.back() = Utility::move(prop);
arrayAppend(_properties, Utility::move(none_prop));
}
Containers::ArrayView<Types::UnrealPropertyBase::ptr>
@ -245,7 +245,7 @@ File::loadData() {
Types::UnrealPropertyBase::ptr prop;
while((prop = _propSerialiser->read(reader)) != nullptr) {
arrayAppend(_properties, std::move(prop));
arrayAppend(_properties, Utility::move(prop));
}
if(_properties.isEmpty()) {

10
src/Gvas/PropertySerialiser.cpp
View file

@ -100,7 +100,7 @@ PropertySerialiser::read(BinaryIo::Reader& reader) {
return nullptr;
}
return deserialise(std::move(name), std::move(type), value_length, reader);
return deserialise(Utility::move(name), Utility::move(type), value_length, reader);
}
Types::UnrealPropertyBase::ptr
@ -111,7 +111,7 @@ PropertySerialiser::readItem(BinaryIo::Reader& reader, Containers::String type,
return nullptr;
}
return deserialise(std::move(name), std::move(type), value_length, reader);
return deserialise(Utility::move(name), Utility::move(type), value_length, reader);
}
Containers::Array<Types::UnrealPropertyBase::ptr>
@ -151,7 +151,7 @@ PropertySerialiser::readSet(BinaryIo::Reader& reader, Containers::StringView ite
else {
for(std::uint32_t i = 0; i < count; i++) {
auto item = readItem(reader, item_type, std::size_t(-1), "");
arrayAppend(array, std::move(item));
arrayAppend(array, Utility::move(item));
}
}
@ -176,8 +176,8 @@ PropertySerialiser::deserialise(Containers::String name, Containers::String type
return nullptr;
}
prop->name = std::move(name);
prop->propertyType = std::move(type);
prop->name = Utility::move(name);
prop->propertyType = Utility::move(type);
return prop;
}

2
src/Gvas/Serialisers/ArrayProperty.cpp
View file

@ -48,7 +48,7 @@ ArrayProperty::deserialiseProperty(Containers::StringView name, Containers::Stri
}
auto prop = Containers::pointer<Types::ArrayProperty>();
prop->itemType = std::move(item_type);
prop->itemType = Utility::move(item_type);
prop->items = serialiser.readSet(reader, prop->itemType, item_count);
return prop;

6
src/Gvas/Serialisers/MapProperty.cpp
View file

@ -83,7 +83,7 @@ MapProperty::deserialiseProperty(Containers::StringView name, Containers::String
Types::UnrealPropertyBase::ptr value_item;
if(prop->valueType == "StructProperty"_s) {
while((value_item = serialiser.read(reader)) != nullptr) {
arrayAppend(pair.values, std::move(value_item));
arrayAppend(pair.values, Utility::move(value_item));
if(pair.values.back()->name == "None"_s &&
pair.values.back()->propertyType == "NoneProperty"_s &&
@ -98,10 +98,10 @@ MapProperty::deserialiseProperty(Containers::StringView name, Containers::String
return nullptr;
}
arrayAppend(pair.values, std::move(value_item));
arrayAppend(pair.values, Utility::move(value_item));
}
arrayAppend(prop->map, std::move(pair));
arrayAppend(prop->map, Utility::move(pair));
}
// End dirty code

2
src/Gvas/Serialisers/SetProperty.cpp
View file

@ -52,7 +52,7 @@ SetProperty::deserialiseProperty(Containers::StringView name, Containers::String
}
auto prop = Containers::pointer<Types::SetProperty>();
prop->itemType = std::move(item_type);
prop->itemType = Utility::move(item_type);
prop->items = serialiser.readSet(reader, prop->itemType, item_count);
return prop;

10
src/Gvas/Serialisers/Struct.cpp
View file

@ -60,8 +60,8 @@ Struct::deserialise(Containers::StringView name, Containers::StringView type, st
if(count == 0) {
auto prop = Containers::pointer<Types::GenericStructProperty>();
prop->structType = std::move(item_type);
prop->structGuid = std::move(guid);
prop->structType = Utility::move(item_type);
prop->structGuid = guid;
}
else {
for(std::uint32_t i = 0; i < count; i++) {
@ -80,7 +80,7 @@ Struct::deserialise(Containers::StringView name, Containers::StringView type, st
dynamic_cast<Types::StructProperty*>(prop.get())->structGuid = guid;
arrayAppend(array, std::move(prop));
arrayAppend(array, Utility::move(prop));
}
}
@ -118,7 +118,7 @@ Struct::deserialise(Containers::StringView name, Containers::StringView type, st
if(!prop) {
prop = readStructValue(name, item_type, value_length, reader, serialiser);
if(prop) {
dynamic_cast<Types::GenericStructProperty*>(prop.get())->structGuid = std::move(guid);
dynamic_cast<Types::GenericStructProperty*>(prop.get())->structGuid = guid;
}
}
@ -207,7 +207,7 @@ Struct::readStructValue(Containers::StringView name, Containers::StringView type
Types::UnrealPropertyBase::ptr prop;
while((prop = serialiser.read(reader)) != nullptr) {
arrayAppend(st_prop->properties, std::move(prop));
arrayAppend(st_prop->properties, Utility::move(prop));
if(st_prop->properties.back()->name == "None" &&
st_prop->properties.back()->propertyType == "NoneProperty" &&

2
src/Gvas/Serialisers/TextProperty.cpp
View file

@ -62,7 +62,7 @@ TextProperty::deserialiseProperty(Containers::StringView name, Containers::Strin
return nullptr;
}
arrayAppend(prop->data, std::move(str));
arrayAppend(prop->data, Utility::move(str));
interval = reader.position() - start_position;
} while(std::size_t(interval) < value_length);

2
src/Gvas/Types/GenericStructProperty.h
View file

@ -47,7 +47,7 @@ struct GenericStructProperty : public StructProperty {
atMove(Containers::StringView name) {
for(auto& item : properties) {
if(item && item->name == name) {
return Containers::pointerCast<T>(std::move(item));
return Containers::pointerCast<T>(Utility::move(item));
}
}
return nullptr;

2
src/Mass/Mass_Armour.cpp
View file

@ -358,7 +358,7 @@ Mass::writeBulletLauncherAttachments() {
attach_style_prop->name.emplace(MASS_BL_ATTACHMENT_STYLE);
attach_style_prop->enumType = "enuBLAttachmentStyle"_s;
Gvas::Types::ByteProperty::ptr prop{attach_style_prop};
arrayAppend(unit_data->properties, std::move(prop));
arrayAppend(unit_data->properties, Utility::move(prop));
}
auto& attach_style = attach_style_prop->enumValue;

24
src/Mass/Mass_Frame.cpp
View file

@ -99,7 +99,7 @@ Mass::writeJointSliders() {
length->name.emplace(MASS_JOINT_NECK);
}
length->value = _frame.joints.neck;
arrayAppend(temp, std::move(length));
arrayAppend(temp, Utility::move(length));
}
length = frame_prop->atMove<Gvas::Types::FloatProperty>(MASS_JOINT_BODY);
@ -109,7 +109,7 @@ Mass::writeJointSliders() {
length->name.emplace(MASS_JOINT_BODY);
}
length->value = _frame.joints.body;
arrayAppend(temp, std::move(length));
arrayAppend(temp, Utility::move(length));
}
length = frame_prop->atMove<Gvas::Types::FloatProperty>(MASS_JOINT_SHOULDER);
@ -119,7 +119,7 @@ Mass::writeJointSliders() {
length->name.emplace(MASS_JOINT_SHOULDER);
}
length->value = _frame.joints.shoulders;
arrayAppend(temp, std::move(length));
arrayAppend(temp, Utility::move(length));
}
length = frame_prop->atMove<Gvas::Types::FloatProperty>(MASS_JOINT_ARM_UPPER);
@ -129,7 +129,7 @@ Mass::writeJointSliders() {
length->name.emplace(MASS_JOINT_ARM_UPPER);
}
length->value = _frame.joints.upperArms;
arrayAppend(temp, std::move(length));
arrayAppend(temp, Utility::move(length));
}
length = frame_prop->atMove<Gvas::Types::FloatProperty>(MASS_JOINT_ARM_LOWER);
@ -139,7 +139,7 @@ Mass::writeJointSliders() {
length->name.emplace(MASS_JOINT_ARM_LOWER);
}
length->value = _frame.joints.lowerArms;
arrayAppend(temp, std::move(length));
arrayAppend(temp, Utility::move(length));
}
length = frame_prop->atMove<Gvas::Types::FloatProperty>(MASS_JOINT_HIP);
@ -149,7 +149,7 @@ Mass::writeJointSliders() {
length->name.emplace(MASS_JOINT_HIP);
}
length->value = _frame.joints.hips;
arrayAppend(temp, std::move(length));
arrayAppend(temp, Utility::move(length));
}
length = frame_prop->atMove<Gvas::Types::FloatProperty>(MASS_JOINT_LEG_UPPER);
@ -159,7 +159,7 @@ Mass::writeJointSliders() {
length->name.emplace(MASS_JOINT_LEG_UPPER);
}
length->value = _frame.joints.upperLegs;
arrayAppend(temp, std::move(length));
arrayAppend(temp, Utility::move(length));
}
length = frame_prop->atMove<Gvas::Types::FloatProperty>(MASS_JOINT_LEG_LOWER);
@ -169,14 +169,14 @@ Mass::writeJointSliders() {
length->name.emplace(MASS_JOINT_LEG_LOWER);
}
length->value = _frame.joints.lowerLegs;
arrayAppend(temp, std::move(length));
arrayAppend(temp, Utility::move(length));
}
arrayAppend(temp, std::move(frame_prop->properties[frame_prop->properties.size() - 3]));
arrayAppend(temp, std::move(frame_prop->properties[frame_prop->properties.size() - 2]));
arrayAppend(temp, std::move(frame_prop->properties[frame_prop->properties.size() - 1]));
arrayAppend(temp, Utility::move(frame_prop->properties[frame_prop->properties.size() - 3]));
arrayAppend(temp, Utility::move(frame_prop->properties[frame_prop->properties.size() - 2]));
arrayAppend(temp, Utility::move(frame_prop->properties[frame_prop->properties.size() - 1]));
frame_prop->properties = std::move(temp);
frame_prop->properties = Utility::move(temp);
if(!_mass->saveToFile()) {
_lastError = _mass->lastError();

2
src/Profile/Profile.cpp
View file

@ -285,7 +285,7 @@ Profile::setMaterial(GameData::MaterialID id, std::int32_t amount) {
}
res_prop->id = id;
Gvas::Types::ResourceItemValue::ptr prop{res_prop};
arrayAppend(mats_prop->items, std::move(prop));
arrayAppend(mats_prop->items, Utility::move(prop));
}
else {
res_prop = dynamic_cast<Gvas::Types::ResourceItemValue*>(it->get());

4
src/ProfileManager/ProfileManager.cpp
View file

@ -87,7 +87,7 @@ ProfileManager::refreshProfiles() {
continue;
}
arrayAppend(_profiles, std::move(profile));
arrayAppend(_profiles, Utility::move(profile));
}
if(_profiles.isEmpty()) {
@ -298,7 +298,7 @@ ProfileManager::refreshBackups() {
arrayAppend(backup.includedFiles, InPlaceInit, zip_get_name(zip, i, ZIP_FL_UNCHANGED));
}
arrayAppend(_backups, std::move(backup));
arrayAppend(_backups, Utility::move(backup));
}
}

2
src/ToastQueue/ToastQueue.cpp
View file

@ -99,7 +99,7 @@ Toast::opacity() {
void
ToastQueue::addToast(Toast&& toast) {
_toasts.push_back(std::move(toast));
_toasts.push_back(Utility::move(toast));
}
void