Permalink
Browse files

testing

  • Loading branch information...
1 parent 78cb1d5 commit 5cfdaa4a91e4ddad521fd47bb529e6b411055258 @rtv committed Nov 5, 2011
Showing with 9 additions and 7 deletions.
  1. +1 −1 libstage/model.cc
  2. +1 −1 libstage/model_ranger.cc
  3. +3 −5 libstage/stage.hh
  4. +4 −0 todo.txt
View
@@ -268,7 +268,7 @@ Model::Model( World* world,
id(Model::count++),
interval((usec_t)1e5), // 100msec
interval_energy((usec_t)1e5), // 100msec
- interval_pose((usec_t)1e5), // 100msec
+ // interval_pose((usec_t)1e5), // 100msec
last_update(0),
log_state(false),
map_resolution(0.1),
@@ -295,7 +295,7 @@ void ModelRanger::Sensor::Visualize( ModelRanger::Vis* vis, ModelRanger* rgr ) c
{
if( sample_count > 1 )
// draw the filled polygon in transparent blue
- glDrawArrays( GL_POLYGON, 0, sample_count+1 );
+ glDrawArrays( GL_POLYGON, 0, sample_count );
}
glDepthMask( GL_TRUE );
View
@@ -1846,7 +1846,6 @@ namespace Stg
callbacks are called.*/
std::vector<std::set<cb_t> > callbacks;
-
/** Default color of the model's blocks.*/
Color color;
@@ -1888,13 +1887,12 @@ namespace Stg
} gui;
bool has_default_block;
-
-
+
/** unique process-wide identifier for this model */
uint32_t id;
usec_t interval; ///< time between updates in usec
usec_t interval_energy; ///< time between updates of powerpack in usec
- usec_t interval_pose; ///< time between updates of pose due to velocity in usec
+ // usec_t interval_pose; ///< time between updates of pose due to velocity in usec
usec_t last_update; ///< time of last update in us
bool log_state; ///< iff true, model state is logged
@@ -2054,7 +2052,7 @@ namespace Stg
usec_t GetUpdateInterval() const { return interval; }
usec_t GetEnergyInterval() const { return interval_energy; }
- usec_t GetPoseInterval() const { return interval_pose; }
+ // usec_t GetPoseInterval() const { return interval_pose; }
/** Render the model's blocks as an occupancy grid into the
preallocated array of width by height pixels */
View
@@ -23,6 +23,10 @@ OS X 16.20 (rev 7949)
14.5 (rev 8295) threads: 6: 13.7 3: 13.4
14.16 (rev 8329) threads 3: 13.4
+MBPi7 10.7 (4 threads) rev bc4d761 3 11.11.3
+ 35.6
+
+
MBA 17.3
MBA 23.1 (1 thread)
MBA 19.3 (2 threads)

0 comments on commit 5cfdaa4

Please sign in to comment.