Clean up formatting issues in user_objects.h
PiperOrigin-RevId: 599127766 Change-Id: If752c00038818fb21476eb98be891ead467aad56
This commit is contained in:
committed by
Copybara-Service
parent
a02fc405af
commit
71b0561758
+11
-5
@@ -16,12 +16,17 @@
|
||||
#define MUJOCO_SRC_USER_USER_OBJECTS_H_
|
||||
|
||||
#include <array>
|
||||
#include <functional>
|
||||
#include <map>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "lodepng.h"
|
||||
|
||||
#include <mujoco/mjtnum.h>
|
||||
#include <mujoco/mjmodel.h>
|
||||
#include <mujoco/mjplugin.h>
|
||||
|
||||
@@ -358,7 +363,8 @@ class mjCJoint : public mjCBase {
|
||||
double urdfeffort; // store effort field from urdf
|
||||
|
||||
private:
|
||||
mjCJoint(mjCModel* = 0, mjCDef* = 0);// constructor
|
||||
mjCJoint(mjCModel* = 0, mjCDef* = 0);
|
||||
|
||||
int Compile(void); // compiler; return dofnum
|
||||
|
||||
mjCBody* body; // joint's body
|
||||
@@ -429,7 +435,7 @@ class mjCGeom : public mjCBase {
|
||||
double quat[4]; // orientation
|
||||
|
||||
private:
|
||||
mjCGeom(mjCModel* = 0, mjCDef* = 0);// constructor
|
||||
mjCGeom(mjCModel* = 0, mjCDef* = 0);
|
||||
void Compile(void); // compiler
|
||||
double GetRBound(void); // compute bounding sphere radius
|
||||
void ComputeAABB(void); // compute axis-aligned bounding box
|
||||
@@ -598,7 +604,7 @@ class mjCFlex: public mjCBase {
|
||||
void DelTexcoord(); // delete texcoord
|
||||
|
||||
private:
|
||||
mjCFlex(mjCModel* = 0); // constructor
|
||||
mjCFlex(mjCModel* = 0);
|
||||
void Compile(const mjVFS* vfs); // compiler
|
||||
void CreateBVH(void); // create flex BVH
|
||||
void CreateShellPair(void); // create shells and evpairs
|
||||
@@ -610,7 +616,7 @@ class mjCFlex: public mjCBase {
|
||||
bool rigid; // all vertices attached to the same body
|
||||
bool centered; // all vertices coordinates (0,0,0)
|
||||
std::vector<int> vertbodyid; // vertex body ids
|
||||
std::vector<std::pair<int,int>> edge; // edge vertex ids
|
||||
std::vector<std::pair<int, int>> edge; // edge vertex ids
|
||||
std::vector<int> shell; // shell fragment vertex ids (dim per fragment)
|
||||
std::vector<int> elemlayer; // element layer (distance from border)
|
||||
std::vector<int> evpair; // element-vertex pairs
|
||||
@@ -644,7 +650,7 @@ class mjCMesh: public mjCBase {
|
||||
const std::vector<float>& usertexcoord() const { return usertexcoord_; }
|
||||
const std::vector<int>& userface() const { return userface_; }
|
||||
|
||||
// mesh properites computed by Compile
|
||||
// mesh properties computed by Compile
|
||||
const double* aamm() const { return aamm_; }
|
||||
|
||||
// number of vertices, normals, texture coordinates, and faces
|
||||
|
||||
Reference in New Issue
Block a user