diff options
author | Alex Auvolat <alex.auvolat@ens.fr> | 2015-02-02 00:16:43 +0100 |
---|---|---|
committer | Alex Auvolat <alex.auvolat@ens.fr> | 2015-02-02 00:16:43 +0100 |
commit | 8d0312f1e4d348e8e2fd1f7198770f34f1d3a2b9 (patch) | |
tree | 48ceada8a286a1fdee31eeca15fc163a6d2037e6 /problem.cpp | |
parent | 0ff287ed38956c0a15f2a8ab503cb1b8253f706d (diff) | |
parent | a8909f1a5c0a3b3d712a0b7417f13c31cb57ddc2 (diff) | |
download | Robotique-Projet-8d0312f1e4d348e8e2fd1f7198770f34f1d3a2b9.tar.gz Robotique-Projet-8d0312f1e4d348e8e2fd1f7198770f34f1d3a2b9.zip |
Merge branch 'master' of https://github.com/Alexis211/Robotique
Diffstat (limited to 'problem.cpp')
-rw-r--r-- | problem.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/problem.cpp b/problem.cpp index 31cebe7..de6461e 100644 --- a/problem.cpp +++ b/problem.cpp @@ -66,6 +66,7 @@ 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 ; return false; } |