chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up formatting issues in user_objects.h

Browse Source 
PiperOrigin-RevId: 599127766
Change-Id: If752c00038818fb21476eb98be891ead467aad56
This commit is contained in:
Kyle Bayes
2024-01-17 04:20:24 -08:00
committed by Copybara-Service
parent a02fc405af
commit 71b0561758
1 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/user/user_objects.h
+11 -5
View File
@@ -16,12 +16,17 @@
#define MUJOCO_SRC_USER_USER_OBJECTS_H_ #define MUJOCO_SRC_USER_USER_OBJECTS_H_
#include <array> #include <array>
#include <functional>
#include <map> #include <map>
#include <optional> #include <optional>
#include <string> #include <string>
#include <string_view>
#include <utility>
#include <vector> #include <vector>
#include "lodepng.h" #include "lodepng.h"
#include <mujoco/mjtnum.h>
#include <mujoco/mjmodel.h> #include <mujoco/mjmodel.h>
#include <mujoco/mjplugin.h> #include <mujoco/mjplugin.h>
@@ -358,7 +363,8 @@ class mjCJoint : public mjCBase {
double urdfeffort; // store effort field from urdf double urdfeffort; // store effort field from urdf
private: private:
mjCJoint(mjCModel* = 0, mjCDef* = 0);// constructor mjCJoint(mjCModel* = 0, mjCDef* = 0);
int Compile(void); // compiler; return dofnum int Compile(void); // compiler; return dofnum
mjCBody* body; // joint's body mjCBody* body; // joint's body
@@ -429,7 +435,7 @@ class mjCGeom : public mjCBase {
double quat[4]; // orientation double quat[4]; // orientation
private: private:
mjCGeom(mjCModel* = 0, mjCDef* = 0);// constructor mjCGeom(mjCModel* = 0, mjCDef* = 0);
void Compile(void); // compiler void Compile(void); // compiler
double GetRBound(void); // compute bounding sphere radius double GetRBound(void); // compute bounding sphere radius
void ComputeAABB(void); // compute axis-aligned bounding box void ComputeAABB(void); // compute axis-aligned bounding box
@@ -598,7 +604,7 @@ class mjCFlex: public mjCBase {
void DelTexcoord(); // delete texcoord void DelTexcoord(); // delete texcoord
private: private:
mjCFlex(mjCModel* = 0); // constructor mjCFlex(mjCModel* = 0);
void Compile(const mjVFS* vfs); // compiler void Compile(const mjVFS* vfs); // compiler
void CreateBVH(void); // create flex BVH void CreateBVH(void); // create flex BVH
void CreateShellPair(void); // create shells and evpairs 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 rigid; // all vertices attached to the same body
bool centered; // all vertices coordinates (0,0,0) bool centered; // all vertices coordinates (0,0,0)
std::vector<int> vertbodyid; // vertex body ids 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> shell; // shell fragment vertex ids (dim per fragment)
std::vector<int> elemlayer; // element layer (distance from border) std::vector<int> elemlayer; // element layer (distance from border)
std::vector<int> evpair; // element-vertex pairs 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<float>& usertexcoord() const { return usertexcoord_; }
const std::vector<int>& userface() const { return userface_; } const std::vector<int>& userface() const { return userface_; }
// mesh properites computed by Compile // mesh properties computed by Compile
const double* aamm() const { return aamm_; } const double* aamm() const { return aamm_; }
// number of vertices, normals, texture coordinates, and faces // number of vertices, normals, texture coordinates, and faces