have upscaled the FBOs as far as i can push them

museumsvictoria · Apr 23, 2018 · 617ba51 · 617ba51
1 parent e465474
commit 617ba51
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/addons/ofxPiMapper/src/Sources/FboSource.cpp b/addons/ofxPiMapper/src/Sources/FboSource.cpp
@@ -35,6 +35,7 @@ void FboSource::drawFbo(){
 	}
 
 	fbo->begin();
+    ofClear(0);
 	draw();
 	fbo->end();
 }
@@ -49,6 +50,7 @@ void FboSource::setDisableDraw(bool b){
 }
 
 void FboSource::allocate(int width, int height){
+    ofDisableArbTex();
 	clear();
 	fbo = new ofFbo();
 	fbo->allocate(width, height);

diff --git a/addons/ofxPiMapper/src/Surfaces/SurfaceStack.cpp b/addons/ofxPiMapper/src/Surfaces/SurfaceStack.cpp
@@ -25,10 +25,14 @@ void SurfaceStack::swap(int a, int b){
 	std::swap(_surfaces[a], _surfaces[b]);
 }
 
-void SurfaceStack::draw(){
-	ofEnableAlphaBlending();
-
+void SurfaceStack::draw(){    
 	for(int i = 0; i < _surfaces.size(); ++i){
+        if(_surfaces[i]->getSource()->getType() == SourceType::SOURCE_TYPE_FBO){
+            glEnable(GL_BLEND);
+            glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        }else{
+            ofEnableAlphaBlending();
+        }
         _surfaces[i]->draw();
 	}
     ofDisableAlphaBlending();

diff --git a/src/Graphics_Tools/RenderFbo.h b/src/Graphics_Tools/RenderFbo.h
@@ -22,7 +22,7 @@ class RenderFbo{
         renderFboSettings.width = width;
         renderFboSettings.height = height;
         renderFboSettings.internalformat = GL_RGBA;
-        renderFboSettings.numSamples = 1;
+        renderFboSettings.numSamples = 8;
         renderFboSettings.useDepth = false;
         renderFboSettings.useStencil = false;
         renderFboSettings.textureTarget = GL_TEXTURE_2D;

diff --git a/src/Settings.h b/src/Settings.h
@@ -8,8 +8,8 @@
 
 #pragma once 
 
-#define LAYER_RENDER_SIZE_X 500
-#define LAYER_RENDER_SIZE_Y 500
-//#define PORTRAIT_MODE
+#define LAYER_RENDER_SIZE_X 1000
+#define LAYER_RENDER_SIZE_Y 1000
+#define PORTRAIT_MODE
 #define WINDOWS_TOUCH
 #define OSC_PORT 9002
diff --git a/src/VisualLayer.cpp b/src/VisualLayer.cpp
@@ -18,8 +18,8 @@ VisualLayer::VisualLayer(){
 void VisualLayer::setup(string name, int scene_num){
     this->name = name; // Give our source a decent name
     scene_select = scene_num;
-
-    allocate(LAYER_RENDER_SIZE_X, LAYER_RENDER_SIZE_Y); // Allocate our FBO source, decide how big it should be
+    
+    allocate(LAYER_RENDER_SIZE_X,LAYER_RENDER_SIZE_Y); // Allocate our FBO source, decide how big it should be
     render_fbo.init(LAYER_RENDER_SIZE_X, LAYER_RENDER_SIZE_Y);
 
 	use_shader = true;

diff --git a/src/ofApp.cpp b/src/ofApp.cpp
@@ -305,8 +305,6 @@ void ofApp::drawProjections(ofEventArgs & args){
 		ofShowCursor();
 
 		if (projection_fbo.isAllocated()) {
-			//projection_fbo.getTexture().draw(rect.x,rect.y,rect.width,rect.height);
-
 			surface_mask.set_source_texture(projection_fbo);
 			surface_mask.update();
 			surface_mask.draw();