diff --git a/PEOPLES.md b/PEOPLES.md index fa5b472..16fecf3 100644 --- a/PEOPLES.md +++ b/PEOPLES.md @@ -7,7 +7,6 @@ * блинчек ## Artists - * Issac332 * Creature_of_steel1 * DesMo @@ -20,7 +19,7 @@ ## Testers and helpers: * Rubik * Prime 223432 -* Алула(from Oneshot) +* Alula(from Oneshot) * Охотник * Ouzly diff --git a/shader/transSimple.frag b/shader/transSimple.frag index 42938ca..aae8d8f 100644 --- a/shader/transSimple.frag +++ b/shader/transSimple.frag @@ -10,6 +10,5 @@ varying vec2 v_texCoord; void main(){ vec4 newPixel = texture2D(currentScene, v_texCoord); vec4 oldPixel = texture2D(frozenScene, v_texCoord); - gl_FragColor = mix(oldPixel, newPixel, prog); } diff --git a/tests.sh b/tests.sh index b41de41..1d17b49 100644 --- a/tests.sh +++ b/tests.sh @@ -1,8 +1,12 @@ #!/bin/bash +# +# ПЕРЕПИСАТЬ ЭТУ ХУЙНЮ ОНА НЕ РАБОТАЕТ +# + set -euo pipefail FASTERER_PATH="$1" -check_file() { +check_c(){ local f="$1" case "$f" in @@ -22,12 +26,31 @@ check_file() { ;; esac } -export -f check_file + +check_shader(){ + local f="$1" + case "$f" in + *.vert) + #glslangValidator -S vert --target-env opengl --client opengl100 -t "$f" + ;; + *.frag) + glslangValidator -S frag --target-env opengl --client opengl100 -t -DGLSLES -DFRAGMENT_SHADER "$f" + ;; + esac +} +export -f check_c +export -f check_shader find . -type f \( \ -name '*.c' -o -name '*.cc' -o -name '*.cpp' -o -name '*.cxx' \ -o -name '*.h' -o -name '*.hh' -o -name '*.hpp' -o -name '*.hxx' \ \) -print0 \ -| xargs -0 -n 1 bash -c 'check_file "$1"' _ +| xargs -0 -n 1 bash -c 'check_c "$1"' _ + +find . -type f \( \ + -name '*.frag' -o -name '*.vert' \ +\) -print0 \ +| xargs -0 -n 1 bash -c 'check_shader "$1"' _ find . | grep .rb | $FASTERER_PATH +glslangValidator