Remove colliderAllocated flag
This commit is contained in:
parent
0a75b0ada3
commit
eb9db31d31
18 changed files with 44 additions and 117 deletions
|
|
@ -135,7 +135,7 @@ void EditTool::tool_update() {
|
|||
|
||||
drawP.compCache.traverse_bvh_run_function(mouseAABB, [&](const std::shared_ptr<DrawingProgramCacheBVHNode>& bvhNode, const std::vector<CollabListType::ObjectInfoPtr>& components) {
|
||||
for(auto& c : components) {
|
||||
if(c->pos > lastPos && c->obj->collides_with_world_coords(drawP.world.drawData.cam.c, cMouseAABB, drawP.colliderAllocated)) {
|
||||
if(c->pos > lastPos && c->obj->collides_with_world_coords(drawP.world.drawData.cam.c, cMouseAABB)) {
|
||||
lastSelectedObj = c;
|
||||
lastPos = c->pos;
|
||||
}
|
||||
|
|
@ -165,7 +165,7 @@ void EditTool::tool_update() {
|
|||
break;
|
||||
}
|
||||
}
|
||||
if(!isMovingPoint && !a->collides_with_cam_coords(drawP.world.drawData.cam.c, cMouseCircle, drawP.colliderAllocated))
|
||||
if(!isMovingPoint && !a->collides_with_cam_coords(drawP.world.drawData.cam.c, cMouseCircle))
|
||||
clickedAway = true;
|
||||
}
|
||||
else if(controls.pointDragging) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue