From 2f2f9a30bae53235210fa19ebe5722fea542a879 Mon Sep 17 00:00:00 2001 From: Sam Haves Date: Thu, 8 Jan 2026 07:22:08 -0800 Subject: [PATCH] When loading models use mj_parse instead of mj_parseXML, and allow non-xml file types. PiperOrigin-RevId: 853730923 Change-Id: I1c107daafd558bedb99338779c8174ee3e4d07e2 --- src/experimental/studio/app.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/experimental/studio/app.cc b/src/experimental/studio/app.cc index 311920f4..6d9f0082 100644 --- a/src/experimental/studio/app.cc +++ b/src/experimental/studio/app.cc @@ -165,15 +165,14 @@ void App::LoadModel(std::string data, ContentType type) { model_name_ = std::move(data); const std::string resolved_file = platform::ResolveFile(model_name_, search_paths_); - if (resolved_file.ends_with(".mjb")) { + if (resolved_file.ends_with(".mjb")) { model_ = mj_loadModel(resolved_file.c_str(), 0); - } else if (resolved_file.ends_with(".xml")) { - spec_ = mj_parseXML(resolved_file.c_str(), nullptr, err, sizeof(err)); + } else { + spec_ = + mj_parse(resolved_file.c_str(), nullptr, nullptr, err, sizeof(err)); if (spec_ && err[0] == 0) { model_ = mj_compile(spec_, nullptr); } - } else { - error_ = "Unknown model file type; expected .mjb or .xml."; } } else if (type == ContentType::kModelXml) { model_name_ = "[xml]";