mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-05 15:30:00 +01:00
Merge remote-tracking branch 'origin/beta'
This commit is contained in:
@@ -26,5 +26,5 @@ vec4 blur1D(vec2 U, vec2 D, float rad)
|
||||
|
||||
void mainImage( out vec4 fragColor, in vec2 fragCoord )
|
||||
{
|
||||
fragColor = blur1D( fragCoord, vec2(1,0), Radius * 0.5 );
|
||||
fragColor = blur1D( fragCoord, vec2(1,0), Radius * 0.25 );
|
||||
}
|
||||
|
||||
@@ -26,5 +26,5 @@ vec4 blur1D(vec2 U, vec2 D, float rad)
|
||||
|
||||
void mainImage( out vec4 fragColor, in vec2 fragCoord )
|
||||
{
|
||||
fragColor = blur1D( fragCoord, vec2(0,1), Radius * 0.5 );
|
||||
fragColor = blur1D( fragCoord, vec2(0,1), Radius * 0.25 );
|
||||
}
|
||||
|
||||
@@ -46,8 +46,6 @@ void mainImage( out vec4 fragColor, in vec2 fragCoord )
|
||||
{
|
||||
vec2 uv = fragCoord.xy / iResolution.xy;
|
||||
|
||||
float radius = Radius * 0.01 * iResolution.y;
|
||||
radius = pow(radius, 2.0);
|
||||
|
||||
float radius = Radius * 10.0;
|
||||
fragColor = Blur(uv * vec2(1.0, -1.0), radius);
|
||||
}
|
||||
|
||||
@@ -44,6 +44,9 @@ void MediaSource::setPath(const std::string &p)
|
||||
{
|
||||
path_ = p;
|
||||
|
||||
// prepare audio flag before openning
|
||||
mediaplayer_->setAudioEnabled( audio_flags_ & Source::Audio_enabled );
|
||||
|
||||
// open gstreamer
|
||||
mediaplayer_->open(path_);
|
||||
mediaplayer_->play(true);
|
||||
|
||||
Reference in New Issue
Block a user