Browse Source

Add FBO source via ofxPiMapper directly insteat through getMediaServer

master
Krisjanis Rijnieks 11 years ago
parent
commit
d88fe23773
  1. 2
      example/src/ofApp.cpp
  2. 2
      src/MediaServer/MediaServer.h
  3. 4
      src/ofxPiMapper.cpp
  4. 6
      src/ofxPiMapper.h

2
example/src/ofApp.cpp

@ -7,7 +7,7 @@ void ofApp::setup() {
// FBO sources should be added before piMapper.setup() so the
// piMapper is able to load the source if it is assigned to
// a surface in XML settings.
piMapper.getMediaServer().addFboSource(customSource);
piMapper.addFboSource(customSource);
piMapper.setup();
// The info layer is hidden by default, press <i> to toggle

2
src/MediaServer/MediaServer.h

@ -52,7 +52,7 @@ class MediaServer {
std::string getDefaultMediaDir(int sourceType);
// Do things with FBO sources
void addFboSource(FboSource& fboSource);
void addFboSource(FboSource& fboSource); // could be called also as register FBO source
BaseSource* loadFboSource(std::string& fboSourceName);
void unloadFboSource(std::string& fboSourceName);

4
src/ofxPiMapper.cpp

@ -103,6 +103,10 @@ void ofxPiMapper::keyPressed(ofKeyEventArgs &args) {
}
} // keyPressed
void ofxPiMapper::addFboSource(ofx::piMapper::FboSource &fboSource) {
mediaServer.addFboSource(fboSource);
} // addFboSource
void ofxPiMapper::addTriangleSurface() {
int surfaceType = ofx::piMapper::SurfaceType::TRIANGLE_SURFACE;

6
src/ofxPiMapper.h

@ -4,6 +4,7 @@
#include "SurfaceManager.h"
#include "SurfaceManagerGui.h"
#include "MediaServer.h"
#include "FboSource.h"
#define PIMAPPER_DEF_SURFACES_XML_FILE "defaultSurfaces.xml"
#define PIMAPPER_USER_SURFACES_XML_FILE "surfaces.xml"
@ -17,7 +18,10 @@ public:
void draw(); // Called manually to make custom layering possible
void keyPressed(ofKeyEventArgs& args);
// TODO: Move these methods to SurfaceManager
// Use this to add custom FBO source
void addFboSource(ofx::piMapper::FboSource& fboSource);
// TODO: Copy/move these methods to SurfaceManager
void addTriangleSurface();
void addQuadSurface();

Loading…
Cancel
Save