Permalink
Browse files

removed unused model_props file and folded model_getset and model_loa…

…d into model.cc.

for faster builds and fewer things
  • Loading branch information...
1 parent 41f999b commit 4de1b778640d93154cd55caf6d95075d4a41cb8e @rtv committed Dec 2, 2011
Showing with 523 additions and 1,097 deletions.
  1. +9 −8 libstage/CMakeLists.txt
  2. +1 −2 libstage/block.cc
  3. +497 −3 libstage/model.cc
  4. +1 −1 libstage/model_draw.cc
  5. +0 −208 libstage/model_getset.cc
  6. +0 −326 libstage/model_load.cc
  7. +0 −187 libstage/model_props.cc
  8. +0 −344 libstage/region.cc~
  9. +3 −4 libstage/stage.hh
  10. +12 −14 libstage/world.cc
View
@@ -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})
View
@@ -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 );
Oops, something went wrong.

0 comments on commit 4de1b77

Please sign in to comment.