Shader is too fancy for Linux and the Makefile isn't good for Linux.

master
Zed A. Shaw 2 weeks ago
parent 25c1c23128
commit f82db0c6cd
  1. 53
      Makefile
  2. 3
      assets/shaders/build_status.frag

@ -1,31 +1,58 @@
all: build
all: build test
reset:
ifeq '$(OS)' 'Windows_NT'
powershell -executionpolicy bypass .\scripts\reset_build.ps1
else
sh -x ./scripts/reset_build.sh
endif
build:
meson compile -j 10 -C builddir
patch:
powershell "cp ./patches/process.h ./subprojects/libgit2-1.9.0/src/util/process.h"
build:
meson compile -C builddir
release_build:
meson --wipe builddir -Db_ndebug=true --buildtype release
meson compile -j 10 -C builddir
debug_build:
meson setup --wipe builddir -Db_ndebug=true --buildtype debugoptimized
meson compile -j 10 -C builddir
config:
powershell "cp tarpit_sample.json .tarpit.json"
tracy_build:
meson setup --wipe builddir --buildtype debugoptimized -Dtracy_enable=true -Dtracy:on_demand=true
meson compile -j 10 -C builddir
test: build
./builddir/runtests
# make an install for real maybe copy dll and .exe to dir and zip?
install: build
powershell "cp ./builddir/subprojects/libgit2-1.9.0/liblibgit2package.dll ."
powershell "cp ./builddir/subprojects/efsw/libefsw.dll ."
powershell "cp builddir/ttpit.exe ."
run: build test
ifeq '$(OS)' 'Windows_NT'
powershell "cp ./builddir/ttpit.exe ."
./ttpit
else
./builddir/ttpit
endif
run: install test
./ttpit.exe
debug: build
gdb --nx -x .gdbinit --ex run --args builddir/ttpit
debug_run: build
gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/ttpit.exe
gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/ttpit
debug_walk: build test
gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/ttpit t
clean:
meson compile --clean -C builddir
debug_test: build
gdb --nx -x .gdbinit --ex run --args builddir/runtests -e
win_installer:
powershell 'start "C:\Program Files (x86)\solicus\InstallForge\bin\ifbuilderenvx86.exe" scripts\win_installer.ifp'
coverage_report:
powershell 'scripts/coverage_report.ps1'

@ -6,6 +6,7 @@ uniform float u_mouse;
uniform float value = 0.2;
uniform bool is_error = false;
uniform int speedup = 1;
uniform int octaves = 8;
float random (in vec2 st) {
return fract(sin(dot(st.xy,
@ -29,7 +30,7 @@ float noise(in vec2 st) {
(d - b) * u.x * u.y;
}
float fbm(in vec2 st, int octaves=8) {
float fbm(in vec2 st) {
float v = 0.0;
float a = 0.5;
vec2 shift = vec2(100.0);

Loading…
Cancel
Save