From 9e0b302e1f27e80ccd0ee35822233762611752ac Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Fri, 20 Jan 2017 20:22:37 +0200 Subject: [PATCH] Add ofxPiMapper::createSurface(SurfaceType) --- src/Application/Application.cpp | 5 +++++ src/Application/Application.h | 3 ++- src/ofxPiMapper.cpp | 4 ++++ src/ofxPiMapper.h | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp index 9e0f292..bc3d5f0 100644 --- a/src/Application/Application.cpp +++ b/src/Application/Application.cpp @@ -205,6 +205,11 @@ void Application::addFboSource(FboSource * fboSource){ _mediaServer.addFboSource(fboSource); } +void Application::createSurface(SurfaceType type){ + getCmdManager()->exec( + new AddSurfaceCmd(getSurfaceManager(), type)); +} + void Application::toggleInfo(){ _info.toggle(); } diff --git a/src/Application/Application.h b/src/Application/Application.h index 73a00f4..3303d54 100644 --- a/src/Application/Application.h +++ b/src/Application/Application.h @@ -5,6 +5,7 @@ #include "SetApplicationModeCmd.h" #include "ClearSurfacesCmd.h" #include "SetPresetCmd.h" +#include "AddSurfaceCmd.h" #include "ApplicationBaseMode.h" #include "PresentationMode.h" #include "ProjectionMappingMode.h" @@ -51,7 +52,7 @@ class Application : public KeyListener { void addFboSource(FboSource & fboSource); void addFboSource(FboSource * fboSource); - + void createSurface(SurfaceType type); void toggleInfo(); void saveProject(); bool loadXmlSettings(string fileName); diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp index 1e994a0..98d2a05 100644 --- a/src/ofxPiMapper.cpp +++ b/src/ofxPiMapper.cpp @@ -111,6 +111,10 @@ void ofxPiMapper::moveSelection(ofVec2f by){ _application.getState()->moveSelection(&_application, by); } +void ofxPiMapper::createSurface(ofx::piMapper::SurfaceType type){ + _application.createSurface(type); +} + void ofxPiMapper::saveProject(){ _application.saveProject(); } diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h index 78d9511..7db77b1 100644 --- a/src/ofxPiMapper.h +++ b/src/ofxPiMapper.h @@ -4,6 +4,7 @@ #include "ofLog.h" #include "FboSource.h" #include "Application.h" +#include "SurfaceType.h" class ofxPiMapper { public: @@ -58,6 +59,7 @@ class ofxPiMapper { void selectPrevVertex(); void togglePauseForSurface(unsigned int i); void moveSelection(ofVec2f by); + void createSurface(ofx::piMapper::SurfaceType type); private: ofx::piMapper::Application _application;