fix assets.parse_model with 'xml' format

This commit is contained in:
MihailRis 2025-10-15 12:17:46 +03:00
parent da41de263d
commit ec94abccbc
6 changed files with 12 additions and 8 deletions

View File

@ -110,7 +110,7 @@ function unlock_access()
end
local function reload_model(filename, name)
assets.parse_model("xml", document.editor.text, name)
assets.parse_model(file.ext(filename), document.editor.text, name)
end
function run_current_file()

View File

@ -33,5 +33,4 @@
onup="on_history_up()"
ondown="on_history_down()">
</textbox>
<textbox size="200" margin="20" multiline="true" text-wrap="true" autoresize="false"/>
</container>

View File

@ -381,7 +381,8 @@ assetload::postfunc assetload::model(
auto text = io::read_string(path);
try {
auto model = vcm::parse(path.string(), text).release();
auto model = vcm::parse(path.string(), text, path.extension() == ".xml")
.release();
return [=](Assets* assets) {
request_textures(loader, *model);
assets->store(std::unique_ptr<model::Model>(model), name);

View File

@ -163,11 +163,11 @@ static std::unique_ptr<model::Model> load_model(const xmlelement& root) {
}
std::unique_ptr<model::Model> vcm::parse(
std::string_view file, std::string_view src
std::string_view file, std::string_view src, bool usexml
) {
try {
auto doc = io::path(std::string(file)).extension() == ".xml"
? xml::parse(file, src) : xml::parse_vcm(file, src, "model");
auto doc =
usexml ? xml::parse(file, src) : xml::parse_vcm(file, src, "model");
const auto& root = *doc->getRoot();
if (root.getTag() != "model") {
throw std::runtime_error(

View File

@ -8,5 +8,7 @@ namespace model {
}
namespace vcm {
std::unique_ptr<model::Model> parse(std::string_view file, std::string_view src);
std::unique_ptr<model::Model> parse(
std::string_view file, std::string_view src, bool usexml
);
}

View File

@ -55,7 +55,9 @@ static int l_parse_model(lua::State* L) {
auto name = lua::require_string(L, 3);
if (format == "xml" || format == "vcm") {
engine->getAssets()->store(vcm::parse(name, string), name);
engine->getAssets()->store(
vcm::parse(name, string, format == "xml"), name
);
} else {
throw std::runtime_error("unknown format " + util::quote(std::string(format)));
}