From ba93a9b5d6f6fc8fe018eaf5da5922b5e7e10d03 Mon Sep 17 00:00:00 2001 From: Kyle Bayes Date: Mon, 3 Jun 2024 10:07:20 -0700 Subject: [PATCH] Remove mj_makeEmptyFileVFS in favor of mj_addBufferVFS from MuJoCo codebases. PiperOrigin-RevId: 639824744 Change-Id: I7746c71b0be88a61e76c4622d605356701881563 --- test/user/user_objects_test.cc | 4 +--- test/xml/xml_native_reader_test.cc | 14 ++++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/test/user/user_objects_test.cc b/test/user/user_objects_test.cc index f23a7574..bb4e7e3e 100644 --- a/test/user/user_objects_test.cc +++ b/test/user/user_objects_test.cc @@ -363,9 +363,7 @@ TEST_F(ContentTypeTest, TextureLoadPng) { // load VFS on the heap auto vfs = std::make_unique(); mj_defaultVFS(vfs.get()); - mj_makeEmptyFileVFS(vfs.get(), filename, 105); - int i = mj_findFileVFS(vfs.get(), filename); - memcpy(vfs->filedata[i], tiny, tiny_sz); + mj_addBufferVFS(vfs.get(), filename, tiny, tiny_sz); // loading the file should be successful mjModel* model = LoadModelFromString(xml, error, error_sz, vfs.get()); diff --git a/test/xml/xml_native_reader_test.cc b/test/xml/xml_native_reader_test.cc index 41a1ca73..1f225fa4 100644 --- a/test/xml/xml_native_reader_test.cc +++ b/test/xml/xml_native_reader_test.cc @@ -554,14 +554,9 @@ TEST_F(XMLReaderTest, IncludeTest) { auto vfs = std::make_unique(); mj_defaultVFS(vfs.get()); - mj_makeEmptyFileVFS(vfs.get(), "model1.xml", sizeof(xml1)); - std::memcpy(vfs->filedata[vfs->nfile - 1], xml1, sizeof(xml1)); - - mj_makeEmptyFileVFS(vfs.get(), "model2.xml", sizeof(xml2)); - std::memcpy(vfs->filedata[vfs->nfile - 1], xml2, sizeof(xml2)); - - mj_makeEmptyFileVFS(vfs.get(), "model3.xml", sizeof(xml3)); - std::memcpy(vfs->filedata[vfs->nfile - 1], xml3, sizeof(xml3)); + mj_addBufferVFS(vfs.get(), "model1.xml", xml1, sizeof(xml1)); + mj_addBufferVFS(vfs.get(), "model2.xml", xml2, sizeof(xml2)); + mj_addBufferVFS(vfs.get(), "model3.xml", xml3, sizeof(xml3)); std::array error; mjModel* model = LoadModelFromString(xml, error.data(), @@ -606,8 +601,7 @@ TEST_F(XMLReaderTest, IncludeSameFileTest) { auto vfs = std::make_unique(); mj_defaultVFS(vfs.get()); - mj_makeEmptyFileVFS(vfs.get(), "model1.xml", sizeof(xml1)); - std::memcpy(vfs->filedata[vfs->nfile - 1], xml1, sizeof(xml1)); + mj_addBufferVFS(vfs.get(), "model1.xml", xml1, sizeof(xml1)); std::array error; mjModel* model = LoadModelFromString(xml, error.data(), error.size(),