patches from PRs

rtv · Apr 5, 2017 · 3ab37c4 · 3ab37c4
1 parent 508cb2b
commit 3ab37c4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/examples/ctrl/fasr2.cc b/examples/ctrl/fasr2.cc
@@ -203,7 +203,8 @@ class Robot
 
   Model* fuel_zone;
   //Model* pool_zone;
-  int avoidcount, randcount;
+  int avoidcount;
+  // int randcount;
   // int work_get, work_put;
   bool charger_ahoy;
   double charger_bearing;

diff --git a/libstage/model_bumper.cc b/libstage/model_bumper.cc
@@ -57,8 +57,8 @@ using namespace Stg;
 static const watts_t BUMPER_WATTS = 0.1; // bumper power consumption
 static const Color BUMPER_HIT_RGB(1, 0, 0, 1); // red
 static const Color BUMPER_NOHIT_RGB(0, 1, 0, 1);// green
-static const meters_t BUMPER_HIT_THICKNESS = 0.02;
-static const meters_t BUMPER_NOHIT_THICKNESS = 0.01;
+//static const meters_t BUMPER_HIT_THICKNESS = 0.02;
+//static const meters_t BUMPER_NOHIT_THICKNESS = 0.01;
 
 Option ModelBumper::showBumperData( "Show Bumper Data", "show_bumper", "", true, NULL );
 

diff --git a/libstage/typetable.cc b/libstage/typetable.cc
@@ -1,7 +1,6 @@
 #include "stage.hh"
 using namespace Stg;
 
-
 /* Create named wrappers for model constructors */
 template <class T>
 Model* Creator( World* world, Model* parent, const std::string& type )

diff --git a/worlds/fasr2.world b/worlds/fasr2.world
@@ -47,7 +47,7 @@ floorplan
 zone( color "red"
   pose [ 18.000 43.000 0 0 ]
   name "red_source"
-  ctrl "source 100 10"
+  ctrl "source 10 10"
 )
 
 zone( color "DarkRed"

diff --git a/worlds/large.world b/worlds/large.world
@@ -32,7 +32,7 @@ floorplan
   name "cave"
   size [1000.000 700.000 0.600]
   pose [0 0 0 0]
-  bitmap "bitmaps/SFU_800x600.png"
+  bitmap "bitmaps/SFU_1200x615.png"
 )