cleaning up

Author: rtv

libstage/model_ranger.cc

@@ -235,7 +235,7 @@ void ModelRanger::Sensor::Visualize( ModelRanger::Vis* vis, ModelRanger* rgr ) c
 	//glTranslatef( 0,0, ranger->GetGeom().size.z/2.0 ); // shoot the ranger beam out at the right height
 
 	// pack the ranger hit points into a vertex array for fast rendering
-	static std::vector<GLfloat> pts;
+	std::vector<GLfloat> pts;
 	pts.resize( 2 * (sample_count+1) );
 	glVertexPointer( 2, GL_FLOAT, 0, &pts[0] );       
 

libstage/stage.hh

@@ -725,11 +725,11 @@ namespace Stg
 	 void SetProperty( std::string& key, void* value ){ props[ key ] = value; }
 
 	 /** A key-value database for users to associate arbitrary things with this model. */
-	 void* GetProperty( std::string& key )
-	 {
-		std::map<std::string,void*>::iterator it = props.find( key );		
-		return( it == props.end() ? NULL : it->second );
-	 }
+		void* GetProperty( std::string& key )
+		{
+			std::map<std::string,void*>::iterator it = props.find( key );		
+			return( it == props.end() ? NULL : it->second );
+		}
   };
 
   /** raytrace sample

libstage/worldgui.cc

@@ -189,6 +189,7 @@ WorldGui::WorldGui(int W,int H,const char* L) :
   canvas( new Canvas( this,0,30,W,H-30 ) ),
   drawOptions(),
   fileMan( new FileManager() ),
+	interval_log(),
   speedup(1.0), // real time
   mbar( new Fl_Menu_Bar(0,0, W, 30)),
   oDlg( NULL ),
@@ -198,12 +199,11 @@ WorldGui::WorldGui(int W,int H,const char* L) :
   real_time_recorded( real_time_now ),
   timing_interval( 20 )
 {
-  Fl::scheme( "gtk+" );
+  Fl::scheme( "" );
   resizable(canvas);
-  
-  end();
-  
   label( PROJECT );
+
+  end();
 
   // make this menu's shortcuts work whoever has focus
   mbar->global();