read fragment shader from file at argument path

This commit is contained in:
2025-09-12 19:39:24 +02:00
parent f90e842bd8
commit ff0a4ebdae
5 changed files with 45 additions and 26 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ build:
gcc -Wall -Wextra src/*.c src/*.h -lglfw -lGL -lm -Iinclude -ldl -o build/$(TARGET) gcc -Wall -Wextra src/*.c src/*.h -lglfw -lGL -lm -Iinclude -ldl -o build/$(TARGET)
run: build run: build
./build/forge ./build/forge --frag=./shaders/frag.glsl
.PHONY: install .PHONY: install
install: build install: build
+21 -9
View File
@@ -56,6 +56,7 @@ options:
--help show this help message and exit --help show this help message and exit
-v, --version print version -v, --version print version
-s, --screen output screen number (default: primary) -s, --screen output screen number (default: primary)
-f, --frag fragment shader path (default: TODO)
``` ```
## Release guide ## Release guide
@@ -90,20 +91,31 @@ make -f Makefile.dev release-arch
- [ ] Handle compilation errors - [ ] Handle compilation errors
- [x] Minimal working fragment sample - [x] Minimal working fragment sample
- [x] Hot-reload fragment shader - [x] Hot-reload fragment shader
- [ ] Specify fragment shader path - [x] Specify fragment shader path
- [x] Force fullscreen - [x] Force fullscreen
- [x] Select screen as argument / config - [x] Select screen as argument / config
- [ ] Clean code
- [ ] Multi-stage shaders
- [ ] Test 2 stages with render to texture
- [ ] 2 in 2 fx 1 mix 1 fx layout
- [ ] Include fragments with special directive
- [ ] 16 input + 16 fx definition and selection (with param)
- [ ] Feedback texture
- [ ] Clean code
- [ ] Midi - [ ] Midi
- [ ] Read Midi events - [ ] Read Midi events
- [ ] Read midi mapping config file - [ ] Read midi mapping config file
- [ ] Write Midi events - [ ] Write Midi events
- [ ] MVP
- [ ] Add required libraries in target build
- [ ] Include fragments with special directive
- [ ] Source mixing
- [ ] Save midi state - [ ] Save midi state
- [ ] Advanced
- [ ] Video input
- [ ] Feedback input
- [ ] Tap-tempo feature - [ ] Tap-tempo feature
- [ ] Monitor screen feature (other window) - [ ] Clean code
- [ ] Video input
- [ ] Fixed camera video
- [ ] Video mapping config file
- [ ] Clean code
- [ ] Monitor screen
- [ ] 2nd window
- [ ] Use buffers as panels (INA A FXA / DEBUG A+B FXA+B / INB B FXB)
- [ ] Clean code
- [ ] Packaging & install
- [ ] Clone "shaders" and config in system path at setup
+12 -6
View File
@@ -7,18 +7,19 @@
#include "config.h" #include "config.h"
void print_help(int status_code) { void print_help(int status_code) {
puts(PACKAGE puts(PACKAGE " " VERSION "\n\n"
" " VERSION "\n\n"
"usage: " PACKAGE " " "usage: " PACKAGE " "
"[--help] " "[--help] "
"[-v] " "[-v] "
"[-s=SCREEN] " "[-s=SCREEN] "
"[-f=FRAG_PATH] "
"\n\n" "\n\n"
"Fusion Of Real-time Generative Effects.\n\n" "Fusion Of Real-time Generative Effects.\n\n"
"options:\n" "options:\n"
" --help show this help message and exit\n" " --help show this help message and exit\n"
" -v, --version print version\n" " -v, --version print version\n"
" -s, --screen output screen number (default: primary)\n"); " -s, --screen output screen number (default: primary)\n"
" -f, --frag fragment shader path (default: TODO)\n");
exit(status_code); exit(status_code);
} }
@@ -67,9 +68,7 @@ unsigned char parse_uchar(char *arg, char *value) {
} }
Parameters parse_args(int argc, char **argv) { Parameters parse_args(int argc, char **argv) {
Parameters params; Parameters params = {0, 0};
params.screen = 0;
int i; int i;
char *arg; char *arg;
@@ -84,10 +83,17 @@ Parameters parse_args(int argc, char **argv) {
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} else if (is_arg(arg, "-s") || is_arg(arg, "--screen")) { } else if (is_arg(arg, "-s") || is_arg(arg, "--screen")) {
params.screen = parse_uchar(arg, value); params.screen = parse_uchar(arg, value);
} else if (is_arg(arg, "-f") || is_arg(arg, "--frag")) {
params.frag_path = value;
} else { } else {
invalid_arg(arg); invalid_arg(arg);
} }
} }
if (params.frag_path == 0) {
fprintf(stderr, "required argument -f/--frag\n\n");
exit(EXIT_FAILURE);
}
return params; return params;
} }
+1 -1
View File
@@ -181,7 +181,7 @@ void loop(GLFWwindow *window, ShaderProgram program) {
void forge_run(Parameters params) { void forge_run(Parameters params) {
GLFWwindow *window; GLFWwindow *window;
File fragment_shader = read_file("shaders/tmp.glsl"); File fragment_shader = read_file(params.frag_path);
if (fragment_shader.error) { if (fragment_shader.error) {
fprintf(stderr, "Cannot read file\n"); fprintf(stderr, "Cannot read file\n");
+1
View File
@@ -9,6 +9,7 @@
typedef struct Parameters { typedef struct Parameters {
unsigned char screen; unsigned char screen;
char *frag_path;
} Parameters; } Parameters;
typedef struct Vertex { typedef struct Vertex {