Compare commits
9
Commits
862a620f92
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ea54446dc6 | ||
|
|
d75e377c0e | ||
|
|
7d6aded6f0 | ||
|
|
22aa4c7e95 | ||
|
|
ad48361a47 | ||
|
|
d1ca7885e5 | ||
|
|
c695075ca1 | ||
|
|
f784ca4d0b | ||
|
|
867c7fdcb1 |
+1
-1
@@ -9,4 +9,4 @@
|
|||||||
url = https://github.com/rxi/log.c
|
url = https://github.com/rxi/log.c
|
||||||
[submodule "glsl-glyphs"]
|
[submodule "glsl-glyphs"]
|
||||||
path = glsl-glyphs
|
path = glsl-glyphs
|
||||||
url = ssh://git@git.klemek.fr:42617/klemek/glsl-glyphs
|
url = https://git.klemek.fr/klemek/glsl-glyphs
|
||||||
|
|||||||
+2
-2
@@ -5,6 +5,6 @@ forge_CFLAGS = -Ofast -march=native -flto -funroll-loops -fprefetch-loop-arrays
|
|||||||
forge_LDADD = -lm -lGL -lglfw -lasound
|
forge_LDADD = -lm -lGL -lglfw -lasound
|
||||||
include_HEADERS = src/args.h src/arr.h src/config.h src/config_file.h src/constants.h src/file.h src/forge.h src/main.h src/midi.h src/project.h src/rand.h src/shaders.h src/state.h src/string.h src/tempo.h src/timer.h src/types.h src/video.h src/window.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
|
include_HEADERS = src/args.h src/arr.h src/config.h src/config_file.h src/constants.h src/file.h src/forge.h src/main.h src/midi.h src/project.h src/rand.h src/shaders.h src/state.h src/string.h src/tempo.h src/timer.h src/types.h src/video.h src/window.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
|
||||||
|
|
||||||
EXTRA_DIST = default/forge_project.cfg default/frag1.glsl default/frag10.glsl default/frag2.glsl default/frag3.glsl default/frag4.glsl default/frag5.glsl default/frag6.glsl default/frag7.glsl default/frag8.glsl default/frag9.glsl default/inc_cp437.glsl default/inc_debug.glsl default/inc_functions.glsl default/inc_fx.glsl default/inc_magic.glsl default/inc_rand.glsl default/inc_res.glsl default/inc_sentences.glsl default/inc_src.glsl default/inc_template.glsl default/inc_time.glsl default/inc_yuyv.glsl
|
EXTRA_DIST = default/forge_project.cfg default/frag1.glsl default/frag10.glsl default/frag2.glsl default/frag3.glsl default/frag4.glsl default/frag5.glsl default/frag6.glsl default/frag7.glsl default/frag8.glsl default/frag9.glsl default/inc_cp437.glsl default/inc_debug.glsl default/inc_functions.glsl default/inc_fx.glsl default/inc_magic.glsl default/inc_map.glsl default/inc_rand.glsl default/inc_res.glsl default/inc_sentences.glsl default/inc_src.glsl default/inc_template.glsl default/inc_time.glsl default/inc_write.glsl default/inc_yuyv.glsl
|
||||||
confdir = $(prefix)/share/$(PACKAGE)
|
confdir = $(prefix)/share/$(PACKAGE)
|
||||||
conf_DATA = default/forge_project.cfg default/frag1.glsl default/frag10.glsl default/frag2.glsl default/frag3.glsl default/frag4.glsl default/frag5.glsl default/frag6.glsl default/frag7.glsl default/frag8.glsl default/frag9.glsl default/inc_cp437.glsl default/inc_debug.glsl default/inc_functions.glsl default/inc_fx.glsl default/inc_magic.glsl default/inc_rand.glsl default/inc_res.glsl default/inc_sentences.glsl default/inc_src.glsl default/inc_template.glsl default/inc_time.glsl default/inc_yuyv.glsl
|
conf_DATA = default/forge_project.cfg default/frag1.glsl default/frag10.glsl default/frag2.glsl default/frag3.glsl default/frag4.glsl default/frag5.glsl default/frag6.glsl default/frag7.glsl default/frag8.glsl default/frag9.glsl default/inc_cp437.glsl default/inc_debug.glsl default/inc_functions.glsl default/inc_fx.glsl default/inc_magic.glsl default/inc_map.glsl default/inc_rand.glsl default/inc_res.glsl default/inc_sentences.glsl default/inc_src.glsl default/inc_template.glsl default/inc_time.glsl default/inc_write.glsl default/inc_yuyv.glsl
|
||||||
|
|||||||
+4
-4
@@ -108,7 +108,7 @@ release-arch: clean makepkg
|
|||||||
|
|
||||||
.PHONY: release-%
|
.PHONY: release-%
|
||||||
release-%: ## build release {version}
|
release-%: ## build release {version}
|
||||||
$(MAKE) full-clean git-pull prepare-configure-$* aclocal autoconf automake start-configure make-distcheck cp-release prepare-pkgbuild-$* git-commit-release
|
$(MAKE) full-clean git-pull prepare-configure-$* aclocal autoconf automake start-configure make-distcheck cp-release prepare-pkgbuild-$* git-commit-release-$*
|
||||||
|
|
||||||
# TOOLS
|
# TOOLS
|
||||||
|
|
||||||
@@ -186,8 +186,8 @@ prepare-pkgbuild-%: ## sed -i {version} PKGBUILD
|
|||||||
sed -i -E "s/pkgver=[0-9]+\\.[0-9]+\\.[0-9]+/pkgver=$*/g" PKGBUILD
|
sed -i -E "s/pkgver=[0-9]+\\.[0-9]+\\.[0-9]+/pkgver=$*/g" PKGBUILD
|
||||||
sha256sum build/forge-steel-$*.tar.gz | cut -d' ' -f1 | xargs -I{} sed -i -E "s/sha256sums=\\('.*'\\)/sha256sums=\\('{}'\\)/g" PKGBUILD
|
sha256sum build/forge-steel-$*.tar.gz | cut -d' ' -f1 | xargs -I{} sed -i -E "s/sha256sums=\\('.*'\\)/sha256sums=\\('{}'\\)/g" PKGBUILD
|
||||||
|
|
||||||
.PHONY: git-commit-release
|
.PHONY: git-commit-release-%
|
||||||
git-commit-release: ## git commit -am "forge (steel) v{version}"
|
git-commit-release-%: ## git commit -am "forge (steel) v{version}"
|
||||||
git add configure.ac PKGBUILD
|
git add configure.ac PKGBUILD
|
||||||
git commit -am "forge (steel) v$*"
|
git commit -am "forge (steel) v$*"
|
||||||
git tag v$* -m "FORGE steel-$*"
|
git tag v$* -m "FORGE steel-$*"
|
||||||
@@ -198,7 +198,7 @@ git-commit-release: ## git commit -am "forge (steel) v{version}"
|
|||||||
makepkg: ## makepkg
|
makepkg: ## makepkg
|
||||||
mkdir -p $(BUILD_DIR)
|
mkdir -p $(BUILD_DIR)
|
||||||
cp PKGBUILD $(BUILD_DIR)
|
cp PKGBUILD $(BUILD_DIR)
|
||||||
cd $(BUILD_DIR) && $(MAKEPKG)
|
cd $(BUILD_DIR) && $(MAKEPKG) -c -r
|
||||||
|
|
||||||
.PHONY: glsl-glyphs
|
.PHONY: glsl-glyphs
|
||||||
glsl-glyphs: ## glsl-glyphs
|
glsl-glyphs: ## glsl-glyphs
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
pkgname=forge-steel
|
pkgname=forge-steel
|
||||||
pkgver=1.2.4
|
pkgver=1.2.6
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Fusion Of Real Time Generative Effects"
|
pkgdesc="Fusion Of Real Time Generative Effects"
|
||||||
arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64')
|
arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64')
|
||||||
depends=('glfw>=1:3', 'v4l-utils>=1.32', 'alsa-lib>=1.2', 'libglvnd>=1.7')
|
depends=('glfw>=1:3', 'v4l-utils>=1.32', 'alsa-lib>=1.2', 'libglvnd>=1.7')
|
||||||
url="https://git.klemek.fr/klemek/forge-steel"
|
url="https://git.klemek.fr/klemek/forge-steel"
|
||||||
source=("${pkgname}-steel-${pkgver}.tar.gz::https://git.klemek.fr/klemek/forge-steel/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
|
source=("${pkgname}-steel-${pkgver}.tar.gz::https://git.klemek.fr/klemek/forge-steel/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
|
||||||
sha256sums=('a34c7f8101d8d947e26bee1fa5ab8d87f4292014e5ef17d03eb34fefb387db9e')
|
sha256sums=('cef68aa72f9dfd7d9083005e45fa046f9fe0ff24ff6bf3bdcbbd494d28675895')
|
||||||
srcdir=build
|
srcdir=build
|
||||||
backup=("usr/share/${pkgname}")
|
backup=("usr/share/${pkgname}")
|
||||||
|
|
||||||
@@ -18,5 +18,5 @@ build() {
|
|||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd "$srcdir/$pkgname-$pkgver"
|
cd "$srcdir/$pkgname-$pkgver"
|
||||||
sudo make DESTDIR="$pkgdir" install
|
make DESTDIR="$pkgdir" install
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
AC_INIT([forge], [steel-1.2.4], [klemek.dev@proton.me])
|
AC_INIT([forge], [steel-1.2.6], [klemek.dev@proton.me])
|
||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -6,7 +6,8 @@
|
|||||||
static const char *vertex_shader_text =
|
static const char *vertex_shader_text =
|
||||||
"#version 140\n"
|
"#version 140\n"
|
||||||
"const mat4 mvp = "
|
"const mat4 mvp = "
|
||||||
"mat4(vec4(2.,0.,0.,0.),vec4(0.,2.,0.,0.),vec4(0.,0.,2.,0.),vec4(-1.,-1.,1.,1.));\n"
|
"mat4(vec4(2.,0.,0.,0.),vec4(0.,2.,0.,0.),vec4(0.,0.,2.,0.),vec4(-1.,-1.,1."
|
||||||
|
",1.));\n"
|
||||||
"in vec2 vPos;\n"
|
"in vec2 vPos;\n"
|
||||||
"out vec2 vUV;\n"
|
"out vec2 vUV;\n"
|
||||||
"void main()\n"
|
"void main()\n"
|
||||||
|
|||||||
+4
-1
@@ -60,7 +60,10 @@ static void update_active(const Context *context, StateConfig state_config,
|
|||||||
j++) {
|
j++) {
|
||||||
k = state_config.group_active_offsets.values[i] + j;
|
k = state_config.group_active_offsets.values[i] + j;
|
||||||
safe_midi_write(midi, state_config.group_active_codes.values[k],
|
safe_midi_write(midi, state_config.group_active_codes.values[k],
|
||||||
context->active[i] == j && beat_active ? MIDI_MAX : 0);
|
context->active[i] == j &&
|
||||||
|
(context->selected != k || beat_active)
|
||||||
|
? MIDI_MAX
|
||||||
|
: 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -6,8 +6,8 @@
|
|||||||
void state_parse_config(StateConfig *state_config, const ConfigFile *config);
|
void state_parse_config(StateConfig *state_config, const ConfigFile *config);
|
||||||
|
|
||||||
void state_midi_event(Context *context, StateConfig state_config,
|
void state_midi_event(Context *context, StateConfig state_config,
|
||||||
MidiDevice midi, unsigned char code,
|
MidiDevice midi, unsigned char code, unsigned char value,
|
||||||
unsigned char value, bool trace_midi);
|
bool trace_midi);
|
||||||
|
|
||||||
void state_key_event(Context *context, StateConfig state_config,
|
void state_key_event(Context *context, StateConfig state_config,
|
||||||
unsigned int code, MidiDevice midi);
|
unsigned int code, MidiDevice midi);
|
||||||
|
|||||||
+3
-2
@@ -3,12 +3,13 @@
|
|||||||
#ifndef WINDOW_H
|
#ifndef WINDOW_H
|
||||||
#define WINDOW_H
|
#define WINDOW_H
|
||||||
|
|
||||||
void window_startup(void (*error_callback)(int, const char *), const unsigned int backend);
|
void window_startup(void (*error_callback)(int, const char *),
|
||||||
|
const unsigned int backend);
|
||||||
|
|
||||||
void window_terminate();
|
void window_terminate();
|
||||||
|
|
||||||
Window *window_init(const char *title, unsigned char monitor_index,
|
Window *window_init(const char *title, unsigned char monitor_index,
|
||||||
bool windowed, const unsigned int opengl_major,
|
bool windowed, const unsigned int opengl_major,
|
||||||
const unsigned int opengl_minor, Window *shared_context,
|
const unsigned int opengl_minor, Window *shared_context,
|
||||||
void (*key_callback)(Window *, int, int, int, int));
|
void (*key_callback)(Window *, int, int, int, int));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user