Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-09-22 23:18:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #91 from kichikuou/effect

Browse Source 
Implement EFFECT_NOISE_CROSSFADE and EFFECT_SEPIA_NOISE_CROSSFADE
This commit is contained in:
Nunuhara Cabbage
2022-12-27 10:11:54 -08:00
committed by GitHub
parent 1f84f33346 8aafb271f9
commit f23d713f46
3 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shaders/effects/noise_crossfade.f.glsl
+35
View File
@@ -0,0 +1,35 @@
/* Copyright (C) 2022 kichikuou <KichikuouChrome@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://gnu.org/licenses/>.
*/
uniform sampler2D tex; // the new scene
uniform sampler2D old; // the old scene
uniform vec2 resolution; // the screen resolution
uniform float progress; // effect progress (0..1)
in vec2 tex_coord;
out vec4 frag_color;
void main() {
float rand = fract(sin(dot(vec3(tex_coord, progress), vec3(12.9898, 78.233, 81.2463))) * 43758.5453);
vec3 col;
if (progress < 0.5) {
col = mix(texture(old, tex_coord).rgb, vec3(rand), progress * 2.0);
} else {
col = mix(texture(tex, tex_coord).rgb, vec3(rand), (1.0 - progress) * 2.0);
}
frag_color = vec4(col, 1.0);
}
shaders/effects/sepia_noise_crossfade.f.glsl
+36
View File
@@ -0,0 +1,36 @@
/* Copyright (C) 2022 kichikuou <KichikuouChrome@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://gnu.org/licenses/>.
*/
uniform sampler2D tex; // the new scene
uniform sampler2D old; // the old scene
uniform vec2 resolution; // the screen resolution
uniform float progress; // effect progress (0..1)
in vec2 tex_coord;
out vec4 frag_color;
void main() {
float rand = fract(sin(dot(vec3(tex_coord, progress), vec3(12.9898, 78.233, 81.2463))) * 43758.5453);
vec3 sepia = rand * vec3(1.0, 0.888, 0.691);
vec3 col;
if (progress < 0.5) {
col = mix(texture(old, tex_coord).rgb, sepia, progress * 2.0);
} else {
col = mix(texture(tex, tex_coord).rgb, sepia, (1.0 - progress) * 2.0);
}
frag_color = vec4(col, 1.0);
}
src/effect.c
+4
View File
@@ -138,7 +138,9 @@ static struct effect_shader blind_down_shader = EFFECT_SHADER("shaders/effects/b
static struct effect_shader blind_lr_shader = EFFECT_SHADER("shaders/effects/blind_lr.f.glsl");
static struct effect_shader linear_blur_shader = EFFECT_SHADER("shaders/effects/linear_blur.f.glsl");
static struct effect_shader zigzag_crossfade_shader = EFFECT_SHADER("shaders/effects/zigzag_crossfade.f.glsl");
static struct effect_shader noise_crossfade_shader = EFFECT_SHADER("shaders/effects/noise_crossfade.f.glsl");
static struct effect_shader turn_page_shader = EFFECT_SHADER("shaders/effects/turn_page.f.glsl");
static struct effect_shader sepia_noise_crossfade_shader = EFFECT_SHADER("shaders/effects/sepia_noise_crossfade.f.glsl");
static struct effect_shader blur_fadeout_shader = EFFECT_SHADER("shaders/effects/blur_fadeout.f.glsl");
static struct effect_shader blur_crossfade_shader = EFFECT_SHADER("shaders/effects/blur_crossfade.f.glsl");
@@ -153,7 +155,9 @@ static struct effect_shader *effect_shaders[NR_EFFECTS] = {
[EFFECT_BLIND_LR] = &blind_lr_shader,
[EFFECT_LINEAR_BLUR] = &linear_blur_shader,
[EFFECT_ZIGZAG_CROSSFADE] = &zigzag_crossfade_shader,
[EFFECT_NOISE_CROSSFADE] = &noise_crossfade_shader,
[EFFECT_TURN_PAGE] = &turn_page_shader,
[EFFECT_SEPIA_NOISE_CROSSFADE] = &sepia_noise_crossfade_shader,
[EFFECT_BLUR_FADEOUT] = &blur_fadeout_shader,
[EFFECT_BLUR_CROSSFADE] = &blur_crossfade_shader,
};