diff --git a/assets/appicon128.png b/assets/appicon128.png deleted file mode 100644 index 6533b6ee9..000000000 Binary files a/assets/appicon128.png and /dev/null differ diff --git a/assets/appicon16.png b/assets/appicon16.png deleted file mode 100644 index 3ffae129d..000000000 Binary files a/assets/appicon16.png and /dev/null differ diff --git a/assets/appicon256.png b/assets/appicon256.png deleted file mode 100644 index d9abfdc1c..000000000 Binary files a/assets/appicon256.png and /dev/null differ diff --git a/assets/appicon32.png b/assets/appicon32.png deleted file mode 100644 index d2f087585..000000000 Binary files a/assets/appicon32.png and /dev/null differ diff --git a/assets/appicon64.png b/assets/appicon64.png deleted file mode 100644 index 9c2c4a453..000000000 Binary files a/assets/appicon64.png and /dev/null differ diff --git a/assets/shaders/raytracelight.frag b/assets/shaders/raytracelight.frag deleted file mode 100644 index fcf21433f..000000000 --- a/assets/shaders/raytracelight.frag +++ /dev/null @@ -1,108 +0,0 @@ -#version 120 -#ifdef GL_ES - precision mediump float; -#endif - -varying vec4 v_color; -varying vec2 v_texCoords; - -// all 3 must have the same dimension! -// the divisor of 2 input and an output must be the same. I.e. either divide all by 4, or not. -uniform sampler2D shades; -uniform sampler2D lights; -// WARNING -- Gdx.Color.toIntBits returns ABGR, but GLSL expects RGBA. Use the function Color.toRGBA() in LightmapRenderNew -uniform sampler2D u_texture; -uniform vec2 outSize; -uniform float multiplier = 4.0; // if divided by four, put 4.0 in there - -#define TRAVERSE_SIZE 128 // should be good for screen size up to 1920 for tile size of 16 - -vec4 sampleFrom(sampler2D from, vec2 which) { - return texture2D(from, which / outSize); -} - -int traceRayCount(vec2 delta) { - vec2 absDelta = abs(delta); - int arraySize = int(max(absDelta.x, absDelta.y)); - return arraySize + 1; -} - -vec2[TRAVERSE_SIZE] traceRay(int arraySize, vec2 from, vec2 to) { - vec2 delta = to - from; - vec2[TRAVERSE_SIZE] returnArray; - int arri = 0; - - // if the line is not vertical... - if (delta.x != 0) { - float deltaError = abs(delta.y / delta.x); - float error = 0.0; - float traceY = from.y; - - for (float traceX = from.x; traceX <= to.x; traceX++) { - // plot(traceX, traceY) - returnArray[arri] = vec2(traceX, traceY); - arri = arri + 1; - - error = error + deltaError; - if (error >= 0.5) { - traceY = traceY + sign(delta.y); - error = error - 1.0; - } - } - } - else { - for (float traceY = from.y; traceY <= to.y; traceY++) { - returnArray[arri] = vec2(from.x, traceY); - } - } - - return returnArray; -} - -void main() { - - // this code will produce y-flipped image. It's your job to flip it again (e.g. using y-flipped fullscreen quad) - - // Nice try, but it kills GPU :( - // reason: looks like traceRayCount() returns value greater than TRAVERSE_SIZE. - // even if I make traceRayCount() to return constant 3, I get less than 1 fps on GTX 970. - - vec4 outColor = vec4(0.0,0.0,0.0,0.0); - - // 1. pick a light source - for (int y = 0; y < int(outSize.y); y++) { - for (int x = 0; x < int(outSize.x); x++) { - vec2 from = vec2(x + 0.5, y + 0.5); // +0.5 is used because gl_FragCoord does - vec2 to = gl_FragCoord.xy; - vec2 delta = to - from; - int traceCount = traceRayCount(delta); - vec4 light = sampleFrom(lights, from); - - // 2. get a trace path - vec2[TRAVERSE_SIZE] returnArray = traceRay(traceCount, from, to); - - // 2.1 get angular darkening coefficient - vec2 unitVec = delta / max(delta.x, delta.y); - float angularDimming = sqrt(unitVec.x * unitVec.x + unitVec.y * unitVec.y); - //float angularDimming = 1.0; // TODO depends on the angle of (lightPos, gl_FragCoord.x) - - // 3. traverse the light path to dim the "light" - // var "light" will be attenuated after this loop - for (int i = 0; i < traceCount; i++) { - vec4 shade = sampleFrom(shades, returnArray[i]) * angularDimming; - - light = light - shade; - } - - // 4. mix the incoming light into the light buffer. - outColor = max(outColor, light); - } - } - - gl_FragColor = outColor * multiplier; - //gl_FragColor = vec4(0,1,0,1); - - //gl_FragColor = sampleFrom(lights, gl_FragCoord.xy) * multiplier; - - -} diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index e60f1dce5..bea9a5254 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -1,6 +1,7 @@ package net.torvald.terrarum; import com.badlogic.gdx.ApplicationListener; +import com.badlogic.gdx.Files; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Screen; import com.badlogic.gdx.audio.AudioDevice; @@ -370,17 +371,17 @@ public class App implements ApplicationListener { //appConfig.samples = 4; // force the AA on, if the graphics driver didn't do already // load app icon - int[] appIconSizes = new int[]{256, 128, 64, 32, 16}; - ArrayList appIconPaths = new ArrayList<>(); - for (int size : appIconSizes) { - String name = "assets/appicon" + size + ".png"; - if (new File("./" + name).exists()) { - appIconPaths.add("./" + name); - } - } - - Object[] iconPathsTemp = appIconPaths.toArray(); - appConfig.setWindowIcon(Arrays.copyOf(iconPathsTemp, iconPathsTemp.length, String[].class)); + appConfig.setWindowIcon(Files.FileType.Classpath, + "res/appicon512.png", + "res/appicon256.png", + "res/appicon144.png", + "res/appicon128.png", + "res/appicon96.png", + "res/appicon64.png", + "res/appicon48.png", + "res/appicon32.png", + "res/appicon16.png" + ); // set some more configuration vars MULTITHREAD = THREAD_COUNT >= 3 && getConfigBoolean("multithread"); @@ -431,20 +432,20 @@ public class App implements ApplicationListener { // set GL graphics constants for (int i = 0; i < ditherPatterns.length; i++) { - Texture t = new Texture(Gdx.files.internal("assets/shaders/dither_512_"+i+".tga")); + Texture t = new Texture(Gdx.files.classpath("shaders/dither_512_"+i+".tga")); t.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Linear); t.setWrap(Texture.TextureWrap.Repeat, Texture.TextureWrap.Repeat); ditherPatterns[i] = t; } - shaderBayerSkyboxFill = loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/4096_bayer_skyboxfill.frag"); - shaderHicolour = loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/hicolour.frag"); - shaderDebugDiff = loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/diff.frag"); + shaderBayerSkyboxFill = loadShaderFromClasspath("shaders/4096.vert", "shaders/4096_bayer_skyboxfill.frag"); + shaderHicolour = loadShaderFromClasspath("shaders/4096.vert", "shaders/hicolour.frag"); + shaderDebugDiff = loadShaderFromClasspath("shaders/4096.vert", "shaders/diff.frag"); shaderPassthruRGBA = SpriteBatch.createDefaultShader(); - shaderDitherRGBA = loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/4096_bayer.frag"); // always load the shader regardless of config because the config may cange - shaderColLUT = loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/passthrurgb.frag"); - shaderReflect = loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/reflect.frag"); - shaderGhastlyWhite = loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/ghastlywhite.frag"); + shaderDitherRGBA = loadShaderFromClasspath("shaders/4096.vert", "shaders/4096_bayer.frag"); // always load the shader regardless of config because the config may cange + shaderColLUT = loadShaderFromClasspath("shaders/4096.vert", "shaders/passthrurgb.frag"); + shaderReflect = loadShaderFromClasspath("shaders/4096.vert", "shaders/reflect.frag"); + shaderGhastlyWhite = loadShaderFromClasspath("shaders/4096.vert", "shaders/ghastlywhite.frag"); fullscreenQuad = new Mesh( true, 4, 6, @@ -1362,6 +1363,16 @@ public class App implements ApplicationListener { System.out.println(csiR + "[" + out + "] " + message + csi0); } + public static ShaderProgram loadShaderFromClasspath(String vert, String frag) { + ShaderProgram s = new ShaderProgram(Gdx.files.classpath(vert), Gdx.files.classpath(frag)); + + if (s.getLog().toLowerCase().contains("error")) { + throw new Error(String.format("Shader program loaded with %s, %s failed:\n%s", vert, frag, s.getLog())); + } + + return s; + } + public static ShaderProgram loadShaderFromFile(String vert, String frag) { ShaderProgram s = new ShaderProgram(Gdx.files.internal(vert), Gdx.files.internal(frag)); diff --git a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt index 693ca7e12..ffea42fd9 100644 --- a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt +++ b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt @@ -114,21 +114,21 @@ object IngameRenderer : Disposable { // these codes will run regardless of the invocation of the "initialise()" function // the "initialise()" function will also be called init { -// shaderBlurDither = App.loadShaderFromFile("assets/shaders/blur.vert", "assets/shaders/blur_dither.frag") -// shaderRGBOnlyDither = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/4096_bayer_rgb1.frag") -// shaderAtoGreyDither = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/4096_bayer_aaa1.frag") +// shaderBlurDither = App.loadShaderFromClasspath("shaders/blur.vert", "shaders/blur_dither.frag") +// shaderRGBOnlyDither = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/4096_bayer_rgb1.frag") +// shaderAtoGreyDither = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/4096_bayer_aaa1.frag") - shaderBlur = App.loadShaderFromFile("assets/shaders/blur.vert", "assets/shaders/blur.frag") - shaderRGBOnly = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/rgbonly.frag") - shaderAtoGrey = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/aonly.frag") + shaderBlur = App.loadShaderFromClasspath("shaders/blur.vert", "shaders/blur.frag") + shaderRGBOnly = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/rgbonly.frag") + shaderAtoGrey = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/aonly.frag") - shaderAlphaDither = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/alphadither.frag") - shaderBlendGlow = App.loadShaderFromFile("assets/shaders/blendGlow.vert", "assets/shaders/blendGlow.frag") + shaderAlphaDither = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/alphadither.frag") + shaderBlendGlow = App.loadShaderFromClasspath("shaders/blendGlow.vert", "shaders/blendGlow.frag") - shaderKawaseDown = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/kawasedown.frag") - shaderKawaseUp = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/kawaseup.frag") + shaderKawaseDown = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/kawasedown.frag") + shaderKawaseUp = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/kawaseup.frag") if (!shaderBlendGlow.isCompiled) { Gdx.app.log("shaderBlendGlow", shaderBlendGlow.log) diff --git a/src/net/torvald/terrarum/ui/Toolkit.kt b/src/net/torvald/terrarum/ui/Toolkit.kt index 373d56b04..740f5cf60 100644 --- a/src/net/torvald/terrarum/ui/Toolkit.kt +++ b/src/net/torvald/terrarum/ui/Toolkit.kt @@ -29,10 +29,10 @@ object Toolkit : Disposable { } - private val shaderKawaseDown = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/kawasedown.frag") - private val shaderKawaseUp = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/kawaseup.frag") - private val shaderBoxDown = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/boxdown.frag") - private val shaderBoxUp = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/boxup.frag") + private val shaderKawaseDown = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/kawasedown.frag") + private val shaderKawaseUp = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/kawaseup.frag") + private val shaderBoxDown = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/boxdown.frag") + private val shaderBoxUp = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/boxup.frag") private lateinit var fboBlur: FloatFrameBuffer private lateinit var fboBlurHalf: FloatFrameBuffer diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt index 9af9220df..82ea4f839 100644 --- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt +++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt @@ -85,7 +85,7 @@ internal object BlocksDrawer { private lateinit var tilesQuad: Mesh - private val shader = App.loadShaderFromFile("assets/shaders/4096.vert", "assets/shaders/tiling_dither.frag") + private val shader = App.loadShaderFromClasspath("shaders/4096.vert", "shaders/tiling_dither.frag") init { diff --git a/src/res/appicon128.png b/src/res/appicon128.png new file mode 100644 index 000000000..25d318d74 --- /dev/null +++ b/src/res/appicon128.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb625e1db0ee4f3c957f0c2230c37d5cc2576fee886915516127c710847a0355 +size 450 diff --git a/src/res/appicon144.png b/src/res/appicon144.png new file mode 100644 index 000000000..96cde7e69 --- /dev/null +++ b/src/res/appicon144.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:661eca9e62d22248d5aa5e6632c8cd0b96c1700dbb7e186d389e4ba586714803 +size 726 diff --git a/src/res/appicon16.png b/src/res/appicon16.png new file mode 100644 index 000000000..19d162db6 --- /dev/null +++ b/src/res/appicon16.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fa51a7711de6e21bb28a2548fe21dd48de7dbc890ab7af15110c7432fa61ec8 +size 366 diff --git a/src/res/appicon256.png b/src/res/appicon256.png new file mode 100644 index 000000000..b88677d86 --- /dev/null +++ b/src/res/appicon256.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bfec9eb7057e845075d5bf974303e16bdad7a957774f3911121dbfd2af26c19 +size 555 diff --git a/src/res/appicon32.png b/src/res/appicon32.png new file mode 100644 index 000000000..0ffd7e789 --- /dev/null +++ b/src/res/appicon32.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:787df52bb4a440428fa27c72b9f75dc32ed903ab495d1dc25a21a81743ce1a9c +size 387 diff --git a/src/res/appicon48.png b/src/res/appicon48.png new file mode 100644 index 000000000..e467b8691 --- /dev/null +++ b/src/res/appicon48.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef0ea46d6a72583eb0b3433a474070b4cf7f1febb26e397641bb84e484e49e68 +size 641 diff --git a/src/res/appicon512.png b/src/res/appicon512.png new file mode 100644 index 000000000..7e14c22a0 --- /dev/null +++ b/src/res/appicon512.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6daf9a7822ff9d7c8404b4ab1efb2dbfffa2e0f4a06761045855b45bf51562e4 +size 1176 diff --git a/src/res/appicon64.png b/src/res/appicon64.png new file mode 100644 index 000000000..ad143a263 --- /dev/null +++ b/src/res/appicon64.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29fcd57122185269183386895a0fe6c9cee4adb98aa805e721ebec60e7e0b32c +size 416 diff --git a/src/res/appicon96.png b/src/res/appicon96.png new file mode 100644 index 000000000..b8720f150 --- /dev/null +++ b/src/res/appicon96.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66104c6d1178ea15a782c02e8597049d3f5564fe3b683881b49fba16287929d8 +size 644 diff --git a/assets/shaders/4096.frag b/src/shaders/4096.frag similarity index 100% rename from assets/shaders/4096.frag rename to src/shaders/4096.frag diff --git a/assets/shaders/4096.vert b/src/shaders/4096.vert similarity index 100% rename from assets/shaders/4096.vert rename to src/shaders/4096.vert diff --git a/assets/shaders/4096_bayer.frag b/src/shaders/4096_bayer.frag similarity index 100% rename from assets/shaders/4096_bayer.frag rename to src/shaders/4096_bayer.frag diff --git a/assets/shaders/4096_bayer_aaa1.frag b/src/shaders/4096_bayer_aaa1.frag similarity index 100% rename from assets/shaders/4096_bayer_aaa1.frag rename to src/shaders/4096_bayer_aaa1.frag diff --git a/assets/shaders/4096_bayer_rgb1.frag b/src/shaders/4096_bayer_rgb1.frag similarity index 100% rename from assets/shaders/4096_bayer_rgb1.frag rename to src/shaders/4096_bayer_rgb1.frag diff --git a/assets/shaders/4096_bayer_skyboxfill.frag b/src/shaders/4096_bayer_skyboxfill.frag similarity index 100% rename from assets/shaders/4096_bayer_skyboxfill.frag rename to src/shaders/4096_bayer_skyboxfill.frag diff --git a/assets/shaders/LDR_RGBA_21.png b/src/shaders/LDR_RGBA_21.png similarity index 100% rename from assets/shaders/LDR_RGBA_21.png rename to src/shaders/LDR_RGBA_21.png diff --git a/assets/shaders/aaaxmul.frag b/src/shaders/aaaxmul.frag similarity index 100% rename from assets/shaders/aaaxmul.frag rename to src/shaders/aaaxmul.frag diff --git a/assets/shaders/alphadither.frag b/src/shaders/alphadither.frag similarity index 100% rename from assets/shaders/alphadither.frag rename to src/shaders/alphadither.frag diff --git a/assets/shaders/aonly.frag b/src/shaders/aonly.frag similarity index 100% rename from assets/shaders/aonly.frag rename to src/shaders/aonly.frag diff --git a/assets/shaders/blendGlow.frag b/src/shaders/blendGlow.frag similarity index 100% rename from assets/shaders/blendGlow.frag rename to src/shaders/blendGlow.frag diff --git a/assets/shaders/blendGlow.vert b/src/shaders/blendGlow.vert similarity index 100% rename from assets/shaders/blendGlow.vert rename to src/shaders/blendGlow.vert diff --git a/assets/shaders/blur.frag b/src/shaders/blur.frag similarity index 100% rename from assets/shaders/blur.frag rename to src/shaders/blur.frag diff --git a/assets/shaders/blur.vert b/src/shaders/blur.vert similarity index 100% rename from assets/shaders/blur.vert rename to src/shaders/blur.vert diff --git a/assets/shaders/blur2.frag b/src/shaders/blur2.frag similarity index 100% rename from assets/shaders/blur2.frag rename to src/shaders/blur2.frag diff --git a/assets/shaders/blur_dither.frag b/src/shaders/blur_dither.frag similarity index 100% rename from assets/shaders/blur_dither.frag rename to src/shaders/blur_dither.frag diff --git a/assets/shaders/boxdown.frag b/src/shaders/boxdown.frag similarity index 100% rename from assets/shaders/boxdown.frag rename to src/shaders/boxdown.frag diff --git a/assets/shaders/boxup.frag b/src/shaders/boxup.frag similarity index 100% rename from assets/shaders/boxup.frag rename to src/shaders/boxup.frag diff --git a/assets/shaders/crt.frag b/src/shaders/crt.frag similarity index 100% rename from assets/shaders/crt.frag rename to src/shaders/crt.frag diff --git a/assets/shaders/diff.frag b/src/shaders/diff.frag similarity index 100% rename from assets/shaders/diff.frag rename to src/shaders/diff.frag diff --git a/assets/shaders/dither_512_0.tga b/src/shaders/dither_512_0.tga similarity index 100% rename from assets/shaders/dither_512_0.tga rename to src/shaders/dither_512_0.tga diff --git a/assets/shaders/dither_512_1.tga b/src/shaders/dither_512_1.tga similarity index 100% rename from assets/shaders/dither_512_1.tga rename to src/shaders/dither_512_1.tga diff --git a/assets/shaders/dither_512_2.tga b/src/shaders/dither_512_2.tga similarity index 100% rename from assets/shaders/dither_512_2.tga rename to src/shaders/dither_512_2.tga diff --git a/assets/shaders/dither_512_3.tga b/src/shaders/dither_512_3.tga similarity index 100% rename from assets/shaders/dither_512_3.tga rename to src/shaders/dither_512_3.tga diff --git a/assets/shaders/dither_512_4.tga b/src/shaders/dither_512_4.tga similarity index 100% rename from assets/shaders/dither_512_4.tga rename to src/shaders/dither_512_4.tga diff --git a/assets/shaders/dither_512_5.tga b/src/shaders/dither_512_5.tga similarity index 100% rename from assets/shaders/dither_512_5.tga rename to src/shaders/dither_512_5.tga diff --git a/assets/shaders/dither_512_6.tga b/src/shaders/dither_512_6.tga similarity index 100% rename from assets/shaders/dither_512_6.tga rename to src/shaders/dither_512_6.tga diff --git a/assets/shaders/dither_512_7.tga b/src/shaders/dither_512_7.tga similarity index 100% rename from assets/shaders/dither_512_7.tga rename to src/shaders/dither_512_7.tga diff --git a/assets/shaders/ghastlywhite.frag b/src/shaders/ghastlywhite.frag similarity index 100% rename from assets/shaders/ghastlywhite.frag rename to src/shaders/ghastlywhite.frag diff --git a/assets/shaders/hicolour.frag b/src/shaders/hicolour.frag similarity index 100% rename from assets/shaders/hicolour.frag rename to src/shaders/hicolour.frag diff --git a/assets/shaders/kawasedown.frag b/src/shaders/kawasedown.frag similarity index 100% rename from assets/shaders/kawasedown.frag rename to src/shaders/kawasedown.frag diff --git a/assets/shaders/kawaseup.frag b/src/shaders/kawaseup.frag similarity index 100% rename from assets/shaders/kawaseup.frag rename to src/shaders/kawaseup.frag diff --git a/assets/shaders/loadingCircle.frag b/src/shaders/loadingCircle.frag similarity index 100% rename from assets/shaders/loadingCircle.frag rename to src/shaders/loadingCircle.frag diff --git a/assets/shaders/passthrurgb.frag b/src/shaders/passthrurgb.frag similarity index 100% rename from assets/shaders/passthrurgb.frag rename to src/shaders/passthrurgb.frag diff --git a/assets/shaders/quickgreyscale.frag b/src/shaders/quickgreyscale.frag similarity index 100% rename from assets/shaders/quickgreyscale.frag rename to src/shaders/quickgreyscale.frag diff --git a/assets/shaders/quickgreyscale.vert b/src/shaders/quickgreyscale.vert similarity index 100% rename from assets/shaders/quickgreyscale.vert rename to src/shaders/quickgreyscale.vert diff --git a/assets/shaders/reflect.frag b/src/shaders/reflect.frag similarity index 100% rename from assets/shaders/reflect.frag rename to src/shaders/reflect.frag diff --git a/assets/shaders/rgbonly.frag b/src/shaders/rgbonly.frag similarity index 100% rename from assets/shaders/rgbonly.frag rename to src/shaders/rgbonly.frag diff --git a/assets/shaders/rgbxmul.frag b/src/shaders/rgbxmul.frag similarity index 100% rename from assets/shaders/rgbxmul.frag rename to src/shaders/rgbxmul.frag diff --git a/assets/shaders/skyboxfill.frag b/src/shaders/skyboxfill.frag similarity index 100% rename from assets/shaders/skyboxfill.frag rename to src/shaders/skyboxfill.frag diff --git a/assets/shaders/tiling.frag b/src/shaders/tiling.frag similarity index 100% rename from assets/shaders/tiling.frag rename to src/shaders/tiling.frag diff --git a/assets/shaders/tiling_dither.frag b/src/shaders/tiling_dither.frag similarity index 100% rename from assets/shaders/tiling_dither.frag rename to src/shaders/tiling_dither.frag