Browse Source

Remove ProjectionMappingMode::createSurface

Leave only Application::createSurface
master
Krisjanis Rijnieks 8 years ago
parent
commit
17d7b95760
  1. 13
      src/Application/Modes/ProjectionMappingMode.cpp
  2. 2
      src/Application/Modes/ProjectionMappingMode.h

13
src/Application/Modes/ProjectionMappingMode.cpp

@ -53,19 +53,19 @@ void ProjectionMappingMode::onKeyPressed(Application * app, ofKeyEventArgs & arg
switch(args.key){ switch(args.key){
case 't': case 't':
createSurface(app, SurfaceType::TRIANGLE_SURFACE); app->createSurface(SurfaceType::TRIANGLE_SURFACE);
break; break;
case 'q': case 'q':
createSurface(app, SurfaceType::QUAD_SURFACE); app->createSurface(SurfaceType::QUAD_SURFACE);
break; break;
case 'g': case 'g':
createSurface(app, SurfaceType::GRID_WARP_SURFACE); app->createSurface(SurfaceType::GRID_WARP_SURFACE);
break; break;
case 'h': case 'h':
createSurface(app, SurfaceType::HEXAGON_SURFACE); app->createSurface(SurfaceType::HEXAGON_SURFACE);
break; break;
case OF_KEY_BACKSPACE: case OF_KEY_BACKSPACE:
@ -355,10 +355,5 @@ void ProjectionMappingMode::moveSelection(Application * app, ofVec2f by){
app->getSurfaceManager(), by)); app->getSurfaceManager(), by));
} }
void ProjectionMappingMode::createSurface(Application *app, SurfaceType type){
app->getCmdManager()->exec(
new AddSurfaceCmd(app->getSurfaceManager(), type));
}
} // namespace piMapper } // namespace piMapper
} // namespace ofx } // namespace ofx

2
src/Application/Modes/ProjectionMappingMode.h

@ -4,7 +4,6 @@
#include "ofEvents.h" #include "ofEvents.h"
#include "ofLog.h" #include "ofLog.h"
#include "ofGraphics.h" #include "ofGraphics.h"
#include "AddSurfaceCmd.h"
#include "SelNextSurfaceCmd.h" #include "SelNextSurfaceCmd.h"
#include "SelPrevSurfaceCmd.h" #include "SelPrevSurfaceCmd.h"
#include "SelNextVertexCmd.h" #include "SelNextVertexCmd.h"
@ -49,7 +48,6 @@ class ProjectionMappingMode : public ApplicationBaseMode {
void selectNextVertex(Application * app); void selectNextVertex(Application * app);
void selectPrevVertex(Application * app); void selectPrevVertex(Application * app);
void moveSelection(Application * app, ofVec2f by); void moveSelection(Application * app, ofVec2f by);
void createSurface(Application * app, SurfaceType type);
private: private:
ProjectionMappingMode(); ProjectionMappingMode();

Loading…
Cancel
Save