diff --git a/Makefile.am b/Makefile.am index 517b3e4..7350cf1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -Wall bin_PROGRAMS = forge -forge_SOURCES = src/main.c src/args.c src/forge.c src/file.c src/window.c src/shaders.c src/timer.c src/string.c src/config_file.c src/rand.c src/video.c src/shared.c src/midi.c $(top_srcdir)/include/glad/gl.h $(top_srcdir)/include/glad/egl.h $(top_srcdir)/hashmap.c/hashmap.c $(top_srcdir)/log.c/src/log.c +forge_SOURCES = src/main.c src/args.c src/forge.c src/file.c src/window.c src/shaders.c src/timer.c src/string.c src/config_file.c src/rand.c src/video.c src/shared.c src/midi.c src/state.c $(top_srcdir)/include/glad/gl.h $(top_srcdir)/include/glad/egl.h $(top_srcdir)/hashmap.c/hashmap.c $(top_srcdir)/log.c/src/log.c forge_CFLAGS = -Ofast -march=native -flto -funroll-loops -fprefetch-loop-arrays -fno-exceptions -fopenmp -I$(top_srcdir)/include -DGLFW_INCLUDE_NONE -DGLFW_EXPOSE_NATIVE_EGL -DGLFW_NATIVE_INCLUDE_NONE -DLOG_USE_COLOR forge_LDADD = -lm -lGL -lglfw -include_HEADERS = src/main.h src/args.h src/config.h src/types.h src/forge.h src/file.h src/constants.h src/window.h src/shaders.h src/timer.h src/string.h src/config_file.h src/rand.h src/video.h src/shared.h src/midi.h $(top_srcdir)/include/glad/gl.h $(top_srcdir)/include/glad/egl.h $(top_srcdir)/include/linmath.h $(top_srcdir)/include/hashmap.h $(top_srcdir)/include/log.h \ No newline at end of file +include_HEADERS = src/main.h src/args.h src/config.h src/types.h src/forge.h src/file.h src/constants.h src/window.h src/shaders.h src/timer.h src/string.h src/config_file.h src/rand.h src/video.h src/shared.h src/midi.h src/state.h $(top_srcdir)/include/glad/gl.h $(top_srcdir)/include/glad/egl.h $(top_srcdir)/include/linmath.h $(top_srcdir)/include/hashmap.h $(top_srcdir)/include/log.h \ No newline at end of file diff --git a/config/forge.cfg b/config/forge.cfg index 4ef4a39..f6d7ab6 100644 --- a/config/forge.cfg +++ b/config/forge.cfg @@ -1,3 +1,5 @@ +# FRAGMENT SHADERS + UNIFORM_TIME=iTime UNIFORM_TEMPO=iTempo UNIFORM_FPS=iFPS @@ -12,6 +14,15 @@ UNIFORM_STATE_PREFIX=state UNIFORM_TEX_PREFIX=tex UNIFORM_SRC_PREFIX=midi +SUB_TYPE_COUNT=2 +SUB_1_PREFIX=src_ +SUB_2_PREFIX=fx_ + +# TODO remove +SUB_VARIANT_COUNT=15 + +# TEXTURE I/O + TEX_COUNT=10 IN_COUNT=2 @@ -20,8 +31,6 @@ IN_1_OUT=1 IN_2_OUT=2 FRAG_COUNT=10 -FRAG_OUTPUT=9 -FRAG_MONITOR=10 FRAG_1_OUT=3 FRAG_2_OUT=4 @@ -32,13 +41,8 @@ FRAG_6_OUT=8 FRAG_7_OUT=9 FRAG_8_OUT=0 -# TODO not like that -SUB_TYPE_COUNT=2 -SUB_1_PREFIX=src_ -SUB_2_PREFIX=fx_ - -# TODO remove -SUB_VARIANT_COUNT=15 +FRAG_OUTPUT=9 +FRAG_MONITOR=10 # MIDI @@ -56,12 +60,11 @@ SELECT_ITEM_3=42 SELECT_ITEM_4=41 SELECT_ITEM_5=45 -SELECT_TARGET_COUNT=5 -SELECT_TARGET_1=32 -SELECT_TARGET_2=64 -SELECT_TARGET_3=36 -SELECT_TARGET_4=68 -SELECT_TARGET_5=52 +SELECT_FRAG_3=32 +SELECT_FRAG_4=64 +SELECT_FRAG_5=36 +SELECT_FRAG_6=68 +SELECT_FRAG_8=52 SRC_COUNT=3 diff --git a/src/state.c b/src/state.c new file mode 100644 index 0000000..b030e69 --- /dev/null +++ b/src/state.c @@ -0,0 +1 @@ +#include "state.h" \ No newline at end of file diff --git a/src/state.h b/src/state.h new file mode 100644 index 0000000..7d511f1 --- /dev/null +++ b/src/state.h @@ -0,0 +1,6 @@ +#include "types.h" + +#ifndef STATE_H +#define STATE_H + +#endif /* STATE_H */ \ No newline at end of file