diff options
Diffstat (limited to 'gui/src/chainImage.cpp')
| -rw-r--r-- | gui/src/chainImage.cpp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp index 4eb0417..7053961 100644 --- a/gui/src/chainImage.cpp +++ b/gui/src/chainImage.cpp @@ -8,6 +8,8 @@ float distance(ofPoint p1,ofPoint p2){ } void chainImage::init(ofPoint _linkPos,float _linkScale,float _linkRot){ + shader.load("shader"); + linkPos=_linkPos; linkScale=_linkScale; linkRot=_linkRot; @@ -244,6 +246,32 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom glPopMatrix(); } +void chainImage::gpu_drawChain(float fadeIn,bool additive,float intensity,float zoomMultiplier){ + + ofSetColor(255); + + float basescale=ofGetScreenWidth()/ofGetWidth(); + + shader.begin(); + shader.setUniform3f("transform",getTransform()); + shader.setUniform1f("scale",1.0f); + //shader.setUniform1f("rotation",getRotation()); + //shader.setUniform1f("transition",transition); + //shader.setUniform1f("fadeIn",fadeIn); + //shader.setUniform1f("intensity",intensity); + //shader.setUniform3f("linkPos",linkPos); + shader.setUniformTexture("thisImage", getTexture(), 1 ); + shader.setUniformTexture("nextImage", link->getTexture(), 2 ); + + //draw(0, 0,ofGetWidth(),ofGetHeight()); + ofDrawRectangle(0, 0, ofGetScreenWidth(), ofGetScreenHeight()); + + shader.end(); + + //1. can we FILL THE SCREEN? + +} + Json::Value chainImage::toJson(){ Json::Value json=Json::Value(Json::objectValue); json["linkPos"]=Json::Value(Json::arrayValue); |
