Compare commits

..

9 commits

Author SHA1 Message Date
630cc1fbbc CMakeLists: we're working on 1.5 now. 2022-12-05 14:39:06 +01:00
b219589af3 CMakeLists: change how defines are handled. 2022-12-05 14:38:50 +01:00
640a7d3cd0 Profile,SaveTool: change how materials are handled. 2022-12-05 12:11:02 +01:00
a17f87cfc9 SaveTool: update a TextUnformatted() call. 2022-12-05 11:50:28 +01:00
847e07e88d Update coding style.
Magnum's type names are fine, but I'd rather limit what depends on
Magnum as much as possible. Vector types are still allowed, though. No
way I'll write my own.
2022-12-05 11:32:18 +01:00
953a2a9c8b Match the new coding style I use. 2022-12-03 16:49:39 +01:00
aa1e5daf94 Configuration: add missing licence text. 2022-12-03 16:49:18 +01:00
8668c59858 SaveTool: move the configuration to its own class. 2022-12-01 23:42:39 +01:00
da6aea3661 SaveTool: add a wrapper over ImGui::Checkbox().
This way, I can make it work like radio buttons or selectables.
2022-12-01 23:41:34 +01:00

View file

@ -264,7 +264,6 @@ Profile::setMaterial(MaterialID id, std::int32_t amount) {
if(!mats_prop) {
mats_prop = new ArrayProperty;
mats_prop->name.emplace(container);
mats_prop->itemType = "StructProperty";
_profile.appendProperty(ArrayProperty::ptr{mats_prop});
}
@ -278,9 +277,6 @@ Profile::setMaterial(MaterialID id, std::int32_t amount) {
ResourceItemValue* res_prop;
if(it == mats_prop->items.end()) {
res_prop = new ResourceItemValue;
if(mats_prop->items.isEmpty()) {
res_prop->name.emplace("ResourceMaterial");
}
res_prop->id = id;
ResourceItemValue::ptr prop{res_prop};
arrayAppend(mats_prop->items, std::move(prop));