Browse Source

Add ofxPiMapper::selectNext and PrevVertex()

master
Krisjanis Rijnieks 9 years ago
parent
commit
08b6e1e13d
  1. 2
      src/Application/Modes/ApplicationBaseMode.h
  2. 12
      src/Application/Modes/ProjectionMappingMode.cpp
  3. 2
      src/Application/Modes/ProjectionMappingMode.h
  4. 8
      src/ofxPiMapper.cpp
  5. 2
      src/ofxPiMapper.h

2
src/Application/Modes/ApplicationBaseMode.h

@ -36,6 +36,8 @@ class ApplicationBaseMode {
virtual void selectSurface(Application * app, int i){}
virtual void selectNextSurface(Application * app){}
virtual void selectPrevSurface(Application * app){}
virtual void selectNextVertex(Application * app){}
virtual void selectPrevVertex(Application * app){}
virtual void moveSelection(Application * app, ofVec2f by){}
};

12
src/Application/Modes/ProjectionMappingMode.cpp

@ -452,6 +452,18 @@ void ProjectionMappingMode::selectPrevSurface(Application * app){
}
}
void ProjectionMappingMode::selectNextVertex(Application * app){
if(app->getSurfaceManager()->getSelectedSurface() != 0){
app->getCmdManager()->exec(new SelNextVertexCmd(app->getSurfaceManager()));
}
}
void ProjectionMappingMode::selectPrevVertex(Application * app){
if(app->getSurfaceManager()->getSelectedSurface() != 0){
app->getCmdManager()->exec(new SelPrevVertexCmd(app->getSurfaceManager()));
}
}
void ProjectionMappingMode::moveSelection(Application * app, ofVec2f by){
app->getCmdManager()->exec(
new MvSelectionCmd(

2
src/Application/Modes/ProjectionMappingMode.h

@ -58,6 +58,8 @@ class ProjectionMappingMode : public ApplicationBaseMode {
void selectSurface(Application * app, int i);
void selectNextSurface(Application * app);
void selectPrevSurface(Application * app);
void selectNextVertex(Application * app);
void selectPrevVertex(Application * app);
void moveSelection(Application * app, ofVec2f by);
private:

8
src/ofxPiMapper.cpp

@ -52,6 +52,14 @@ void ofxPiMapper::selectPrevSurface(){
_application.getState()->selectPrevSurface(&_application);
}
void ofxPiMapper::selectNextVertex(){
_application.getState()->selectNextVertex(&_application);
}
void ofxPiMapper::selectPrevVertex(){
_application.getState()->selectPrevVertex(&_application);
}
void ofxPiMapper::togglePauseForSurface(unsigned int i){
ofx::piMapper::BaseSource * s =
_application.getSurfaceManager()->getActivePreset()->getSurfaces().at(i)->getSource();

2
src/ofxPiMapper.h

@ -59,6 +59,8 @@ class ofxPiMapper {
void selectSurface(int i);
void selectNextSurface();
void selectPrevSurface();
void selectNextVertex();
void selectPrevVertex();
void togglePauseForSurface(unsigned int i);
void moveSelection(ofVec2f by);

Loading…
Cancel
Save