diff --git a/default/frag10.glsl b/default/frag10.glsl index acf1820..14500fe 100644 --- a/default/frag10.glsl +++ b/default/frag10.glsl @@ -18,6 +18,7 @@ uniform sampler2D iTex6; uniform sampler2D iTex7; uniform sampler2D iTex8; uniform sampler2D iTex9; +uniform int iFPS; uniform int iInputFPS1; uniform int iInputFPS2; @@ -132,8 +133,8 @@ void main() { t += write_5(uv3, vec2(33.5,8), texts[7]); f += rect(uv3, vec2(35, 6.75), vec2(2.8, 0.7)); - t += write_int(uv3, vec2(32.4,6.25), iFPS, 2); - t += write_5(uv3, vec2(34.9,6.25), texts[8]); + t += write_int(uv3, vec2(32.4,6.1), iFPS, 2); + t += write_5(uv3, vec2(34.9,6.1), texts[8]); fragColor = mix(c, vec4(min(1, f) - t), min(1, f)); } \ No newline at end of file diff --git a/default/inc_debug.glsl b/default/inc_debug.glsl index c0b34d3..3854125 100644 --- a/default/inc_debug.glsl +++ b/default/inc_debug.glsl @@ -6,8 +6,6 @@ #ifndef INC_DEBUG #define INC_DEBUG -uniform int iFPS; - uniform vec2 iInputResolution1; uniform vec2 iInputResolution2; uniform int iInputFormat1; diff --git a/src/forge.c b/src/forge.c index a1d76e3..4842643 100644 --- a/src/forge.c +++ b/src/forge.c @@ -61,8 +61,6 @@ static void init_context(const Parameters *params) { state_init(context, &project.state_config, params->demo, params->auto_random, params->auto_random_cycle, params->base_tempo, params->load_state); - context->monitor = params->monitor; - memset(context->input_resolutions, 0, sizeof(context->input_resolutions)); memset(context->input_formats, 0, sizeof(context->input_formats)); memset(context->input_fps, 0, sizeof(context->input_fps)); diff --git a/src/types.h b/src/types.h index 270b0d0..f8499df 100644 --- a/src/types.h +++ b/src/types.h @@ -171,13 +171,10 @@ typedef struct Tempo { typedef struct SharedContext { int fd; - vec2 resolution; vec2 tex_resolution; vec2 input_resolutions[MAX_VIDEO]; - double time; - unsigned int fps; Tempo tempo; double tempo_total; UintArray state; @@ -189,8 +186,7 @@ typedef struct SharedContext { bool auto_random; unsigned int auto_random_cycle; unsigned int seeds[MAX_FRAG]; - bool monitor; - + unsigned int fps; unsigned int input_formats[MAX_VIDEO]; unsigned int input_fps[MAX_VIDEO]; bool stop;