Diff: Map/Obstacles/Obs_circle.cpp

Revision:

40:ca4dd3faffa8

Parent:

37:da3a2c781672

diff -r da3a2c781672 -r ca4dd3faffa8 Map/Obstacles/Obs_circle.cpp
--- a/Map/Obstacles/Obs_circle.cpp	Sat Feb 06 10:11:28 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#include "Obs_circle.h"
-
-Obs_circle::Obs_circle(float robotRadius, int id, float x, float y, float size):Obstacle(robotRadius,id)
-{
-    this->x = x;
-    this->y = y;
-    this->size2 = size*size;
-}
-
-int Obs_circle::height(float x, float y)
-{
-    if(!active)
-        return 0;
-    
-    float d = (x-this->x)*(x-this->x) + (y-this->y)*(y-this->y);
-    if(d <= size2) // On est dans le cercle
-    {
-        return 32000; // Interdit
-    }
-    else if(bigShape && d <= size2+robotRadius*robotRadius) // On est dans le grand cercle
-    {
-        if(!smoothBigShape)
-            return 32000; // Interdit
-        else
-        {
-            return 32000; // Interdit
-        }
-    }
-    return 0;
-}