Browse Source

Improve Application::eraseSurface()

master
Krisjanis Rijnieks 8 years ago
parent
commit
76cfd74898
  1. 5
      src/Application/Application.cpp
  2. 8
      src/Application/Modes/ProjectionMappingMode.cpp
  3. 1
      src/Application/Modes/ProjectionMappingMode.h

5
src/Application/Application.cpp

@ -211,8 +211,9 @@ void Application::createSurface(SurfaceType type){
}
void Application::eraseSurface(int i){
getCmdManager()->exec(
new RmSurfaceCmd(getSurfaceManager(), i));
if(i >= 0 && i < getSurfaceManager()->getActivePreset()->getSurfaces().size()){
getCmdManager()->exec(new RmSurfaceCmd(getSurfaceManager(), i));
}
}
void Application::setInfoText(string text){

8
src/Application/Modes/ProjectionMappingMode.cpp

@ -69,13 +69,7 @@ void ProjectionMappingMode::onKeyPressed(Application * app, ofKeyEventArgs & arg
break;
case OF_KEY_BACKSPACE:
if(app->getSurfaceManager()->getSelectedSurface() == 0){
break;
}
app->getCmdManager()->exec(
new RmSurfaceCmd(
app->getSurfaceManager(),
app->getSurfaceManager()->getSelectedSurfaceIndex()));
app->eraseSurface(app->getSurfaceManager()->getSelectedSurfaceIndex());
break;
case 'p':

1
src/Application/Modes/ProjectionMappingMode.h

@ -5,7 +5,6 @@
#include "ofLog.h"
#include "ofGraphics.h"
#include "AddSurfaceCmd.h"
#include "RmSurfaceCmd.h"
#include "AddGridRowCmd.h"
#include "RmGridRowCmd.h"
#include "AddGridColCmd.h"

Loading…
Cancel
Save