diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp index bc3d5f0..cb2710a 100644 --- a/src/Application/Application.cpp +++ b/src/Application/Application.cpp @@ -210,6 +210,11 @@ void Application::createSurface(SurfaceType type){ new AddSurfaceCmd(getSurfaceManager(), type)); } +void Application::eraseSurface(int i){ + getCmdManager()->exec( + new RmSurfaceCmd(getSurfaceManager(), i)); +} + void Application::toggleInfo(){ _info.toggle(); } diff --git a/src/Application/Application.h b/src/Application/Application.h index 3303d54..f121947 100644 --- a/src/Application/Application.h +++ b/src/Application/Application.h @@ -6,6 +6,7 @@ #include "ClearSurfacesCmd.h" #include "SetPresetCmd.h" #include "AddSurfaceCmd.h" +#include "RmSurfaceCmd.h" #include "ApplicationBaseMode.h" #include "PresentationMode.h" #include "ProjectionMappingMode.h" @@ -53,6 +54,7 @@ class Application : public KeyListener { void addFboSource(FboSource & fboSource); void addFboSource(FboSource * fboSource); void createSurface(SurfaceType type); + void eraseSurface(int i); void toggleInfo(); void saveProject(); bool loadXmlSettings(string fileName); diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp index 98d2a05..cefc516 100644 --- a/src/ofxPiMapper.cpp +++ b/src/ofxPiMapper.cpp @@ -115,6 +115,13 @@ void ofxPiMapper::createSurface(ofx::piMapper::SurfaceType type){ _application.createSurface(type); } +void ofxPiMapper::eraseSurface(int i){ + cout << "numSurfaces: " << getNumSurfaces() << ", i: " << i << endl; + if(getNumSurfaces() > 0 && i < getNumSurfaces()){ + _application.eraseSurface(i); + } +} + void ofxPiMapper::saveProject(){ _application.saveProject(); } diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h index 7db77b1..9f6d98e 100644 --- a/src/ofxPiMapper.h +++ b/src/ofxPiMapper.h @@ -60,6 +60,7 @@ class ofxPiMapper { void togglePauseForSurface(unsigned int i); void moveSelection(ofVec2f by); void createSurface(ofx::piMapper::SurfaceType type); + void eraseSurface(int i); private: ofx::piMapper::Application _application;