Move engine/engine_resource.{c,h} to user/user_resource.{c,h}.

PiperOrigin-RevId: 649628768
Change-Id: Id90c983cf70c0f92c3b033ac1b1654c53696955d

src/engine/CMakeLists.txt

@@ -57,8 +57,6 @@ set(MUJOCO_ENGINE_SRCS
     engine_print.h
     engine_ray.c
     engine_ray.h
-    engine_resource.c
-    engine_resource.h
     engine_sensor.c
     engine_sensor.h
     engine_setconst.c

src/user/CMakeLists.txt

@@ -27,6 +27,8 @@ set(MUJOCO_USER_SRCS
     user_model.h
     user_objects.cc
     user_objects.h
+    user_resource.c
+    user_resource.h
     user_util.cc
     user_util.h
     user_vfs.cc

src/user/user_flexcomp.cc

@@ -30,12 +30,12 @@
 #include <mujoco/mujoco.h>
 #include "cc/array_safety.h"
 #include "engine/engine_crossplatform.h"
-#include "engine/engine_resource.h"
 #include "engine/engine_util_errmem.h"
 #include "user/user_flexcomp.h"
 #include <mujoco/mjspec.h>
 #include "user/user_model.h"
 #include "user/user_objects.h"
+#include "user/user_resource.h"
 #include "user/user_util.h"
 
 namespace {

src/user/user_mesh.cc

@@ -56,11 +56,11 @@
 #include "engine/engine_crossplatform.h"
 #include "engine/engine_io.h"
 #include "engine/engine_plugin.h"
-#include "engine/engine_resource.h"
 #include "engine/engine_util_errmem.h"
 #include "user/user_cache.h"
 #include "user/user_model.h"
 #include "user/user_objects.h"
+#include "user/user_resource.h"
 #include "user/user_util.h"
 #include "xml/xml_util.h"
 #include <tiny_obj_loader.h>

src/user/user_objects.cc

@@ -36,12 +36,12 @@
 #include <mujoco/mjplugin.h>
 #include <mujoco/mjtnum.h>
 #include "cc/array_safety.h"
-#include "engine/engine_resource.h"
 #include "engine/engine_passive.h"
 #include <mujoco/mjspec.h>
 #include "user/user_api.h"
 #include "user/user_cache.h"
 #include "user/user_model.h"
+#include "user/user_resource.h"
 #include "user/user_util.h"
 #include "user/user_vfs.h"
 

src/user/user_resource.c

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "engine/engine_resource.h"
+#include "user/user_resource.h"
 
 #include <errno.h>
 #include <limits.h>

src/user/user_resource.h

@@ -11,6 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+// IWYU pragma: private, include "third_party/mujoco/include/mujoco.h"
+// IWYU pragma: friend "third_party/mujoco/src/.*"
 
 #ifndef MUJOCO_SRC_ENGINE_ENGINE_RESOURCE_H_
 #define MUJOCO_SRC_ENGINE_ENGINE_RESOURCE_H_

src/user/user_vfs.cc

@@ -24,9 +24,9 @@
 #include <string>
 #include <unordered_map>
 
-#include "engine/engine_resource.h"
 #include "engine/engine_util_errmem.h"
 #include "engine/engine_util_misc.h"
+#include "user/user_resource.h"
 #include "user/user_util.h"
 
 namespace {

src/xml/xml.cc

@@ -34,8 +34,8 @@
 #include <mujoco/mjplugin.h>
 #include "cc/array_safety.h"
 #include "engine/engine_crossplatform.h"
-#include "engine/engine_resource.h"
 #include <mujoco/mjspec.h>
+#include "user/user_resource.h"
 #include "user/user_util.h"
 #include "user/user_vfs.h"
 #include "xml/xml_native_reader.h"

src/xml/xml_api.cc

@@ -27,8 +27,8 @@
 
 #include <mujoco/mjmodel.h>
 #include "engine/engine_io.h"
-#include "engine/engine_resource.h"
 #include <mujoco/mjspec.h>
+#include "user/user_resource.h"
 #include "user/user_vfs.h"
 #include "xml/xml.h"
 #include "xml/xml_native_reader.h"

src/xml/xml_util.cc

@@ -35,8 +35,8 @@
 
 #include <mujoco/mujoco.h>
 #include "cc/array_safety.h"
-#include "engine/engine_resource.h"
 #include "engine/engine_util_errmem.h"
+#include "user/user_resource.h"
 #include "user/user_util.h"
 #include "xml/xml_util.h"
 #include "xml/xml_numeric_format.h"

test/engine/CMakeLists.txt

@@ -72,9 +72,6 @@ target_link_libraries(engine_print_test fixture gmock)
 mujoco_test(engine_ray_test)
 target_link_libraries(engine_ray_test fixture gmock)
 
-mujoco_test(engine_resource_test)
-target_link_libraries(engine_resource_test fixture gmock)
-
 mujoco_test(engine_sensor_test)
 target_link_libraries(engine_sensor_test fixture gmock)
 

test/user/CMakeLists.txt

@@ -40,5 +40,8 @@ target_link_libraries(
 mujoco_test(user_composite_test)
 target_link_libraries(user_composite_test fixture gmock)
 
+mujoco_test(user_resource_test)
+target_link_libraries(user_resource_test fixture gmock)
+
 mujoco_test(user_vfs_test)
 target_link_libraries(user_vfs_test fixture gmock)

test/user/user_resource_test.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Tests for engine/engine_resource.c
+// Tests for user/user_resource.c
 
 #include <array>
 #include <cstdint>
@@ -26,8 +26,8 @@
 #include <mujoco/mjplugin.h>
 #include <mujoco/mujoco.h>
 #include "src/engine/engine_plugin.h"
-#include "src/engine/engine_resource.h"
 #include "src/engine/engine_util_misc.h"
+#include "src/user/user_resource.h"
 #include "test/fixture.h"
 
 namespace mujoco {

test/user/user_vfs_test.cc

@@ -19,7 +19,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <mujoco/mujoco.h>
-#include "src/engine/engine_resource.h"
+#include "src/user/user_resource.h"
 #include "src/user/user_vfs.h"
 #include "test/fixture.h"