Diff: Map/map.cpp

Revision:

54:be4ea8da9057

Parent:

52:98f8a6ccb6ae

Child:

55:dfeee9e5c0af

--- a/Map/map.cpp	Wed May 04 16:21:48 2016 +0000
+++ b/Map/map.cpp	Wed May 04 16:25:54 2016 +0000
@@ -3,39 +3,39 @@
 map::map (Odometry* nodo) : Codo(nodo) {
 }
 
-void map::Build (int start_type) {
-    m.addObs(obsCarr (800, 100, 100, 15));
-    m.addObs(obsCarr (2200, 100, 100, 15));
+void map::Build (int couleur, int formation) {
+    addObs(obsCarr (800, 100, 100, 15));
+    addObs(obsCarr (2200, 100, 100, 15));
     
-    m.addObs(obsCarr (1500, 750, 1100, 15));
-    m.addObs(obsCarr (1500, 1050, 20, 300));
+    addObs(obsCarr (1500, 750, 1100, 15));
+    addObs(obsCarr (1500, 1050, 20, 300));
     
     if (start_type == MAP_RIGHTSIDE) { 
-        m.addObs(obsCarr (0, 2000, 250, 150));  // Coté haut droite
-        m.addObs(obsCarr (200, 2000, 200, 50));
+        addObs(obsCarr (0, 2000, 250, 150));  // Coté haut droite
+        addObs(obsCarr (200, 2000, 200, 50));
         
-        m.addObs(obsCarr (3000, 2000, 250, 150));     // Coté bas droite
-        m.addObs(obsCarr (2800, 2000, 200, 50));
+        addObs(obsCarr (3000, 2000, 250, 150));     // Coté bas droite
+        addObs(obsCarr (2800, 2000, 200, 50));
         
-        m.addObs(obsCarr (200, 2000-450, 40, 40));   // Coquillages du haut droit
-        m.addObs(obsCarr (200, 2000-750, 40, 40));
+        addObs(obsCarr (200, 2000-450, 40, 40));   // Coquillages du haut droit
+        addObs(obsCarr (200, 2000-750, 40, 40));
         
-        m.addObs(obsCarr (900, 2000-550, 40, 40));
-        m.addObs(obsCarr (1200, 2000-350, 40, 40)); // Coquillages du milieu/haut
+        addObs(obsCarr (900, 2000-550, 40, 40));
+        addObs(obsCarr (1200, 2000-350, 40, 40)); // Coquillages du milieu/haut
         
-        m.addObs(obsCarr (1500, 2000-550, 40, 40));
-        m.addObs(obsCarr (1500, 2000-350, 40, 40)); 
+        addObs(obsCarr (1500, 2000-550, 40, 40));
+        addObs(obsCarr (1500, 2000-350, 40, 40)); 
         
-        m.addObs(obsCarr (3000-900, 2000-550, 40, 40));
-        m.addObs(obsCarr (3000-1200, 2000-350, 40, 40));   
+        addObs(obsCarr (3000-900, 2000-550, 40, 40));
+        addObs(obsCarr (3000-1200, 2000-350, 40, 40));   
         
-        m.addObs(obsCarr (3000-200, 2000-450, 40, 40));   // Coquillages du bas droite
-        m.addObs(obsCarr (3000-200, 2000-750, 40, 40));
+        addObs(obsCarr (3000-200, 2000-450, 40, 40));   // Coquillages du bas droite
+        addObs(obsCarr (3000-200, 2000-750, 40, 40));
     }
     else {
-        m.addObs(obsCarr (1250, 1000, 220, 220));
-        m.addObs(obsCarr (1500, 750, 220, 220));
-        m.addObs(obsCarr (1500, 1250, 220, 220));   
+        addObs(obsCarr (1250, 1000, 220, 220));
+        addObs(obsCarr (1500, 750, 220, 220));
+        addObs(obsCarr (1500, 1250, 220, 220));   
     }
 }