Cambiamos nombre de parámetros y origen en componente BOX

titos-carrasco · Jun 16, 2021 · 25b4a2c · 25b4a2c
1 parent b22b2c3
commit 25b4a2c
Show file tree

Hide file tree

Showing 9 changed files with 1,972,307 additions and 25 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,11 +1,19 @@
 # ChangeLog
 
+## @v.1.1.1 - 2021-06-15
+
+### Changed
+- Renombramos parámetros l1 y l2 de la definición del elemento BOX
+- Cambiamos interpretación de origen (x,y) en componente BOX. Pasa de (center, center) a (left, bottom)
+
+
 ## @v.1.1.0 - 2021-06-12
 
 ### Changed
 - Migramos a jsoncpp
 - Corrige primera linea del protocolo para manejarla en formato json
 
+
 ## @v1.0.1 2021-06-11
 
 ### Added
@@ -14,6 +22,7 @@
 ### Fixed
 - Corrige timeout en socket
 
+
 ## @@ - 2021-06-09
 
 ### Fixed

diff --git a/cpp_server/src/RobotWorld.cpp b/cpp_server/src/RobotWorld.cpp
@@ -170,16 +170,16 @@ RobotWorld::RobotWorld( std::string world_file_name ) :
 
             double x = entry.get( "x", -1 ).asDouble();
             double y = entry.get( "y", -1 ).asDouble();
-            double l1 = entry.get( "l1", -1 ).asDouble();
-            double l2 = entry.get( "l2", -1 ).asDouble();
+            double sizex = entry.get( "sizex", -1 ).asDouble();
+            double sizey = entry.get( "sizey", -1 ).asDouble();
             double height = entry.get( "height", -1 ).asDouble();
             double mass = entry.get( "mass", -2 ).asDouble();
             std::string color = entry.get( "color", "_UNDEF_" ).asString();
 
             if( x < 0 ||
                 y < 0 ||
-                l1 <= 0 ||
-                l2 <= 0 ||
+                sizex <= 0 ||
+                sizey <= 0 ||
                 height <= 0 ||
                 mass <= -2 ||
                 color.compare( "_UNDEF_" ) == 0 )
@@ -191,9 +191,9 @@ RobotWorld::RobotWorld( std::string world_file_name ) :
             {
 
                 Enki::PhysicalObject* o = new Enki::PhysicalObject();
-                o->setRectangular( l1, l2, height, mass );
+                o->setRectangular( sizex, sizey, height, mass );
                 o->setColor( colors[ color ]  );
-                o->pos = Enki::Point( x, y );
+                o->pos = Enki::Point( x + sizex/2, y + sizey/2 );
                 o->angle = entry.get( "angle", .0 ).asDouble()*(M_PI/180.0);
                 world->addObject( o );
             }

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 SETUP = {
     "name"             : "robworld",
-    "version"          : "1.1.0",
+    "version"          : "1.1.1",
     "description"      : "Control de robots en el mundo de robots",
     "license"          : "MIT",
     "author"           : "Roberto Carrasco",

diff --git a/test/worlds/epuck.world b/test/worlds/epuck.world
@@ -7,9 +7,9 @@
 
     { "type":"world", "width":100, "height":100, "walls":5, "color":"gray", "ground": "", "host":"", "port":44444 },
 
-    { "type":"box", "x":50, "y":69, "l1":38, "l2":2, "height":10, "mass":1000, "color":"red" },
+    { "type":"box", "x":32, "y":68, "sizex":38, "sizey":2, "height":10, "mass":1000, "color":"red" },
     { "type":"cylinder", "x":15, "y":50, "radius":3, "height":10, "mass":1000, "color":"green" },
-    { "type":"box", "x":50, "y":20, "l1":38, "l2":2, "height":10, "mass":1000, "color":"blue" },
+    { "type":"box", "x":32, "y":30, "sizex":38, "sizey":2, "height":10, "mass":1000, "color":"blue" },
 
     { "type":"epuck", "name":"Epuck-01", "x":50, "y":50, "angle":0 }
 ]
diff --git a/test/worlds/marxbot.world b/test/worlds/marxbot.world
@@ -6,10 +6,10 @@
 
     { "type":"world", "width":100, "height":100, "walls": 5, "color":"gray", "ground": "sumo.ppm", "host":"", "port":44444  },
 
-    { "type":"box", "x":30, "y":50, "l1":2, "l2":40, "height":10, "mass":-1, "color":"green" },
-    { "type":"box", "x":70, "y":50, "l1":2, "l2":40, "height":10, "mass":1000, "color":"blue" },
-    { "type":"box", "x":50, "y":31, "l1":38, "l2":2, "height":10, "mass":1000, "color":"red" },
-    { "type":"box", "x":50, "y":69, "l1":38, "l2":2, "height":10, "mass":1000, "color":"gray" },
+    { "type":"box", "x":30, "y":30, "sizex":2, "sizey":40, "height":10, "mass":-1, "color":"green" },
+    { "type":"box", "x":70, "y":30, "sizex":2, "sizey":40, "height":10, "mass":1000, "color":"blue" },
+    { "type":"box", "x":32, "y":30, "sizex":38, "sizey":2, "height":10, "mass":1000, "color":"red" },
+    { "type":"box", "x":32, "y":68, "sizex":38, "sizey":2, "height":10, "mass":1000, "color":"gray" },
     { "type":"cylinder", "x":15, "y":50, "radius":3, "height":10, "mass":1000, "color":"gray" },
 
     { "type":"marxbot", "name":"Marxbot-01", "x":50, "y":50, "angle":0 }