Refactor numerical parsing in XML.
PiperOrigin-RevId: 653979240 Change-Id: I4d39f4041b88396193eb35f0cc393141d64f6fc0
This commit is contained in:
committed by
Copybara-Service
parent
e92af73cbf
commit
8a8a44a4db
@@ -62,13 +62,16 @@
|
||||
#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>
|
||||
|
||||
extern "C" {
|
||||
#include "qhull_ra.h"
|
||||
}
|
||||
|
||||
namespace {
|
||||
using mujoco::user::VectorToString;
|
||||
} // namespace
|
||||
|
||||
// compute triangle area, surface normal, center
|
||||
static double _triangle(double* normal, double* center,
|
||||
const float* v1, const float* v2, const float* v3) {
|
||||
@@ -2627,8 +2630,8 @@ void mjCFlex::Compile(const mjVFS* vfs) {
|
||||
|
||||
// add plugins
|
||||
std::string userface, useredge;
|
||||
mjXUtil::Vector2String(userface, elem_);
|
||||
mjXUtil::Vector2String(useredge, edgeidx);
|
||||
userface = VectorToString(elem_);
|
||||
useredge = VectorToString(edgeidx);
|
||||
|
||||
for (const auto& vbodyid : vertbodyid) {
|
||||
if (model->Bodies()[vbodyid]->plugin.instance) {
|
||||
|
||||
Reference in New Issue
Block a user