summaryrefslogtreecommitdiffstats
path: root/cwd
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-01-26 10:54:29 +0100
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-01-26 10:58:17 +0100
commitf8af4c44d17b94ab814f1784060388afd7a24e03 (patch)
treee0c8e06c209fe964b03caae362169facecd3c949 /cwd
parentImplemented new Shader class (diff)
downloadAltCraft-f8af4c44d17b94ab814f1784060388afd7a24e03.tar
AltCraft-f8af4c44d17b94ab814f1784060388afd7a24e03.tar.gz
AltCraft-f8af4c44d17b94ab814f1784060388afd7a24e03.tar.bz2
AltCraft-f8af4c44d17b94ab814f1784060388afd7a24e03.tar.lz
AltCraft-f8af4c44d17b94ab814f1784060388afd7a24e03.tar.xz
AltCraft-f8af4c44d17b94ab814f1784060388afd7a24e03.tar.zst
AltCraft-f8af4c44d17b94ab814f1784060388afd7a24e03.zip
Diffstat (limited to '')
-rw-r--r--cwd/assets/altcraft/shaders/entity.json10
-rw-r--r--cwd/assets/altcraft/shaders/face.json10
-rw-r--r--cwd/assets/altcraft/shaders/fbo.json7
-rw-r--r--cwd/assets/altcraft/shaders/frag/entity.fs (renamed from cwd/shaders/entity.fs)0
-rw-r--r--cwd/assets/altcraft/shaders/frag/face.fs (renamed from cwd/shaders/face.fs)1
-rw-r--r--cwd/assets/altcraft/shaders/frag/fbo.fs (renamed from cwd/shaders/fbo.fs)0
-rw-r--r--cwd/assets/altcraft/shaders/frag/sky.fs (renamed from cwd/shaders/sky.fs)0
-rw-r--r--cwd/assets/altcraft/shaders/sky.json15
-rw-r--r--cwd/assets/altcraft/shaders/vert/entity.vs (renamed from cwd/shaders/entity.vs)0
-rw-r--r--cwd/assets/altcraft/shaders/vert/face.vs (renamed from cwd/shaders/face.vs)0
-rw-r--r--cwd/assets/altcraft/shaders/vert/fbo.vs (renamed from cwd/shaders/fbo.vs)0
-rw-r--r--cwd/assets/altcraft/shaders/vert/sky.vs (renamed from cwd/shaders/sky.vs)0
12 files changed, 42 insertions, 1 deletions
diff --git a/cwd/assets/altcraft/shaders/entity.json b/cwd/assets/altcraft/shaders/entity.json
new file mode 100644
index 0000000..0b65c72
--- /dev/null
+++ b/cwd/assets/altcraft/shaders/entity.json
@@ -0,0 +1,10 @@
+{
+ "vert": "/altcraft/shaders/vert/entity",
+ "frag": "/altcraft/shaders/frag/entity",
+ "uniforms": [
+ "color",
+ "view",
+ "projection",
+ "model"
+ ]
+} \ No newline at end of file
diff --git a/cwd/assets/altcraft/shaders/face.json b/cwd/assets/altcraft/shaders/face.json
new file mode 100644
index 0000000..1454dcf
--- /dev/null
+++ b/cwd/assets/altcraft/shaders/face.json
@@ -0,0 +1,10 @@
+{
+ "vert": "/altcraft/shaders/vert/face",
+ "frag": "/altcraft/shaders/frag/face",
+ "uniforms": [
+ "projView",
+ "textureAtlas",
+ "DayTime",
+ "MinLightLevel"
+ ]
+} \ No newline at end of file
diff --git a/cwd/assets/altcraft/shaders/fbo.json b/cwd/assets/altcraft/shaders/fbo.json
new file mode 100644
index 0000000..d9f8734
--- /dev/null
+++ b/cwd/assets/altcraft/shaders/fbo.json
@@ -0,0 +1,7 @@
+{
+ "vert": "/altcraft/shaders/vert/fbo",
+ "frag": "/altcraft/shaders/frag/fbo",
+ "uniforms": [
+ "inputTexture"
+ ]
+} \ No newline at end of file
diff --git a/cwd/shaders/entity.fs b/cwd/assets/altcraft/shaders/frag/entity.fs
index f0bb42f..f0bb42f 100644
--- a/cwd/shaders/entity.fs
+++ b/cwd/assets/altcraft/shaders/frag/entity.fs
diff --git a/cwd/shaders/face.fs b/cwd/assets/altcraft/shaders/frag/face.fs
index 4872f06..98b389a 100644
--- a/cwd/shaders/face.fs
+++ b/cwd/assets/altcraft/shaders/frag/face.fs
@@ -8,7 +8,6 @@ in VS_OUT {
} fs_in;
uniform sampler2DArray textureAtlas;
-uniform vec2 windowSize;
uniform float DayTime;
uniform float MinLightLevel;
diff --git a/cwd/shaders/fbo.fs b/cwd/assets/altcraft/shaders/frag/fbo.fs
index df624b3..df624b3 100644
--- a/cwd/shaders/fbo.fs
+++ b/cwd/assets/altcraft/shaders/frag/fbo.fs
diff --git a/cwd/shaders/sky.fs b/cwd/assets/altcraft/shaders/frag/sky.fs
index 36d65a5..36d65a5 100644
--- a/cwd/shaders/sky.fs
+++ b/cwd/assets/altcraft/shaders/frag/sky.fs
diff --git a/cwd/assets/altcraft/shaders/sky.json b/cwd/assets/altcraft/shaders/sky.json
new file mode 100644
index 0000000..6e53db6
--- /dev/null
+++ b/cwd/assets/altcraft/shaders/sky.json
@@ -0,0 +1,15 @@
+{
+ "vert": "/altcraft/shaders/vert/sky",
+ "frag": "/altcraft/shaders/frag/sky",
+ "uniforms": [
+ "view",
+ "projection",
+ "model",
+ "textureAtlas",
+ "DayTime",
+ "sunTexture",
+ "sunTextureLayer",
+ "moonTexture",
+ "moonTextureLayer"
+ ]
+} \ No newline at end of file
diff --git a/cwd/shaders/entity.vs b/cwd/assets/altcraft/shaders/vert/entity.vs
index baa25e5..baa25e5 100644
--- a/cwd/shaders/entity.vs
+++ b/cwd/assets/altcraft/shaders/vert/entity.vs
diff --git a/cwd/shaders/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs
index 9c40846..9c40846 100644
--- a/cwd/shaders/face.vs
+++ b/cwd/assets/altcraft/shaders/vert/face.vs
diff --git a/cwd/shaders/fbo.vs b/cwd/assets/altcraft/shaders/vert/fbo.vs
index e1e8966..e1e8966 100644
--- a/cwd/shaders/fbo.vs
+++ b/cwd/assets/altcraft/shaders/vert/fbo.vs
diff --git a/cwd/shaders/sky.vs b/cwd/assets/altcraft/shaders/vert/sky.vs
index 983e1f3..983e1f3 100644
--- a/cwd/shaders/sky.vs
+++ b/cwd/assets/altcraft/shaders/vert/sky.vs