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

New fun shader vimix logo

Browse Source
This commit is contained in:
Bruno Herbelin
2022-07-19 00:09:17 +02:00
parent c9c6651368
commit becaeedff1
3 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -602,6 +602,7 @@ set(VMIX_RSC_FILES
./rsc/shaders/filters/resample_half.glsl ./rsc/shaders/filters/resample_half.glsl
./rsc/shaders/filters/resample_quarter.glsl ./rsc/shaders/filters/resample_quarter.glsl
./rsc/shaders/filters/earlybird.glsl ./rsc/shaders/filters/earlybird.glsl
./rsc/shaders/filters/logo.glsl
) )
# Include the CMake RC module # Include the CMake RC module

15
ImageFilter.cpp
View File

@@ -47,7 +47,8 @@ std::string fragmentHeader = "#version 330 core\n"
"uniform float iTime;\n" "uniform float iTime;\n"
"uniform float iTimeDelta;\n" "uniform float iTimeDelta;\n"
"uniform int iFrame;\n" "uniform int iFrame;\n"
"uniform vec4 iDate;\n"; "uniform vec4 iDate;\n"
"uniform vec4 iMouse;\n";
// Filter code starts at line 16 : // Filter code starts at line 16 :
std::string filterDefault = "void mainImage( out vec4 fragColor, in vec2 fragCoord )\n" std::string filterDefault = "void mainImage( out vec4 fragColor, in vec2 fragCoord )\n"
@@ -73,12 +74,13 @@ std::list< FilteringProgram > FilteringProgram::presets = {
FilteringProgram("Talk", "shaders/filters/talk.glsl", "", { }), FilteringProgram("Talk", "shaders/filters/talk.glsl", "", { }),
FilteringProgram("Stippling","shaders/filters/stippling.glsl", "", { }), FilteringProgram("Stippling","shaders/filters/stippling.glsl", "", { }),
FilteringProgram("Dithering","shaders/filters/dithering.glsl", "", { }), FilteringProgram("Dithering","shaders/filters/dithering.glsl", "", { }),
FilteringProgram("Fisheye", "shaders/filters/fisheye.glsl", "", { }) FilteringProgram("Fisheye", "shaders/filters/fisheye.glsl", "", { }),
FilteringProgram("Logo", "shaders/filters/logo.glsl", "", { })
}; };
int FilteringProgram::getFilterHeaderNumlines() int FilteringProgram::getFilterHeaderNumlines()
{ {
return 15; return 16;
} }
std::string FilteringProgram::getFilterCodeInputs() std::string FilteringProgram::getFilterCodeInputs()
@@ -90,7 +92,8 @@ std::string FilteringProgram::getFilterCodeInputs()
"vec3 iChannelResolution[2]; // input channels resolution (in pixels)\n" "vec3 iChannelResolution[2]; // input channels resolution (in pixels)\n"
"sampler2D iChannel0; // input channel 0 (texture).\n" "sampler2D iChannel0; // input channel 0 (texture).\n"
"sampler2D iChannel1; // input channel 1 (texture).\n" "sampler2D iChannel1; // input channel 1 (texture).\n"
"vec4 iDate; // (year, month, day, time in seconds)"; "vec4 iDate; // (year, month, day, time in seconds)\n"
"vec4 iMouse; // emulation of mouse input.";
return filterHeaderHelp; return filterHeaderHelp;
} }
@@ -178,6 +181,7 @@ public:
GTimer *timer_; GTimer *timer_;
double iTime_; double iTime_;
uint iFrame_; uint iFrame_;
glm::vec4 iMouse_;
// list of uniforms to control shader // list of uniforms to control shader
std::map< std::string, float > uniforms_; std::map< std::string, float > uniforms_;
@@ -207,6 +211,7 @@ ImageFilteringShader::ImageFilteringShader(): ImageShader()
timer_ = g_timer_new (); timer_ = g_timer_new ();
iTime_ = 0.0; iTime_ = 0.0;
iFrame_ = 0; iFrame_ = 0;
iMouse_ = glm::vec4(0.f);
ImageShader::reset(); ImageShader::reset();
} }
@@ -235,9 +240,9 @@ void ImageFilteringShader::use()
// //
// Shader input uniforms // Shader input uniforms
// //
program_->setUniform("iTime", float(iTime_) ); program_->setUniform("iTime", float(iTime_) );
program_->setUniform("iFrame", int(iFrame_) ); program_->setUniform("iFrame", int(iFrame_) );
program_->setUniform("iMouse", iMouse_ );
// Calculate iTimeDelta // Calculate iTimeDelta
double elapsed = g_timer_elapsed (timer_, NULL); double elapsed = g_timer_elapsed (timer_, NULL);

55
rsc/shaders/filters/logo.glsl Normal file
View File

File diff suppressed because one or more lines are too long