diff --git a/src/Sources/FboSource.cpp b/src/Sources/FboSource.cpp index 85ae028..af3fde8 100644 --- a/src/Sources/FboSource.cpp +++ b/src/Sources/FboSource.cpp @@ -83,8 +83,12 @@ void FboSource::allocate(int width, int height){ fbo->begin(); ofClear(0); fbo->end(); - - texture = &(fbo->getTextureReference()); + + #if (OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR >= 9) || OF_VERSION_MAJOR > 0 + texture = &(fbo->getTexture()); + #else + texture = &(fbo->getTextureReference()); + #endif } void FboSource::clear(){ diff --git a/src/Sources/ImageSource.cpp b/src/Sources/ImageSource.cpp index b41366d..5ce642e 100644 --- a/src/Sources/ImageSource.cpp +++ b/src/Sources/ImageSource.cpp @@ -18,11 +18,19 @@ void ImageSource::loadImage(std::string & filePath){ setNameFromPath(filePath); //cout << "path: " << path << endl; image = new ofImage(); - if(!image->loadImage(filePath)){ + #if (OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR >= 9) || OF_VERSION_MAJOR > 0 + if(!image->load(filePath)){ + #else + if(!image->loadImage(filePath)){ + #endif ofLogWarning("ImageSource") << "Could not load image"; //std::exit(EXIT_FAILURE); } - texture = &image->getTextureReference(); + #if (OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR >= 9) || OF_VERSION_MAJOR > 0 + texture = &image->getTexture(); + #else + texture = &image->getTextureReference(); + #endif loaded = true; } diff --git a/src/UserInterface/CircleJoint.cpp b/src/UserInterface/CircleJoint.cpp index 05a841f..8ecfcf5 100644 --- a/src/UserInterface/CircleJoint.cpp +++ b/src/UserInterface/CircleJoint.cpp @@ -30,7 +30,11 @@ void CircleJoint::draw(){ ofSetColor(fillColor); } - ofCircle(position.x, position.y, radius); + #if (OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR >= 9) || OF_VERSION_MAJOR > 0 + ofDrawCircle(position.x, position.y, radius); + #else + ofCircle(position.x, position.y, radius); + #endif ofNoFill(); if(selected){ @@ -40,7 +44,11 @@ void CircleJoint::draw(){ } ofSetLineWidth(strokeWidth); - ofCircle(position.x, position.y, radius); + #if (OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR >= 9) || OF_VERSION_MAJOR > 0 + ofDrawCircle(position.x, position.y, radius); + #else + ofCircle(position.x, position.y, radius); + #endif ofPopStyle(); }