mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-06 11:31:49 +00:00
Merge branch 'dev' into generated-pcm-stream
This commit is contained in:
commit
96f9c9f382
8 changed files with 68 additions and 26 deletions
|
|
@ -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)));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue