eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-14 11:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

New Shader of Image Filter takes display loopback as channel 1

Browse Source 
Allows blending with output in GLSL shader
This commit is contained in:
Bruno Herbelin
2024-03-28 14:27:43 +01:00
parent 3afaaed1fb
commit ff48107b1a
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -599,6 +599,7 @@ set(VMIX_RSC_FILES
./rsc/mesh/h_line.ply
./rsc/mesh/h_mark.ply
./rsc/shaders/filters/default.glsl
./rsc/shaders/filters/blend.glsl
./rsc/shaders/filters/bloom.glsl
./rsc/shaders/filters/bokeh.glsl
./rsc/shaders/filters/talk.glsl

12
rsc/shaders/filters/blend.glsl Normal file
View File

@@ -0,0 +1,12 @@
// Blending of source texture (channel 0) with output window loopback (channel 1)
// by Bruno Herbelin for vimix
uniform float Blend;
void mainImage( out vec4 fragColor, in vec2 fragCoord )
{
vec2 uv = fragCoord.xy / iResolution.xy;
fragColor = mix( texture(iChannel0, uv), texture(iChannel1, uv), Blend);
}

11
src/ImageFilter.cpp
View File

@@ -29,6 +29,8 @@
#include "Primitives.h"
#include "BaseToolkit.h"
#include "Mixer.h"
#include "ImageFilter.h"
std::string fragmentHeader = "#version 330 core\n"
@@ -61,6 +63,7 @@ std::string fragmentFooter = "void main() {\n"
std::list< FilteringProgram > FilteringProgram::presets = {
FilteringProgram(),
FilteringProgram("Blend", "shaders/filters/blend.glsl", "", { }),
FilteringProgram("Bilateral","shaders/filters/focus.glsl", "", { }),
FilteringProgram("Pixelate", "shaders/filters/pixelate.glsl", "", { }),
FilteringProgram("Earlybird","shaders/filters/earlybird.glsl", "", { }),
@@ -80,8 +83,8 @@ std::string FilteringProgram::getFilterCodeInputs()
"float iTimeDelta; // render time (in seconds)\n"
"int iFrame; // shader playback frame\n"
"vec3 iChannelResolution[2]; // input channels resolution (in pixels)\n"
"sampler2D iChannel0; // input channel 0 (texture).\n"
"sampler2D iChannel1; // input channel 1 (texture).\n"
"sampler2D iChannel0; // input channel 0 (source).\n"
"sampler2D iChannel1; // input channel 1 (display loopback).\n"
"vec4 iDate; // (year, month, day, time in seconds)\n"
"vec4 iMouse; // simulate mouse input with sliders:";
return filterHeaderHelp;
@@ -378,7 +381,6 @@ void ImageFilter::draw (FrameBuffer *input)
input_ = input;
// create first-pass surface and shader, taking as texture the input framebuffer
surfaces_.first->setTextureIndex( input_->texture() );
shaders_.first->mask_texture = input_->texture();
// (re)create framebuffer for result of first-pass
if (buffers_.first != nullptr)
delete buffers_.first;
@@ -388,7 +390,6 @@ void ImageFilter::draw (FrameBuffer *input)
input_->blit( buffers_.first );
// create second-pass surface and shader, taking as texture the first-pass framebuffer
surfaces_.second->setTextureIndex( buffers_.first->texture() );
shaders_.second->mask_texture = input_->texture();
// (re)create framebuffer for result of second-pass
if (buffers_.second != nullptr)
delete buffers_.second;
@@ -401,6 +402,7 @@ void ImageFilter::draw (FrameBuffer *input)
{
// FIRST PASS
// render input surface into frame buffer
shaders_.first->mask_texture = Mixer::manager().session()->frame()->texture();
buffers_.first->begin();
surfaces_.first->draw(glm::identity<glm::mat4>(), buffers_.first->projection());
buffers_.first->end();
@@ -408,6 +410,7 @@ void ImageFilter::draw (FrameBuffer *input)
// SECOND PASS
if ( program_.isTwoPass() ) {
// render filtered surface from first pass into frame buffer
shaders_.second->mask_texture = Mixer::manager().session()->frame()->texture();
buffers_.second->begin();
surfaces_.second->draw(glm::identity<glm::mat4>(), buffers_.second->projection());
buffers_.second->end();