From 844dc504cdb76090746b59995071ec6c8a45840b Mon Sep 17 00:00:00 2001 From: Alessio Quaglino Date: Fri, 14 Oct 2022 05:13:17 -0700 Subject: [PATCH] Report mesh name in mesh compiler warnings. PiperOrigin-RevId: 481120561 Change-Id: Id68e5f03d88f85a5637f2cff00b5d3a5a59a9156 --- src/user/user_mesh.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/user/user_mesh.cc b/src/user/user_mesh.cc index 8c48a303..677726de 100644 --- a/src/user/user_mesh.cc +++ b/src/user/user_mesh.cc @@ -28,6 +28,7 @@ #define TINYOBJLOADER_IMPLEMENTATION #include +#include "cc/array_safety.h" #include "engine/engine_crossplatform.h" #include "engine/engine_file.h" #include "engine/engine_macro.h" @@ -263,7 +264,11 @@ void mjCMesh::Compile(const mjVFS* vfs) { useredge.push_back(std::pair(v1, v2)); useredge.push_back(std::pair(v2, v0)); } else { - mju_warning("Degenerate triangle found, its orientation will not be checked."); + char message[100]; + ::mujoco::util::sprintf_arr(message, + "Degenerate triangle found in mesh `%s`, its orientation will not be checked.", + name.c_str()); + mju_warning(message); } } } @@ -663,7 +668,11 @@ void mjCMesh::LoadOBJ(const mjVFS* vfs) { useredge.push_back(std::pair(face_indices[1].vertex_index, face_indices[2].vertex_index)); useredge.push_back(std::pair(face_indices[2].vertex_index, face_indices[0].vertex_index)); } else { - mju_warning("Degenerate triangle found, its orientation will not be checked."); + char message[100]; + ::mujoco::util::sprintf_arr(message, + "Degenerate triangle found in mesh `%s`, its orientation will not be checked.", + name.c_str()); + mju_warning(message); } // add vertex indices (in uservert) to userface