diff --git a/assets/4096.frg b/assets/4096.frag similarity index 100% rename from assets/4096.frg rename to assets/4096.frag diff --git a/assets/4096.vrt b/assets/4096.vert similarity index 100% rename from assets/4096.vrt rename to assets/4096.vert diff --git a/assets/blur.frag b/assets/blur.frag new file mode 100644 index 000000000..c3fe5fd1c --- /dev/null +++ b/assets/blur.frag @@ -0,0 +1,17 @@ +precision mediump float; + +uniform vec3 iResolution; +uniform sampler2D iChannel0; +uniform bool flip; +uniform vec2 direction; + +#pragma glslify: blur = require('../') + +void main() { + vec2 uv = vec2(gl_FragCoord.xy / iResolution.xy); + if (flip) { + uv.y = 1.0 - uv.y; + } + + gl_FragColor = blur(iChannel0, uv, iResolution.xy, direction); +} \ No newline at end of file diff --git a/assets/blur.frg b/assets/blur.frg deleted file mode 100644 index a90ab3034..000000000 --- a/assets/blur.frg +++ /dev/null @@ -1,26 +0,0 @@ -// precision mediump float; - -uniform sampler2D s_texture; - -varying vec2 v_texCoord; -varying vec2 v_blurTexCoords[14]; - -void main() -{ - gl_FragColor = vec4(0.0); - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 0])*0.0044299121055113265; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 1])*0.00895781211794; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 2])*0.0215963866053; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 3])*0.0443683338718; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 4])*0.0776744219933; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 5])*0.115876621105; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 6])*0.147308056121; - gl_FragColor += texture2D(s_texture, v_texCoord )*0.159576912161; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 7])*0.147308056121; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 8])*0.115876621105; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[ 9])*0.0776744219933; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[10])*0.0443683338718; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[11])*0.0215963866053; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[12])*0.00895781211794; - gl_FragColor += texture2D(s_texture, v_blurTexCoords[13])*0.0044299121055113265; -} \ No newline at end of file diff --git a/assets/blur.vert b/assets/blur.vert new file mode 100644 index 000000000..e69de29bb diff --git a/assets/blurH.vrt b/assets/blurH.vrt deleted file mode 100644 index aeb8ca268..000000000 --- a/assets/blurH.vrt +++ /dev/null @@ -1,25 +0,0 @@ -attribute vec4 a_position; -attribute vec2 a_texCoord; - -varying vec2 v_texCoord; -varying vec2 v_blurTexCoords[14]; - -void main() -{ - gl_Position = a_position; - v_texCoord = a_texCoord; - v_blurTexCoords[ 0] = v_texCoord + vec2(-0.028, 0.0); - v_blurTexCoords[ 1] = v_texCoord + vec2(-0.024, 0.0); - v_blurTexCoords[ 2] = v_texCoord + vec2(-0.020, 0.0); - v_blurTexCoords[ 3] = v_texCoord + vec2(-0.016, 0.0); - v_blurTexCoords[ 4] = v_texCoord + vec2(-0.012, 0.0); - v_blurTexCoords[ 5] = v_texCoord + vec2(-0.008, 0.0); - v_blurTexCoords[ 6] = v_texCoord + vec2(-0.004, 0.0); - v_blurTexCoords[ 7] = v_texCoord + vec2( 0.004, 0.0); - v_blurTexCoords[ 8] = v_texCoord + vec2( 0.008, 0.0); - v_blurTexCoords[ 9] = v_texCoord + vec2( 0.012, 0.0); - v_blurTexCoords[10] = v_texCoord + vec2( 0.016, 0.0); - v_blurTexCoords[11] = v_texCoord + vec2( 0.020, 0.0); - v_blurTexCoords[12] = v_texCoord + vec2( 0.024, 0.0); - v_blurTexCoords[13] = v_texCoord + vec2( 0.028, 0.0); -} \ No newline at end of file diff --git a/assets/blurV.vrt b/assets/blurV.vrt deleted file mode 100644 index 4c635c172..000000000 --- a/assets/blurV.vrt +++ /dev/null @@ -1,25 +0,0 @@ -attribute vec4 a_position; -attribute vec2 a_texCoord; - -varying vec2 v_texCoord; -varying vec2 v_blurTexCoords[14]; - -void main() -{ - gl_Position = a_position; - v_texCoord = a_texCoord; - v_blurTexCoords[ 0] = v_texCoord + vec2(0.0, -0.028); - v_blurTexCoords[ 1] = v_texCoord + vec2(0.0, -0.024); - v_blurTexCoords[ 2] = v_texCoord + vec2(0.0, -0.020); - v_blurTexCoords[ 3] = v_texCoord + vec2(0.0, -0.016); - v_blurTexCoords[ 4] = v_texCoord + vec2(0.0, -0.012); - v_blurTexCoords[ 5] = v_texCoord + vec2(0.0, -0.008); - v_blurTexCoords[ 6] = v_texCoord + vec2(0.0, -0.004); - v_blurTexCoords[ 7] = v_texCoord + vec2(0.0, 0.004); - v_blurTexCoords[ 8] = v_texCoord + vec2(0.0, 0.008); - v_blurTexCoords[ 9] = v_texCoord + vec2(0.0, 0.012); - v_blurTexCoords[10] = v_texCoord + vec2(0.0, 0.016); - v_blurTexCoords[11] = v_texCoord + vec2(0.0, 0.020); - v_blurTexCoords[12] = v_texCoord + vec2(0.0, 0.024); - v_blurTexCoords[13] = v_texCoord + vec2(0.0, 0.028); -} \ No newline at end of file diff --git a/src/net/torvald/terrarum/gameactors/PlayableActorWrapper.kt b/src/net/torvald/terrarum/gameactors/PlayableActorDelegate.kt similarity index 100% rename from src/net/torvald/terrarum/gameactors/PlayableActorWrapper.kt rename to src/net/torvald/terrarum/gameactors/PlayableActorDelegate.kt