Copybara import of the project:

--
3add02bc2e20eb2895fdcaedfdf6be271decb448 by Chengrui Zhu <jewelry.zju@gmail.com>:

correct spelling "Bunding" to "Bounding"

COPYBARA_INTEGRATE_REVIEW=https://github.com/google-deepmind/mujoco/pull/1068 from JewelryForge:main 3add02bc2e20eb2895fdcaedfdf6be271decb448
PiperOrigin-RevId: 568207690
Change-Id: I3262d459bfdbac6ebf097ddffc10c4d74b388946
This commit is contained in:
Chengrui Zhu
2023-09-25 07:06:04 -07:00
committed by Copybara-Service
parent d3d46e16a4
commit dff0bc2683
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -573,7 +573,7 @@ void mjCMesh::Compile(const mjVFS* vfs) {
if (tree_.bvh.empty()) { if (tree_.bvh.empty()) {
face_aabb_.assign(6*nface_, 0); face_aabb_.assign(6*nface_, 0);
for (int i=0; i<nface_; i++) { for (int i=0; i<nface_; i++) {
tree_.AddBundingVolume(GetBoundingVolume(i)); tree_.AddBoundingVolume(GetBoundingVolume(i));
} }
tree_.CreateBVH(); tree_.CreateBVH();
} }
+2 -2
View File
@@ -282,7 +282,7 @@ void mjCBoundingVolumeHierarchy::Set(mjtNum ipos_element[3], mjtNum iquat_elemen
// add geom to bvh // add geom to bvh
void mjCBoundingVolumeHierarchy::AddBundingVolume(const mjCBoundingVolume& bv) { void mjCBoundingVolumeHierarchy::AddBoundingVolume(const mjCBoundingVolume& bv) {
bvh_.push_back(bv); bvh_.push_back(bv);
} }
@@ -987,7 +987,7 @@ void mjCBody::Compile(void) {
if (!geoms.empty()) { if (!geoms.empty()) {
tree.Set(ipos, iquat); tree.Set(ipos, iquat);
for (int i=0; i<geoms.size(); i++) { for (int i=0; i<geoms.size(); i++) {
tree.AddBundingVolume(geoms[i]->GetBoundingVolume()); tree.AddBoundingVolume(geoms[i]->GetBoundingVolume());
} }
tree.CreateBVH(); tree.CreateBVH();
} }
+1 -1
View File
@@ -152,7 +152,7 @@ class mjCBoundingVolumeHierarchy {
// make bounding volume hierarchy // make bounding volume hierarchy
void CreateBVH(); void CreateBVH();
void Set(mjtNum ipos_element[3], mjtNum iquat_element[4]); void Set(mjtNum ipos_element[3], mjtNum iquat_element[4]);
void AddBundingVolume(const mjCBoundingVolume& bv); void AddBoundingVolume(const mjCBoundingVolume& bv);
private: private:
int MakeBVH(std::vector<mjCBoundingVolume>& elements, int lev = 0); int MakeBVH(std::vector<mjCBoundingVolume>& elements, int lev = 0);