misc changes(added a bug list)

ColdIce1605 · Jul 12, 2020 · 9f61f7b · 9f61f7b
1 parent f2d8971
commit 9f61f7b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 8 deletions.
diff --git a/known_bugs.txt b/known_bugs.txt
@@ -0,0 +1,5 @@
+! BUGS
+1: The edge of the lightmap creates a bright line
+2: Normals are very slightly off
+3: Hand isn't working
+4: Shadows and the beginning of the night is very dark
diff --git a/shaders/block.properties b/shaders/block.properties
@@ -1,5 +1,5 @@
 ; Leaves
-block.18 = minecraft:leaves minecraft:leaves2
+block.18 = minecraft:oak_leaves minecraft:spruce_leaves minecraft:birch_leaves minecraft:jungle_leaves minecraft:acacia_leaves minecraft:dark_oak_leaves
 
 ; Flowers
 block.37 = minecraft:yellow_flower minecraft:red_flower

diff --git a/shaders/cfg/global.scfg b/shaders/cfg/global.scfg
@@ -1,3 +1,4 @@
 #define GAMMA 2.2
+#define Vignette_Strength 1.6 //[0.0 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5]
 
 #define TEXTURE_RESOLUTION 16 // [16 32 64 128 256 512 1024 2048]
diff --git a/shaders/composite.fsh b/shaders/composite.fsh
@@ -10,8 +10,8 @@
 
 //--// Misc
 
-const float sunPathRotation = -40.0;
-const int noiseTextureResolution = 64;
+const float sunPathRotation = -30.0;
+const int noiseTextureResolution = 128;
 
 //--// Shadows
 

diff --git a/shaders/composite2.fsh b/shaders/composite2.fsh
@@ -11,7 +11,7 @@
 #define REFLECTION_SAMPLES 1 // [0 1 2 4 8 16]
 #define REFLECTION_BOUNCES 1 // [1 2]
 
-//--// Whatever I end up naming this //------------------------------------------------------------------//
+//--// Materials //--------------------------------------------------------------------------------------//
 
 #include "/lib/materials.glsl"
 
@@ -369,7 +369,7 @@ void main() {
 	}
 	#endif
 
-	composite += surface.mat.emission * ILLUMINANCE_BLOCK;
+	composite += surface.mat.emission * LUMINANCE_BLOCK;
 
 	if (waterMask) {
 		composite = calculateWaterShading(surface);

diff --git a/shaders/final.fsh b/shaders/final.fsh
@@ -73,6 +73,15 @@ void tonemap(inout vec3 color) {
 	color /= color + 1.0;
 	color  = pow(color, vec3(0.5 / GAMMA));
 }
+
+void vignette(inout vec3 color) {
+    float dist = distance(fragCoord, vec2(0.5)) * Vignette_Strength;
+
+    dist = pow(dist / 2.0, 1.1);
+
+    color * (1.0 - dist);
+}
+
 void dither(inout vec3 color) {
 	const mat4 pattern = mat4(
 		 1,  9,  3, 11,
@@ -92,6 +101,8 @@ void main() {
 	#ifdef BLOOM
 	applyBloom(finalColor);
 	#endif
+
+	vignette(finalColor);
 
 	lowLightAdapt(finalColor);
 

diff --git a/shaders/lib/light/block.fsh b/shaders/lib/light/block.fsh
@@ -2,6 +2,6 @@ vec3 calculateBlockLight(float mask) {
 	float dist = max((1 - mask) * 16 - 1, 0.0);
 	mask = mask / (dist * dist + 1);
 
-	vec3 light = ILLUMINANCE_BLOCK * vec3(1.00, 0.50, 0.20) * mask;
+	vec3 light = LUMINANCE_BLOCK * vec3(1.00, 0.50, 0.20) * mask;
 	return light;
 }
diff --git a/shaders/lib/lightingConstants.glsl b/shaders/lib/lightingConstants.glsl
@@ -1,5 +1,5 @@
 // Sun luminance is close to the exact value that will result in an illuminance of 128000 lux with what I have set for the apparent size of the sun.
-// I might have gottent the luminance wrong tough.
+// I might have gotten the luminance wrong tough.
 #define   LUMINANCE_SUN  6.61e6
 #define ILLUMINANCE_SUN  128e3
 
@@ -14,4 +14,4 @@
 #define ILLUMINANCE_SKY  7e3
 
 // This value needs a lot of tuning. It also should really be LUMINANCE_BLOCK, but I'll change that later.
-#define ILLUMINANCE_BLOCK 50
+#define LUMINANCE_BLOCK 50