From de1ddecfbab4b861ee88c9002f0b20c993d35890 Mon Sep 17 00:00:00 2001 From: austin Date: Mon, 2 Sep 2024 15:49:23 -0400 Subject: [PATCH] move shaders around --- assets/Shaders/{ => archive}/clouds1/clouds1.fs | 0 assets/Shaders/{ => archive}/clouds1/clouds1.vs | 0 assets/Shaders/{ => archive}/flame1/flame.fs | 0 assets/Shaders/{ => archive}/flame1/flame.vs | 0 assets/Shaders/{ => archive}/flame2/flame.fs | 0 assets/Shaders/{ => archive}/flame2/flame.vs | 0 assets/Shaders/{ => archive}/fluid1/fluid1.fs | 0 assets/Shaders/{ => archive}/fluid1/fluid1.vs | 0 assets/Shaders/{ => archive}/grass1/grass1.fs | 0 assets/Shaders/{ => archive}/grass1/grass1.gs | 0 assets/Shaders/{ => archive}/grass1/grass1.vs | 0 .../particleBillboard/particleBillboard.fs | 0 .../particleBillboard/particleBillboard.vs | 0 .../{ => archive}/reflectTest/FragmentShader.fs | 0 .../{ => archive}/reflectTest/VertexShader.vs | 0 assets/Shaders/{ => archive}/smoke1/smoke1.fs | 0 assets/Shaders/{ => archive}/smoke1/smoke1.vs | 0 .../Shaders/{ => archive}/terrain/terrain-low.fs | 0 assets/Shaders/{ => archive}/terrain/terrain.fs | 0 assets/Shaders/{ => archive}/terrain/terrain.vs | 0 assets/Shaders/{ => archive}/water1/water.fs | 0 assets/Shaders/{ => archive}/water1/water.vs | 0 assets/Shaders/{ => core}/anime/celShading.fs | 0 assets/Shaders/{ => core}/anime/celShading.vs | 0 .../anime/compositeAnimeOutline-low.fs | 0 .../{ => core}/anime/compositeAnimeOutline.fs | 0 .../{ => core}/anime/compositeAnimeOutline.vs | 0 .../Shaders/{ => core}/anime/outlineNormals.fs | 0 .../Shaders/{ => core}/anime/outlineNormals.vs | 0 .../{ => core}/anime/outlineNormalsColorful.fs | 0 .../{ => core}/anime/outlineNormalsColorful.vs | 0 assets/Shaders/{ => core}/anime/renderNormals.fs | 0 assets/Shaders/{ => core}/anime/renderNormals.vs | 0 .../Shaders/{ => core}/lightDepth/lightDepth.fs | 0 .../Shaders/{ => core}/lightDepth/lightDepth.vs | 0 assets/Shaders/{ => core}/oit/composite-low.fs | 0 assets/Shaders/{ => core}/oit/composite.fs | 0 assets/Shaders/{ => core}/oit/composite.vs | 0 .../{ => core}/oit/general/FragmentShader.fs | 0 .../{ => core}/oit/general/VertexShader.vs | 0 .../oit/general/VertexShaderNoBones.vs | 0 assets/Shaders/{ => core}/plane/plane.fs | 0 assets/Shaders/{ => core}/plane/plane.vs | 0 .../screentexture/drawChannel/drawChannel.fs | 0 .../screentexture/drawChannel/drawChannel.vs | 0 .../screentexture/drawDepth/drawDepth.fs | 0 .../screentexture/drawDepth/drawDepth.vs | 0 .../drawDepthBuffer/drawDepthBuffer.fs | 0 .../drawDepthBuffer/drawDepthBuffer.vs | 0 .../{ => core}/screentexture/simple1/simple1.fs | 0 .../{ => core}/screentexture/simple1/simple1.vs | 0 .../{ => core}/volumeBuffer/volumetric.fs | 0 .../{ => core}/volumeBuffer/volumetric.vs | 0 assets/Shaders/{ => entities}/fluid2/fluid2.fs | 0 assets/Shaders/{ => entities}/fluid2/fluid2.vs | 0 assets/Shaders/{ => entities}/foliage/foliage.fs | 0 assets/Shaders/{ => entities}/foliage/foliage.vs | 0 .../skybox/FragmentShaderNoTexture.fs | 0 .../skybox/VertexShaderNoTexture.vs | 0 .../{ => entities}/skysphere/skysphere.fs | 0 .../{ => entities}/skysphere/skysphere.vs | 0 .../Shaders/{ => entities}/terrain2/terrain2.fs | 0 .../Shaders/{ => entities}/terrain2/terrain2.vs | 0 assets/Shaders/shaderoptions.json | 12 ++++++------ .../{ => ui}/font/basicbitmap/basicbitmap.fs | 0 .../{ => ui}/font/basicbitmap/basicbitmap.vs | 0 .../{ => ui}/font/bitmapchar/bitmapchar.fs | 0 .../{ => ui}/font/bitmapchar/bitmapchar.vs | 0 .../foliagemanager/ClientFoliageManager.java | 4 ++-- src/main/java/electrosphere/engine/Globals.java | 10 +++++----- .../engine/loadingthreads/ClientLoading.java | 2 +- .../java/electrosphere/renderer/RenderUtils.java | 4 ++-- .../electrosphere/renderer/RenderingEngine.java | 16 ++++++++-------- .../pipelines/PostProcessingPipeline.java | 2 +- .../renderer/shader/ShaderProgram.java | 6 +++--- 75 files changed, 28 insertions(+), 28 deletions(-) rename assets/Shaders/{ => archive}/clouds1/clouds1.fs (100%) rename assets/Shaders/{ => archive}/clouds1/clouds1.vs (100%) rename assets/Shaders/{ => archive}/flame1/flame.fs (100%) rename assets/Shaders/{ => archive}/flame1/flame.vs (100%) rename assets/Shaders/{ => archive}/flame2/flame.fs (100%) rename assets/Shaders/{ => archive}/flame2/flame.vs (100%) rename assets/Shaders/{ => archive}/fluid1/fluid1.fs (100%) rename assets/Shaders/{ => archive}/fluid1/fluid1.vs (100%) rename assets/Shaders/{ => archive}/grass1/grass1.fs (100%) rename assets/Shaders/{ => archive}/grass1/grass1.gs (100%) rename assets/Shaders/{ => archive}/grass1/grass1.vs (100%) rename assets/Shaders/{ => archive}/particleBillboard/particleBillboard.fs (100%) rename assets/Shaders/{ => archive}/particleBillboard/particleBillboard.vs (100%) rename assets/Shaders/{ => archive}/reflectTest/FragmentShader.fs (100%) rename assets/Shaders/{ => archive}/reflectTest/VertexShader.vs (100%) rename assets/Shaders/{ => archive}/smoke1/smoke1.fs (100%) rename assets/Shaders/{ => archive}/smoke1/smoke1.vs (100%) rename assets/Shaders/{ => archive}/terrain/terrain-low.fs (100%) rename assets/Shaders/{ => archive}/terrain/terrain.fs (100%) rename assets/Shaders/{ => archive}/terrain/terrain.vs (100%) rename assets/Shaders/{ => archive}/water1/water.fs (100%) rename assets/Shaders/{ => archive}/water1/water.vs (100%) rename assets/Shaders/{ => core}/anime/celShading.fs (100%) rename assets/Shaders/{ => core}/anime/celShading.vs (100%) rename assets/Shaders/{ => core}/anime/compositeAnimeOutline-low.fs (100%) rename assets/Shaders/{ => core}/anime/compositeAnimeOutline.fs (100%) rename assets/Shaders/{ => core}/anime/compositeAnimeOutline.vs (100%) rename assets/Shaders/{ => core}/anime/outlineNormals.fs (100%) rename assets/Shaders/{ => core}/anime/outlineNormals.vs (100%) rename assets/Shaders/{ => core}/anime/outlineNormalsColorful.fs (100%) rename assets/Shaders/{ => core}/anime/outlineNormalsColorful.vs (100%) rename assets/Shaders/{ => core}/anime/renderNormals.fs (100%) rename assets/Shaders/{ => core}/anime/renderNormals.vs (100%) rename assets/Shaders/{ => core}/lightDepth/lightDepth.fs (100%) rename assets/Shaders/{ => core}/lightDepth/lightDepth.vs (100%) rename assets/Shaders/{ => core}/oit/composite-low.fs (100%) rename assets/Shaders/{ => core}/oit/composite.fs (100%) rename assets/Shaders/{ => core}/oit/composite.vs (100%) rename assets/Shaders/{ => core}/oit/general/FragmentShader.fs (100%) rename assets/Shaders/{ => core}/oit/general/VertexShader.vs (100%) rename assets/Shaders/{ => core}/oit/general/VertexShaderNoBones.vs (100%) rename assets/Shaders/{ => core}/plane/plane.fs (100%) rename assets/Shaders/{ => core}/plane/plane.vs (100%) rename assets/Shaders/{ => core}/screentexture/drawChannel/drawChannel.fs (100%) rename assets/Shaders/{ => core}/screentexture/drawChannel/drawChannel.vs (100%) rename assets/Shaders/{ => core}/screentexture/drawDepth/drawDepth.fs (100%) rename assets/Shaders/{ => core}/screentexture/drawDepth/drawDepth.vs (100%) rename assets/Shaders/{ => core}/screentexture/drawDepthBuffer/drawDepthBuffer.fs (100%) rename assets/Shaders/{ => core}/screentexture/drawDepthBuffer/drawDepthBuffer.vs (100%) rename assets/Shaders/{ => core}/screentexture/simple1/simple1.fs (100%) rename assets/Shaders/{ => core}/screentexture/simple1/simple1.vs (100%) rename assets/Shaders/{ => core}/volumeBuffer/volumetric.fs (100%) rename assets/Shaders/{ => core}/volumeBuffer/volumetric.vs (100%) rename assets/Shaders/{ => entities}/fluid2/fluid2.fs (100%) rename assets/Shaders/{ => entities}/fluid2/fluid2.vs (100%) rename assets/Shaders/{ => entities}/foliage/foliage.fs (100%) rename assets/Shaders/{ => entities}/foliage/foliage.vs (100%) rename assets/Shaders/{ => entities}/skybox/FragmentShaderNoTexture.fs (100%) rename assets/Shaders/{ => entities}/skybox/VertexShaderNoTexture.vs (100%) rename assets/Shaders/{ => entities}/skysphere/skysphere.fs (100%) rename assets/Shaders/{ => entities}/skysphere/skysphere.vs (100%) rename assets/Shaders/{ => entities}/terrain2/terrain2.fs (100%) rename assets/Shaders/{ => entities}/terrain2/terrain2.vs (100%) rename assets/Shaders/{ => ui}/font/basicbitmap/basicbitmap.fs (100%) rename assets/Shaders/{ => ui}/font/basicbitmap/basicbitmap.vs (100%) rename assets/Shaders/{ => ui}/font/bitmapchar/bitmapchar.fs (100%) rename assets/Shaders/{ => ui}/font/bitmapchar/bitmapchar.vs (100%) diff --git a/assets/Shaders/clouds1/clouds1.fs b/assets/Shaders/archive/clouds1/clouds1.fs similarity index 100% rename from assets/Shaders/clouds1/clouds1.fs rename to assets/Shaders/archive/clouds1/clouds1.fs diff --git a/assets/Shaders/clouds1/clouds1.vs b/assets/Shaders/archive/clouds1/clouds1.vs similarity index 100% rename from assets/Shaders/clouds1/clouds1.vs rename to assets/Shaders/archive/clouds1/clouds1.vs diff --git a/assets/Shaders/flame1/flame.fs b/assets/Shaders/archive/flame1/flame.fs similarity index 100% rename from assets/Shaders/flame1/flame.fs rename to assets/Shaders/archive/flame1/flame.fs diff --git a/assets/Shaders/flame1/flame.vs b/assets/Shaders/archive/flame1/flame.vs similarity index 100% rename from assets/Shaders/flame1/flame.vs rename to assets/Shaders/archive/flame1/flame.vs diff --git a/assets/Shaders/flame2/flame.fs b/assets/Shaders/archive/flame2/flame.fs similarity index 100% rename from assets/Shaders/flame2/flame.fs rename to assets/Shaders/archive/flame2/flame.fs diff --git a/assets/Shaders/flame2/flame.vs b/assets/Shaders/archive/flame2/flame.vs similarity index 100% rename from assets/Shaders/flame2/flame.vs rename to assets/Shaders/archive/flame2/flame.vs diff --git a/assets/Shaders/fluid1/fluid1.fs b/assets/Shaders/archive/fluid1/fluid1.fs similarity index 100% rename from assets/Shaders/fluid1/fluid1.fs rename to assets/Shaders/archive/fluid1/fluid1.fs diff --git a/assets/Shaders/fluid1/fluid1.vs b/assets/Shaders/archive/fluid1/fluid1.vs similarity index 100% rename from assets/Shaders/fluid1/fluid1.vs rename to assets/Shaders/archive/fluid1/fluid1.vs diff --git a/assets/Shaders/grass1/grass1.fs b/assets/Shaders/archive/grass1/grass1.fs similarity index 100% rename from assets/Shaders/grass1/grass1.fs rename to assets/Shaders/archive/grass1/grass1.fs diff --git a/assets/Shaders/grass1/grass1.gs b/assets/Shaders/archive/grass1/grass1.gs similarity index 100% rename from assets/Shaders/grass1/grass1.gs rename to assets/Shaders/archive/grass1/grass1.gs diff --git a/assets/Shaders/grass1/grass1.vs b/assets/Shaders/archive/grass1/grass1.vs similarity index 100% rename from assets/Shaders/grass1/grass1.vs rename to assets/Shaders/archive/grass1/grass1.vs diff --git a/assets/Shaders/particleBillboard/particleBillboard.fs b/assets/Shaders/archive/particleBillboard/particleBillboard.fs similarity index 100% rename from assets/Shaders/particleBillboard/particleBillboard.fs rename to assets/Shaders/archive/particleBillboard/particleBillboard.fs diff --git a/assets/Shaders/particleBillboard/particleBillboard.vs b/assets/Shaders/archive/particleBillboard/particleBillboard.vs similarity index 100% rename from assets/Shaders/particleBillboard/particleBillboard.vs rename to assets/Shaders/archive/particleBillboard/particleBillboard.vs diff --git a/assets/Shaders/reflectTest/FragmentShader.fs b/assets/Shaders/archive/reflectTest/FragmentShader.fs similarity index 100% rename from assets/Shaders/reflectTest/FragmentShader.fs rename to assets/Shaders/archive/reflectTest/FragmentShader.fs diff --git a/assets/Shaders/reflectTest/VertexShader.vs b/assets/Shaders/archive/reflectTest/VertexShader.vs similarity index 100% rename from assets/Shaders/reflectTest/VertexShader.vs rename to assets/Shaders/archive/reflectTest/VertexShader.vs diff --git a/assets/Shaders/smoke1/smoke1.fs b/assets/Shaders/archive/smoke1/smoke1.fs similarity index 100% rename from assets/Shaders/smoke1/smoke1.fs rename to assets/Shaders/archive/smoke1/smoke1.fs diff --git a/assets/Shaders/smoke1/smoke1.vs b/assets/Shaders/archive/smoke1/smoke1.vs similarity index 100% rename from assets/Shaders/smoke1/smoke1.vs rename to assets/Shaders/archive/smoke1/smoke1.vs diff --git a/assets/Shaders/terrain/terrain-low.fs b/assets/Shaders/archive/terrain/terrain-low.fs similarity index 100% rename from assets/Shaders/terrain/terrain-low.fs rename to assets/Shaders/archive/terrain/terrain-low.fs diff --git a/assets/Shaders/terrain/terrain.fs b/assets/Shaders/archive/terrain/terrain.fs similarity index 100% rename from assets/Shaders/terrain/terrain.fs rename to assets/Shaders/archive/terrain/terrain.fs diff --git a/assets/Shaders/terrain/terrain.vs b/assets/Shaders/archive/terrain/terrain.vs similarity index 100% rename from assets/Shaders/terrain/terrain.vs rename to assets/Shaders/archive/terrain/terrain.vs diff --git a/assets/Shaders/water1/water.fs b/assets/Shaders/archive/water1/water.fs similarity index 100% rename from assets/Shaders/water1/water.fs rename to assets/Shaders/archive/water1/water.fs diff --git a/assets/Shaders/water1/water.vs b/assets/Shaders/archive/water1/water.vs similarity index 100% rename from assets/Shaders/water1/water.vs rename to assets/Shaders/archive/water1/water.vs diff --git a/assets/Shaders/anime/celShading.fs b/assets/Shaders/core/anime/celShading.fs similarity index 100% rename from assets/Shaders/anime/celShading.fs rename to assets/Shaders/core/anime/celShading.fs diff --git a/assets/Shaders/anime/celShading.vs b/assets/Shaders/core/anime/celShading.vs similarity index 100% rename from assets/Shaders/anime/celShading.vs rename to assets/Shaders/core/anime/celShading.vs diff --git a/assets/Shaders/anime/compositeAnimeOutline-low.fs b/assets/Shaders/core/anime/compositeAnimeOutline-low.fs similarity index 100% rename from assets/Shaders/anime/compositeAnimeOutline-low.fs rename to assets/Shaders/core/anime/compositeAnimeOutline-low.fs diff --git a/assets/Shaders/anime/compositeAnimeOutline.fs b/assets/Shaders/core/anime/compositeAnimeOutline.fs similarity index 100% rename from assets/Shaders/anime/compositeAnimeOutline.fs rename to assets/Shaders/core/anime/compositeAnimeOutline.fs diff --git a/assets/Shaders/anime/compositeAnimeOutline.vs b/assets/Shaders/core/anime/compositeAnimeOutline.vs similarity index 100% rename from assets/Shaders/anime/compositeAnimeOutline.vs rename to assets/Shaders/core/anime/compositeAnimeOutline.vs diff --git a/assets/Shaders/anime/outlineNormals.fs b/assets/Shaders/core/anime/outlineNormals.fs similarity index 100% rename from assets/Shaders/anime/outlineNormals.fs rename to assets/Shaders/core/anime/outlineNormals.fs diff --git a/assets/Shaders/anime/outlineNormals.vs b/assets/Shaders/core/anime/outlineNormals.vs similarity index 100% rename from assets/Shaders/anime/outlineNormals.vs rename to assets/Shaders/core/anime/outlineNormals.vs diff --git a/assets/Shaders/anime/outlineNormalsColorful.fs b/assets/Shaders/core/anime/outlineNormalsColorful.fs similarity index 100% rename from assets/Shaders/anime/outlineNormalsColorful.fs rename to assets/Shaders/core/anime/outlineNormalsColorful.fs diff --git a/assets/Shaders/anime/outlineNormalsColorful.vs b/assets/Shaders/core/anime/outlineNormalsColorful.vs similarity index 100% rename from assets/Shaders/anime/outlineNormalsColorful.vs rename to assets/Shaders/core/anime/outlineNormalsColorful.vs diff --git a/assets/Shaders/anime/renderNormals.fs b/assets/Shaders/core/anime/renderNormals.fs similarity index 100% rename from assets/Shaders/anime/renderNormals.fs rename to assets/Shaders/core/anime/renderNormals.fs diff --git a/assets/Shaders/anime/renderNormals.vs b/assets/Shaders/core/anime/renderNormals.vs similarity index 100% rename from assets/Shaders/anime/renderNormals.vs rename to assets/Shaders/core/anime/renderNormals.vs diff --git a/assets/Shaders/lightDepth/lightDepth.fs b/assets/Shaders/core/lightDepth/lightDepth.fs similarity index 100% rename from assets/Shaders/lightDepth/lightDepth.fs rename to assets/Shaders/core/lightDepth/lightDepth.fs diff --git a/assets/Shaders/lightDepth/lightDepth.vs b/assets/Shaders/core/lightDepth/lightDepth.vs similarity index 100% rename from assets/Shaders/lightDepth/lightDepth.vs rename to assets/Shaders/core/lightDepth/lightDepth.vs diff --git a/assets/Shaders/oit/composite-low.fs b/assets/Shaders/core/oit/composite-low.fs similarity index 100% rename from assets/Shaders/oit/composite-low.fs rename to assets/Shaders/core/oit/composite-low.fs diff --git a/assets/Shaders/oit/composite.fs b/assets/Shaders/core/oit/composite.fs similarity index 100% rename from assets/Shaders/oit/composite.fs rename to assets/Shaders/core/oit/composite.fs diff --git a/assets/Shaders/oit/composite.vs b/assets/Shaders/core/oit/composite.vs similarity index 100% rename from assets/Shaders/oit/composite.vs rename to assets/Shaders/core/oit/composite.vs diff --git a/assets/Shaders/oit/general/FragmentShader.fs b/assets/Shaders/core/oit/general/FragmentShader.fs similarity index 100% rename from assets/Shaders/oit/general/FragmentShader.fs rename to assets/Shaders/core/oit/general/FragmentShader.fs diff --git a/assets/Shaders/oit/general/VertexShader.vs b/assets/Shaders/core/oit/general/VertexShader.vs similarity index 100% rename from assets/Shaders/oit/general/VertexShader.vs rename to assets/Shaders/core/oit/general/VertexShader.vs diff --git a/assets/Shaders/oit/general/VertexShaderNoBones.vs b/assets/Shaders/core/oit/general/VertexShaderNoBones.vs similarity index 100% rename from assets/Shaders/oit/general/VertexShaderNoBones.vs rename to assets/Shaders/core/oit/general/VertexShaderNoBones.vs diff --git a/assets/Shaders/plane/plane.fs b/assets/Shaders/core/plane/plane.fs similarity index 100% rename from assets/Shaders/plane/plane.fs rename to assets/Shaders/core/plane/plane.fs diff --git a/assets/Shaders/plane/plane.vs b/assets/Shaders/core/plane/plane.vs similarity index 100% rename from assets/Shaders/plane/plane.vs rename to assets/Shaders/core/plane/plane.vs diff --git a/assets/Shaders/screentexture/drawChannel/drawChannel.fs b/assets/Shaders/core/screentexture/drawChannel/drawChannel.fs similarity index 100% rename from assets/Shaders/screentexture/drawChannel/drawChannel.fs rename to assets/Shaders/core/screentexture/drawChannel/drawChannel.fs diff --git a/assets/Shaders/screentexture/drawChannel/drawChannel.vs b/assets/Shaders/core/screentexture/drawChannel/drawChannel.vs similarity index 100% rename from assets/Shaders/screentexture/drawChannel/drawChannel.vs rename to assets/Shaders/core/screentexture/drawChannel/drawChannel.vs diff --git a/assets/Shaders/screentexture/drawDepth/drawDepth.fs b/assets/Shaders/core/screentexture/drawDepth/drawDepth.fs similarity index 100% rename from assets/Shaders/screentexture/drawDepth/drawDepth.fs rename to assets/Shaders/core/screentexture/drawDepth/drawDepth.fs diff --git a/assets/Shaders/screentexture/drawDepth/drawDepth.vs b/assets/Shaders/core/screentexture/drawDepth/drawDepth.vs similarity index 100% rename from assets/Shaders/screentexture/drawDepth/drawDepth.vs rename to assets/Shaders/core/screentexture/drawDepth/drawDepth.vs diff --git a/assets/Shaders/screentexture/drawDepthBuffer/drawDepthBuffer.fs b/assets/Shaders/core/screentexture/drawDepthBuffer/drawDepthBuffer.fs similarity index 100% rename from assets/Shaders/screentexture/drawDepthBuffer/drawDepthBuffer.fs rename to assets/Shaders/core/screentexture/drawDepthBuffer/drawDepthBuffer.fs diff --git a/assets/Shaders/screentexture/drawDepthBuffer/drawDepthBuffer.vs b/assets/Shaders/core/screentexture/drawDepthBuffer/drawDepthBuffer.vs similarity index 100% rename from assets/Shaders/screentexture/drawDepthBuffer/drawDepthBuffer.vs rename to assets/Shaders/core/screentexture/drawDepthBuffer/drawDepthBuffer.vs diff --git a/assets/Shaders/screentexture/simple1/simple1.fs b/assets/Shaders/core/screentexture/simple1/simple1.fs similarity index 100% rename from assets/Shaders/screentexture/simple1/simple1.fs rename to assets/Shaders/core/screentexture/simple1/simple1.fs diff --git a/assets/Shaders/screentexture/simple1/simple1.vs b/assets/Shaders/core/screentexture/simple1/simple1.vs similarity index 100% rename from assets/Shaders/screentexture/simple1/simple1.vs rename to assets/Shaders/core/screentexture/simple1/simple1.vs diff --git a/assets/Shaders/volumeBuffer/volumetric.fs b/assets/Shaders/core/volumeBuffer/volumetric.fs similarity index 100% rename from assets/Shaders/volumeBuffer/volumetric.fs rename to assets/Shaders/core/volumeBuffer/volumetric.fs diff --git a/assets/Shaders/volumeBuffer/volumetric.vs b/assets/Shaders/core/volumeBuffer/volumetric.vs similarity index 100% rename from assets/Shaders/volumeBuffer/volumetric.vs rename to assets/Shaders/core/volumeBuffer/volumetric.vs diff --git a/assets/Shaders/fluid2/fluid2.fs b/assets/Shaders/entities/fluid2/fluid2.fs similarity index 100% rename from assets/Shaders/fluid2/fluid2.fs rename to assets/Shaders/entities/fluid2/fluid2.fs diff --git a/assets/Shaders/fluid2/fluid2.vs b/assets/Shaders/entities/fluid2/fluid2.vs similarity index 100% rename from assets/Shaders/fluid2/fluid2.vs rename to assets/Shaders/entities/fluid2/fluid2.vs diff --git a/assets/Shaders/foliage/foliage.fs b/assets/Shaders/entities/foliage/foliage.fs similarity index 100% rename from assets/Shaders/foliage/foliage.fs rename to assets/Shaders/entities/foliage/foliage.fs diff --git a/assets/Shaders/foliage/foliage.vs b/assets/Shaders/entities/foliage/foliage.vs similarity index 100% rename from assets/Shaders/foliage/foliage.vs rename to assets/Shaders/entities/foliage/foliage.vs diff --git a/assets/Shaders/skybox/FragmentShaderNoTexture.fs b/assets/Shaders/entities/skybox/FragmentShaderNoTexture.fs similarity index 100% rename from assets/Shaders/skybox/FragmentShaderNoTexture.fs rename to assets/Shaders/entities/skybox/FragmentShaderNoTexture.fs diff --git a/assets/Shaders/skybox/VertexShaderNoTexture.vs b/assets/Shaders/entities/skybox/VertexShaderNoTexture.vs similarity index 100% rename from assets/Shaders/skybox/VertexShaderNoTexture.vs rename to assets/Shaders/entities/skybox/VertexShaderNoTexture.vs diff --git a/assets/Shaders/skysphere/skysphere.fs b/assets/Shaders/entities/skysphere/skysphere.fs similarity index 100% rename from assets/Shaders/skysphere/skysphere.fs rename to assets/Shaders/entities/skysphere/skysphere.fs diff --git a/assets/Shaders/skysphere/skysphere.vs b/assets/Shaders/entities/skysphere/skysphere.vs similarity index 100% rename from assets/Shaders/skysphere/skysphere.vs rename to assets/Shaders/entities/skysphere/skysphere.vs diff --git a/assets/Shaders/terrain2/terrain2.fs b/assets/Shaders/entities/terrain2/terrain2.fs similarity index 100% rename from assets/Shaders/terrain2/terrain2.fs rename to assets/Shaders/entities/terrain2/terrain2.fs diff --git a/assets/Shaders/terrain2/terrain2.vs b/assets/Shaders/entities/terrain2/terrain2.vs similarity index 100% rename from assets/Shaders/terrain2/terrain2.vs rename to assets/Shaders/entities/terrain2/terrain2.vs diff --git a/assets/Shaders/shaderoptions.json b/assets/Shaders/shaderoptions.json index 0c92bb66..6a155a8a 100644 --- a/assets/Shaders/shaderoptions.json +++ b/assets/Shaders/shaderoptions.json @@ -1,13 +1,13 @@ { "shaderAlternativesMap" : { - "/Shaders/terrain/terrain.fs" : [ - "/Shaders/terrain/terrain-low.fs" + "/Shaders/entities/terrain/terrain.fs" : [ + "/Shaders/entities/terrain/terrain-low.fs" ], - "Shaders/anime/compositeAnimeOutline.fs" : [ - "Shaders/anime/compositeAnimeOutline-low.fs" + "Shaders/core/anime/compositeAnimeOutline.fs" : [ + "Shaders/core/anime/compositeAnimeOutline-low.fs" ], - "Shaders/oit/composite.fs" : [ - "Shaders/oit/composite-low.fs" + "Shaders/core/oit/composite.fs" : [ + "Shaders/core/oit/composite-low.fs" ] } } \ No newline at end of file diff --git a/assets/Shaders/font/basicbitmap/basicbitmap.fs b/assets/Shaders/ui/font/basicbitmap/basicbitmap.fs similarity index 100% rename from assets/Shaders/font/basicbitmap/basicbitmap.fs rename to assets/Shaders/ui/font/basicbitmap/basicbitmap.fs diff --git a/assets/Shaders/font/basicbitmap/basicbitmap.vs b/assets/Shaders/ui/font/basicbitmap/basicbitmap.vs similarity index 100% rename from assets/Shaders/font/basicbitmap/basicbitmap.vs rename to assets/Shaders/ui/font/basicbitmap/basicbitmap.vs diff --git a/assets/Shaders/font/bitmapchar/bitmapchar.fs b/assets/Shaders/ui/font/bitmapchar/bitmapchar.fs similarity index 100% rename from assets/Shaders/font/bitmapchar/bitmapchar.fs rename to assets/Shaders/ui/font/bitmapchar/bitmapchar.fs diff --git a/assets/Shaders/font/bitmapchar/bitmapchar.vs b/assets/Shaders/ui/font/bitmapchar/bitmapchar.vs similarity index 100% rename from assets/Shaders/font/bitmapchar/bitmapchar.vs rename to assets/Shaders/ui/font/bitmapchar/bitmapchar.vs diff --git a/src/main/java/electrosphere/client/foliagemanager/ClientFoliageManager.java b/src/main/java/electrosphere/client/foliagemanager/ClientFoliageManager.java index 8d6bb544..961e75ba 100644 --- a/src/main/java/electrosphere/client/foliagemanager/ClientFoliageManager.java +++ b/src/main/java/electrosphere/client/foliagemanager/ClientFoliageManager.java @@ -101,8 +101,8 @@ public class ClientFoliageManager { } //shader paths - static final String vertexPath = "Shaders/foliage/foliage.vs"; - static final String fragmentPath = "Shaders/foliage/foliage.fs"; + static final String vertexPath = "Shaders/entities/foliage/foliage.vs"; + static final String fragmentPath = "Shaders/entities/foliage/foliage.fs"; diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index 27ac70b3..b3ca2791 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/src/main/java/electrosphere/engine/Globals.java @@ -587,9 +587,9 @@ public class Globals { //init default shaderProgram defaultMeshShader = ShaderProgram.smart_assemble_shader(false,true); //init terrain shader program - terrainShaderProgram = ShaderProgram.loadSpecificShader("/Shaders/terrain2/terrain2.vs", "/Shaders/terrain2/terrain2.fs"); + terrainShaderProgram = ShaderProgram.loadSpecificShader("/Shaders/entities/terrain2/terrain2.vs", "/Shaders/entities/terrain2/terrain2.fs"); //init fluid shader program - FluidChunkModelGeneration.fluidChunkShaderProgram = ShaderProgram.loadSpecificShader("/Shaders/fluid2/fluid2.vs", "/Shaders/fluid2/fluid2.fs"); + FluidChunkModelGeneration.fluidChunkShaderProgram = ShaderProgram.loadSpecificShader("/Shaders/entities/fluid2/fluid2.vs", "/Shaders/entities/fluid2/fluid2.fs"); //init models assetManager.addModelPathToQueue("Models/basic/geometry/unitsphere.glb"); assetManager.addModelPathToQueue("Models/basic/geometry/unitsphere.fbx"); @@ -600,12 +600,12 @@ public class Globals { assetManager.addModelPathToQueue("Models/basic/geometry/unitcapsule.glb"); assetManager.addModelPathToQueue("Models/basic/geometry/unitplane.fbx"); assetManager.addModelPathToQueue("Models/basic/geometry/unitcube.fbx"); - imagePlaneModelID = assetManager.registerModel(RenderUtils.createPlaneModel("Shaders/plane/plane.vs", "Shaders/plane/plane.fs")); - assetManager.addShaderToQueue("Shaders/plane/plane.vs", null, "Shaders/plane/plane.fs"); + imagePlaneModelID = assetManager.registerModel(RenderUtils.createPlaneModel("Shaders/core/plane/plane.vs", "Shaders/core/plane/plane.fs")); + assetManager.addShaderToQueue("Shaders/core/plane/plane.vs", null, "Shaders/core/plane/plane.fs"); solidPlaneModelID = assetManager.registerModel(RenderUtils.createInWindowPanel("Shaders/ui/plainBox/plainBox.vs", "Shaders/ui/plainBox/plainBox.fs")); //image panel - ImagePanel.imagePanelModelPath = assetManager.registerModel(RenderUtils.createPlaneModel("Shaders/plane/plane.vs", "Shaders/plane/plane.fs")); + ImagePanel.imagePanelModelPath = assetManager.registerModel(RenderUtils.createPlaneModel("Shaders/core/plane/plane.vs", "Shaders/core/plane/plane.fs")); Globals.assetManager.addShaderToQueue("Shaders/ui/plainBox/plainBox.vs", "Shaders/ui/plainBox/plainBox.fs"); diff --git a/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java index ed37dd6b..09523551 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java @@ -186,7 +186,7 @@ public class ClientLoading { DrawableUtils.disableCulling(skybox); EntityUtils.getRotation(skybox).rotateX((float)(-Math.PI/2.0f)); EntityUtils.getScale(skybox).mul(200000.0f); - Globals.assetManager.queueOverrideMeshShader("Models/environment/skyboxSphere.fbx", "Sphere", "Shaders/skysphere/skysphere.vs", "Shaders/skysphere/skysphere.fs"); + Globals.assetManager.queueOverrideMeshShader("Models/environment/skyboxSphere.fbx", "Sphere", "Shaders/entities/skysphere/skysphere.vs", "Shaders/entities/skysphere/skysphere.fs"); //cloud ring pseudo skybox // Entity cloudRing = EntityCreationUtils.createClientSpatialEntity(); diff --git a/src/main/java/electrosphere/renderer/RenderUtils.java b/src/main/java/electrosphere/renderer/RenderUtils.java index b0e09e4f..b663cddd 100644 --- a/src/main/java/electrosphere/renderer/RenderUtils.java +++ b/src/main/java/electrosphere/renderer/RenderUtils.java @@ -412,7 +412,7 @@ public class RenderUtils { m.bufferTextureCoords(textureArrayBufferData, 2); - m.setShader(ShaderProgram.loadSpecificShader("/Shaders/font/basicbitmap/basicbitmap.vs", "/Shaders/font/basicbitmap/basicbitmap.fs")); + m.setShader(ShaderProgram.loadSpecificShader("/Shaders/ui/font/basicbitmap/basicbitmap.vs", "/Shaders/ui/font/basicbitmap/basicbitmap.fs")); GL40.glBindVertexArray(0); @@ -509,7 +509,7 @@ public class RenderUtils { m.bufferTextureCoords(textureArrayBufferData, 2); - m.setShader(ShaderProgram.loadSpecificShader("/Shaders/font/bitmapchar/bitmapchar.vs", "/Shaders/font/bitmapchar/bitmapchar.fs")); + m.setShader(ShaderProgram.loadSpecificShader("/Shaders/ui/font/bitmapchar/bitmapchar.vs", "/Shaders/ui/font/bitmapchar/bitmapchar.fs")); GL40.glBindVertexArray(0); diff --git a/src/main/java/electrosphere/renderer/RenderingEngine.java b/src/main/java/electrosphere/renderer/RenderingEngine.java index f451128b..737e22ba 100644 --- a/src/main/java/electrosphere/renderer/RenderingEngine.java +++ b/src/main/java/electrosphere/renderer/RenderingEngine.java @@ -329,7 +329,7 @@ public class RenderingEngine { //init screen rendering quadrant screenTextureVAO = createScreenTextureVAO(); // initScreenTextureShaderProgram(); - screenTextureShaders = ShaderProgram.loadSpecificShader("/Shaders/screentexture/simple1/simple1.vs", "/Shaders/screentexture/simple1/simple1.fs"); + screenTextureShaders = ShaderProgram.loadSpecificShader("/Shaders/core/screentexture/simple1/simple1.vs", "/Shaders/core/screentexture/simple1/simple1.fs"); // screenTextureShaders = ShaderProgram.loadSpecificShader("/Shaders/screentexture/drawDepthBuffer/drawDepthBuffer.vs", "/Shaders/screentexture/drawDepthBuffer/drawDepthBuffer.fs"); //default framebuffer @@ -346,12 +346,12 @@ public class RenderingEngine { // //Channel debug program // - drawChannel = ShaderProgram.loadSpecificShader("/Shaders/screentexture/drawChannel/drawChannel.vs", "/Shaders/screentexture/drawChannel/drawChannel.fs"); + drawChannel = ShaderProgram.loadSpecificShader("/Shaders/core/screentexture/drawChannel/drawChannel.vs", "/Shaders/core/screentexture/drawChannel/drawChannel.fs"); // //create light depth framebuffer/shader for shadowmapping // - lightDepthShaderProgram = ShaderProgram.loadSpecificShader("/Shaders/lightDepth/lightDepth.vs", "/Shaders/lightDepth/lightDepth.fs"); + lightDepthShaderProgram = ShaderProgram.loadSpecificShader("/Shaders/core/lightDepth/lightDepth.vs", "/Shaders/core/lightDepth/lightDepth.fs"); Globals.depthMapShaderProgramLoc = lightDepthShaderProgram.getShaderId(); lightDepthBuffer = FramebufferUtils.generateDepthBuffer(openGLState); lightBufferDepthTexture = lightDepthBuffer.getDepthTexture(); @@ -360,7 +360,7 @@ public class RenderingEngine { // //create volume depth framebuffer/shader for volumetric rendering // - volumeDepthShaderProgram = ShaderProgram.loadSpecificShader("/Shaders/volumeBuffer/volumetric.vs", "/Shaders/volumeBuffer/volumetric.fs"); + volumeDepthShaderProgram = ShaderProgram.loadSpecificShader("/Shaders/core/volumeBuffer/volumetric.vs", "/Shaders/core/volumeBuffer/volumetric.fs"); volumeDepthBackfaceTexture = FramebufferUtils.generateDepthBufferTexture(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY()); volumeDepthBackfaceFramebuffer = FramebufferUtils.generateDepthBuffer(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY(), volumeDepthBackfaceTexture); volumeDepthFrontfaceTexture = FramebufferUtils.generateDepthBufferTexture(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY()); @@ -377,7 +377,7 @@ public class RenderingEngine { gameImageNormalsTexture = FramebufferUtils.generateScreenTextureColorAlpha(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY()); Texture gameImageNormalsDepthTexture = FramebufferUtils.generateScreenTextureDepth(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY()); gameImageNormalsFramebuffer = FramebufferUtils.generateScreenTextureFramebuffer(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY(), gameImageNormalsTexture, gameImageNormalsDepthTexture); - renderNormalsShader = ShaderProgram.loadSpecificShader("Shaders/anime/renderNormals.vs", "Shaders/anime/renderNormals.fs"); + renderNormalsShader = ShaderProgram.loadSpecificShader("Shaders/core/anime/renderNormals.vs", "Shaders/core/anime/renderNormals.fs"); // //Transparency framebuffers @@ -387,7 +387,7 @@ public class RenderingEngine { transparencyRevealageClear = new float[]{1.0f, 1.0f, 1.0f, 1.0f}; transparencyRevealageTexture = FramebufferUtils.generateOITRevealageTexture(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY()); transparencyBuffer = FramebufferUtils.generateOITFramebuffer(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY(), transparencyAccumulatorTexture, transparencyRevealageTexture, screenTextureDepth); - oitCompositeProgram = ShaderProgram.loadSpecificShader("Shaders/oit/composite.vs", "Shaders/oit/composite.fs"); + oitCompositeProgram = ShaderProgram.loadSpecificShader("Shaders/core/oit/composite.vs", "Shaders/core/oit/composite.fs"); //projection matrices nearVolumeProjectionMatrix.setPerspective((float)(Globals.verticalFOV * Math.PI /180.0f), (float)Globals.WINDOW_WIDTH / (float)Globals.WINDOW_HEIGHT, 0.1f, 100); @@ -403,12 +403,12 @@ public class RenderingEngine { normalsOutlineTexture = FramebufferUtils.generateScreenTextureColorAlpha(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY()); normalsOutlineFrambuffer = FramebufferUtils.generateScreenTextureFramebuffer(openGLState, Globals.userSettings.getRenderResolutionX(), Globals.userSettings.getRenderResolutionY(), normalsOutlineTexture); // normalsOutlineShader = ShaderProgram.loadSpecificShader("Shaders/anime/outlineNormals.vs", "Shaders/anime/outlineNormals.fs"); - Globals.assetManager.addShaderToQueue("Shaders/anime/outlineNormals.vs", "Shaders/anime/outlineNormals.fs"); + Globals.assetManager.addShaderToQueue("Shaders/core/anime/outlineNormals.vs", "Shaders/core/anime/outlineNormals.fs"); // //Compositing shaders // - compositeAnimeOutline = ShaderProgram.loadSpecificShader("Shaders/anime/compositeAnimeOutline.vs", "Shaders/anime/compositeAnimeOutline.fs"); + compositeAnimeOutline = ShaderProgram.loadSpecificShader("Shaders/core/anime/compositeAnimeOutline.vs", "Shaders/core/anime/compositeAnimeOutline.fs"); //instantiate light manager diff --git a/src/main/java/electrosphere/renderer/pipelines/PostProcessingPipeline.java b/src/main/java/electrosphere/renderer/pipelines/PostProcessingPipeline.java index 4c1033ab..1fc71c7a 100644 --- a/src/main/java/electrosphere/renderer/pipelines/PostProcessingPipeline.java +++ b/src/main/java/electrosphere/renderer/pipelines/PostProcessingPipeline.java @@ -21,7 +21,7 @@ public class PostProcessingPipeline implements RenderPipeline { // RenderingEngine.normalsOutlineFrambuffer.bind(openGLState); - ShaderProgram program = Globals.assetManager.fetchShader("Shaders/anime/outlineNormals.vs", null, "Shaders/anime/outlineNormals.fs"); + ShaderProgram program = Globals.assetManager.fetchShader("Shaders/core/anime/outlineNormals.vs", null, "Shaders/core/anime/outlineNormals.fs"); if(program != null){ openGLState.setActiveShader(renderPipelineState, program); diff --git a/src/main/java/electrosphere/renderer/shader/ShaderProgram.java b/src/main/java/electrosphere/renderer/shader/ShaderProgram.java index f32317e1..5c910cfa 100644 --- a/src/main/java/electrosphere/renderer/shader/ShaderProgram.java +++ b/src/main/java/electrosphere/renderer/shader/ShaderProgram.java @@ -199,12 +199,12 @@ public class ShaderProgram { String vertex_shader_path = ""; if(ContainsBones){ - vertex_shader_path = "/Shaders/oit/general/VertexShader.vs"; + vertex_shader_path = "/Shaders/core/oit/general/VertexShader.vs"; } else { - vertex_shader_path = "/Shaders/oit/general/VertexShaderNoBones.vs"; + vertex_shader_path = "/Shaders/core/oit/general/VertexShaderNoBones.vs"; } - String fragment_shader_path = "/Shaders/oit/general/FragmentShader.fs"; + String fragment_shader_path = "/Shaders/core/oit/general/FragmentShader.fs"; // //Create ShaderProgram object //