Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hrpCollision] add ColdetModelPair::operator=() #136

Merged
merged 1 commit into from
Jul 9, 2018
Merged

[hrpCollision] add ColdetModelPair::operator=() #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions hrplib/hrpCollision/ColdetModelPair.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,3 +967,10 @@ int ColdetModelPair::calculateIntersection(std::vector<float> &x, std::vector<fl

return t.size();
}

ColdetModelPair& ColdetModelPair::operator=(const ColdetModelPair& org)
{
collisionPairInserter = new CollisionPairInserter;
set(org.models[0], org.models[1]);
tolerance_ = org.tolerance_;
}
1 change: 1 addition & 0 deletions hrplib/hrpCollision/ColdetModelPair.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ namespace hrp {
bool isInsideTriangle(float x, float y, const std::vector<float> &vx, const std::vector<float> &vy);

int calculateIntersection(std::vector<float> &x, std::vector<float> &y, float radius, float x1, float y1, float x2, float y2);
ColdetModelPair& operator=(const ColdetModelPair& cmp);

private:
std::vector<collision_data>& detectCollisionsSub(bool detectAllContacts);
Expand Down