Browse Source

Change example code style using ofStyler

master
Krisjanis Rijnieks 10 years ago
parent
commit
6962935612
  1. 42
      example/src/CrossSource.cpp
  2. 6
      example/src/CrossSource.h
  3. 64
      example/src/CustomSource.cpp
  4. 18
      example/src/CustomSource.h
  5. 52
      example/src/main.cpp
  6. 42
      example/src/ofApp.cpp
  7. 18
      example/src/ofApp.h

42
example/src/CrossSource.cpp

@ -1,26 +1,26 @@
#include "CrossSource.h" #include "CrossSource.h"
CrossSource::CrossSource() { CrossSource::CrossSource(){
name = "Cross FBO Source"; name = "Cross FBO Source";
allocate(500, 500); allocate(500, 500);
} }
void CrossSource::draw() { void CrossSource::draw(){
ofClear(0); ofClear(0);
ofSetColor(255, 255, 0, 255); ofSetColor(255, 255, 0, 255);
ofRect(0, 0, getWidth(), getHeight()); ofRect(0, 0, getWidth(), getHeight());
ofSetColor(0, 0, 0, 255); ofSetColor(0, 0, 0, 255);
ofSetLineWidth(5); ofSetLineWidth(5);
float y = sin( float(ofGetFrameNum()) / 10.0f ) * 100.0f; float y = sin(float(ofGetFrameNum()) / 10.0f) * 100.0f;
ofPoint startPoint = ofPoint(10, y); ofPoint startPoint = ofPoint(10, y);
ofPoint endPoint = ofPoint(getWidth() - 10, getHeight() - y); ofPoint endPoint = ofPoint(getWidth() - 10, getHeight() - y);
ofLine(startPoint, endPoint); ofLine(startPoint, endPoint);
float tempY = startPoint.y; float tempY = startPoint.y;
startPoint.y = endPoint.y; startPoint.y = endPoint.y;
endPoint.y = tempY; endPoint.y = tempY;
ofLine(startPoint, endPoint); ofLine(startPoint, endPoint);
} }

6
example/src/CrossSource.h

@ -4,8 +4,8 @@
#include "FboSource.h" #include "FboSource.h"
class CrossSource : public ofx::piMapper::FboSource { class CrossSource : public ofx::piMapper::FboSource {
public: public:
CrossSource(); CrossSource();
void draw(); void draw();
}; };

64
example/src/CustomSource.cpp

@ -1,42 +1,42 @@
#include "CustomSource.h" #include "CustomSource.h"
CustomSource::CustomSource() { CustomSource::CustomSource(){
// Give our source a decent name // Give our source a decent name
name = "Custom FBO Source"; name = "Custom FBO Source";
// Allocate our FBO source, decide how big it should be // Allocate our FBO source, decide how big it should be
allocate(500, 500); allocate(500, 500);
// Genereate rects to be rendered into the FBO // Genereate rects to be rendered into the FBO
int numRects = 20; // change this to add more or less rects int numRects = 20; // change this to add more or less rects
for (int i = 0; i < numRects; i++) { for(int i = 0; i < numRects; i++){
rects.push_back(ofRectangle(0, rects.push_back(ofRectangle(0,
ofRandom(fbo->getHeight()), ofRandom(fbo->getHeight()),
fbo->getWidth(), fbo->getWidth(),
ofRandom(20))); ofRandom(20)));
rectSpeeds.push_back((1.0f + ofRandom(5))); rectSpeeds.push_back((1.0f + ofRandom(5)));
} }
} }
// Don't do any drawing here // Don't do any drawing here
void CustomSource::update() { void CustomSource::update(){
// Move rects // Move rects
for (int i = 0; i < rects.size(); i++) { for(int i = 0; i < rects.size(); i++){
rects[i].y += rectSpeeds[i]; rects[i].y += rectSpeeds[i];
if (rects[i].y > fbo->getHeight()) { if(rects[i].y > fbo->getHeight()){
rects[i].y = -rects[i].getHeight(); rects[i].y = -rects[i].getHeight();
} }
} }
} }
// No need to take care of fbo.begin() and fbo.end() here. // No need to take care of fbo.begin() and fbo.end() here.
// All within draw() is being rendered into fbo; // All within draw() is being rendered into fbo;
void CustomSource::draw() { void CustomSource::draw(){
// Fill FBO with our rects // Fill FBO with our rects
ofClear(0); ofClear(0);
//ofBackground(0); //ofBackground(0);
ofSetColor(255); ofSetColor(255);
for (int i = 0; i < rects.size(); i++) { for(int i = 0; i < rects.size(); i++){
ofRect(rects[i]); ofRect(rects[i]);
} }
} }

