Commit dc1a8d80 authored by root's avatar root

Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique

parents fcbb5a76 0272e120
...@@ -49,8 +49,6 @@ int Cabine::update() ...@@ -49,8 +49,6 @@ int Cabine::update()
else if (status == 2) { else if (status == 2) {
// A faire, ne pas hardcoder la position
if (Command::isNear(position_depart, 10.0f)) // le second paramètre est la distance a l'objectif if (Command::isNear(position_depart, 10.0f)) // le second paramètre est la distance a l'objectif
{ {
#ifndef ROBOTHW #ifndef ROBOTHW
......
...@@ -42,8 +42,8 @@ Krabi2016::Krabi2016(bool isYellow) : StrategieV3(isYellow) ...@@ -42,8 +42,8 @@ Krabi2016::Krabi2016(bool isYellow) : StrategieV3(isYellow)
// Pieds // Pieds
int pa = Etape::makeEtape(new RamasserPied(Position(970, 260, true))); int pa = Etape::makeEtape(new RamasserPied(Position(1100, 280, true)));
int pb = Etape::makeEtape(new RamasserPied(Position(1200, 260, true))); int pb = Etape::makeEtape(new RamasserPied(Position(1300, 280, true)));
// Cabines de plage // Cabines de plage
int cp1 = Etape::makeEtape(new Cabine(Position(250, 50, true), wd_position)); int cp1 = Etape::makeEtape(new Cabine(Position(250, 50, true), wd_position));
...@@ -53,15 +53,19 @@ Krabi2016::Krabi2016(bool isYellow) : StrategieV3(isYellow) ...@@ -53,15 +53,19 @@ Krabi2016::Krabi2016(bool isYellow) : StrategieV3(isYellow)
/** Liens **/ /** Liens **/
// [WIP] // [WIP]
Etape::get(start) ->addVoisin(wa); Etape::get(start) ->addVoisin(wa);
Etape::get(wa) ->addVoisin(wb, zc2); Etape::get(wa) ->addVoisin(wb);
Etape::get(wc) ->addVoisin(zc1);
Etape::get(cd1) ->addVoisin(wa); Etape::get(cd1) ->addVoisin(wa);
Etape::get(wc) ->addVoisin(zc1);
Etape::get(wc) ->addVoisin(zc2);
Etape::get(wc) ->addVoisin(pa);
Etape::get(cp1) ->addVoisin(wd); Etape::get(cp1) ->addVoisin(wd);
Etape::get(cp2) ->addVoisin(wd); Etape::get(cp2) ->addVoisin(wd);
Etape::get(wc) ->addVoisin(zc2);
Etape::get(wd) ->addVoisin(wb); Etape::get(wd) ->addVoisin(wb);
Etape::get(pa) ->addVoisin(wb, zc2); Etape::get(pa) ->addVoisin(wb);
Etape::get(pb) ->addVoisin(pa, zc2); Etape::get(pb) ->addVoisin(pa);
#ifndef ROBOTHW #ifndef ROBOTHW
qDebug() << Etape::getTotalEtapes(); qDebug() << Etape::getTotalEtapes();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment