removed unused model_props file and folded model_getset and model_loa…

…d into model.cc.

for faster builds and fewer things

libstage/CMakeLists.txt

@@ -20,10 +20,8 @@ set( stageSrcs
 	model_camera.cc
 	model_draw.cc
 	model_fiducial.cc
-	model_getset.cc
 	model_gripper.cc
 	model_lightindicator.cc
-	model_load.cc
 	model_position.cc
 	model_ranger.cc
 	option.cc
@@ -35,14 +33,17 @@ set( stageSrcs
 	typetable.cc		
 	world.cc			
 	worldfile.cc		
-  canvas.cc 
-  options_dlg.cc
-  options_dlg.hh
-  vis_strip.cc			
-  worldgui.cc 
-  ancestor.cc
+	canvas.cc 
+	options_dlg.cc
+	options_dlg.hh
+	vis_strip.cc			
+	worldgui.cc 
+	ancestor.cc
 )
 
+#	model_getset.cc
+#	model_load.cc
+
 #set_source_files_properties( ${stageSrcs} PROPERTIES COMPILE_FLAGS" )
 
 add_library(stage SHARED ${stageSrcs})

libstage/block.cc

@@ -209,8 +209,7 @@ void Block::Map( unsigned int layer )
     }
 
   // now calculate the global pixel coords of the block vertices
-  std::vector<point_int_t> gpts;
-  mod->LocalToPixels( mpts, gpts );
+  const std::vector<point_int_t> gpts = mod->LocalToPixels( mpts );
 
   // and render this block's polygon into the world
   mod->world->MapPoly( gpts, this, layer );