Browse Source

Add ofxPiMapper::createSurface(SurfaceType)

master
Krisjanis Rijnieks 8 years ago
parent
commit
9e0b302e1f
  1. 5
      src/Application/Application.cpp
  2. 3
      src/Application/Application.h
  3. 4
      src/ofxPiMapper.cpp
  4. 2
      src/ofxPiMapper.h

5
src/Application/Application.cpp

@ -205,6 +205,11 @@ void Application::addFboSource(FboSource * fboSource){
_mediaServer.addFboSource(fboSource); _mediaServer.addFboSource(fboSource);
} }
void Application::createSurface(SurfaceType type){
getCmdManager()->exec(
new AddSurfaceCmd(getSurfaceManager(), type));
}
void Application::toggleInfo(){ void Application::toggleInfo(){
_info.toggle(); _info.toggle();
} }

3
src/Application/Application.h

@ -5,6 +5,7 @@
#include "SetApplicationModeCmd.h" #include "SetApplicationModeCmd.h"
#include "ClearSurfacesCmd.h" #include "ClearSurfacesCmd.h"
#include "SetPresetCmd.h" #include "SetPresetCmd.h"
#include "AddSurfaceCmd.h"
#include "ApplicationBaseMode.h" #include "ApplicationBaseMode.h"
#include "PresentationMode.h" #include "PresentationMode.h"
#include "ProjectionMappingMode.h" #include "ProjectionMappingMode.h"
@ -51,7 +52,7 @@ class Application : public KeyListener {
void addFboSource(FboSource & fboSource); void addFboSource(FboSource & fboSource);
void addFboSource(FboSource * fboSource); void addFboSource(FboSource * fboSource);
void createSurface(SurfaceType type);
void toggleInfo(); void toggleInfo();
void saveProject(); void saveProject();
bool loadXmlSettings(string fileName); bool loadXmlSettings(string fileName);

4
src/ofxPiMapper.cpp

@ -111,6 +111,10 @@ void ofxPiMapper::moveSelection(ofVec2f by){
_application.getState()->moveSelection(&_application, by); _application.getState()->moveSelection(&_application, by);
} }
void ofxPiMapper::createSurface(ofx::piMapper::SurfaceType type){
_application.createSurface(type);
}
void ofxPiMapper::saveProject(){ void ofxPiMapper::saveProject(){
_application.saveProject(); _application.saveProject();
} }

2
src/ofxPiMapper.h

@ -4,6 +4,7 @@
#include "ofLog.h" #include "ofLog.h"
#include "FboSource.h" #include "FboSource.h"
#include "Application.h" #include "Application.h"
#include "SurfaceType.h"
class ofxPiMapper { class ofxPiMapper {
public: public:
@ -58,6 +59,7 @@ class ofxPiMapper {
void selectPrevVertex(); void selectPrevVertex();
void togglePauseForSurface(unsigned int i); void togglePauseForSurface(unsigned int i);
void moveSelection(ofVec2f by); void moveSelection(ofVec2f by);
void createSurface(ofx::piMapper::SurfaceType type);
private: private:
ofx::piMapper::Application _application; ofx::piMapper::Application _application;

Loading…
Cancel
Save