aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2015-02-02 00:43:28 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2015-02-02 00:43:28 +0100
commitf59e5a6e0acede51daa9d3bf5e408ec370037d8d (patch)
tree8821368e564aba3e60b5ee44d18b20fe71a917af
parentcd601db8bf7c3f8a8af398c1a7ab35ee9e352e83 (diff)
parent582e13dcafe9a33c8d04b469bb7efafc0f6b7687 (diff)
downloadRobotique-Projet-f59e5a6e0acede51daa9d3bf5e408ec370037d8d.tar.gz
Robotique-Projet-f59e5a6e0acede51daa9d3bf5e408ec370037d8d.zip
Merge branch 'master' of https://github.com/Alexis211/Robotique
-rw-r--r--problem.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/problem.cpp b/problem.cpp
index e37595b..0651808 100644
--- a/problem.cpp
+++ b/problem.cpp
@@ -66,7 +66,8 @@ bool hilare_a_mvt::intersects(const obstacle &o) const {
return false;
}
- if (o.c.r >= segment(from.pos(),to.pos()).dist(o.c.c))return true ;
+ if (o.c.r + p->r_c_car >= segment(from.pos(),to.pos()).dist(o.c.c)) return true ;
+ if (o.c.r + p->r_c_trolley >= segment(from.pos_trolley(),to.pos_trolley()).dist(o.c.c)) return true ;
return false;
}