18
example/src/CustomSource.h

@ -4,15 +4,15 @@
#include "FboSource.h" #include "FboSource.h"
class CustomSource : public ofx::piMapper::FboSource { class CustomSource : public ofx::piMapper::FboSource {
public: public:
CustomSource(); CustomSource();
// These are overrides of FboSource virtual functions. // These are overrides of FboSource virtual functions.
// FBO sources are not executing before they have been assigned to a surface. // FBO sources are not executing before they have been assigned to a surface.
void update(); void update();
void draw(); // You don't have to care about fbo.begin() or fbo.end() here void draw(); // You don't have to care about fbo.begin() or fbo.end() here
private: private:
vector<ofRectangle> rects; vector <ofRectangle> rects;
vector<float> rectSpeeds; vector <float> rectSpeeds;
}; };

52
example/src/main.cpp

@ -4,34 +4,34 @@
#ifdef TARGET_RASPBERRY_PI #ifdef TARGET_RASPBERRY_PI
int main(int argc, char* argv[]) { int main(int argc, char * argv[]){
bool fullscreen = false; bool fullscreen = false;
if (argc > 0) { if(argc > 0){
std::string fullscreenFlag = "-f"; std::string fullscreenFlag = "-f";
for (int i = 0; i < argc; i++) { for(int i = 0; i < argc; i++){
if (strcmp(argv[i], fullscreenFlag.c_str()) == 0) { if(strcmp(argv[i], fullscreenFlag.c_str()) == 0){
fullscreen = true; fullscreen = true;
break; break;
} }
} }
} }
if (fullscreen) { if(fullscreen){
ofSetupOpenGL(600, 500, OF_FULLSCREEN); ofSetupOpenGL(600, 500, OF_FULLSCREEN);
} else { }else{
ofSetupOpenGL(800, 450, OF_WINDOW); ofSetupOpenGL(800, 450, OF_WINDOW);
} }
ofRunApp(new ofApp()); ofRunApp(new ofApp());
} }
#else #else
int main() { int main(){
ofSetupOpenGL(800, 600, OF_WINDOW); ofSetupOpenGL(800, 600, OF_WINDOW);
ofRunApp(new ofApp()); ofRunApp(new ofApp());
} }
#endif #endif

42
example/src/ofApp.cpp

@ -1,26 +1,26 @@
#include "ofApp.h" #include "ofApp.h"
void ofApp::setup() { void ofApp::setup(){
ofBackground(0); ofBackground(0);
// Enable or disable audio for video sources globally // Enable or disable audio for video sources globally
// Set this to false to save resources on the Raspberry Pi // Set this to false to save resources on the Raspberry Pi
ofx::piMapper::VideoSource::enableAudio = false; ofx::piMapper::VideoSource::enableAudio = false;
// Add our CustomSource to list of fbo sources of the piMapper // Add our CustomSource to list of fbo sources of the piMapper
// FBO sources should be added before piMapper.setup() so the // FBO sources should be added before piMapper.setup() so the
// piMapper is able to load the source if it is assigned to // piMapper is able to load the source if it is assigned to
// a surface in XML settings. // a surface in XML settings.
crossSource = new CrossSource(); crossSource = new CrossSource();
customSource = new CustomSource(); customSource = new CustomSource();
piMapper.registerFboSource(*crossSource); piMapper.registerFboSource(*crossSource);
piMapper.registerFboSource(*customSource); piMapper.registerFboSource(*customSource);
piMapper.setup(); piMapper.setup();
// The info layer is hidden by default, press <i> to toggle // The info layer is hidden by default, press <i> to toggle
// piMapper.showInfo(); // piMapper.showInfo();
} }
void ofApp::draw() { void ofApp::draw(){
piMapper.draw(); piMapper.draw();
} }

18
example/src/ofApp.h

@ -7,14 +7,14 @@
#include "VideoSource.h" #include "VideoSource.h"
class ofApp : public ofBaseApp { class ofApp : public ofBaseApp {
public: public:
void setup(); void setup();
void draw(); void draw();
ofxPiMapper piMapper; ofxPiMapper piMapper;
// By using a custom source that is derived from FboSource // By using a custom source that is derived from FboSource
// you will be able to see the source listed in sources editor // you will be able to see the source listed in sources editor
CustomSource * customSource; CustomSource * customSource;
CrossSource * crossSource; CrossSource * crossSource;
}; };
Loading…
Cancel
Save