Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace `isVoid` with whole `voidColor` feature!

This commit is contained in:
TechnicJelle 2023-09-30 22:43:54 +02:00
parent f3d0ca27b9
commit 58e2755c89
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapCommon/webapp/src/js/MapViewer.js
View File

@ -59,8 +59,8 @@ export class MapViewer {
distance: { value: 0 },
sunlightStrength: { value: 1 },
ambientLight: { value: 0 },
hasVoid: { value: true },
skyColor: { value: new Color(0, 0, 0) },
voidColor: { value: new Color(1, 0, 1) },
hiresTileMap: {
value: {
map: null,

16
BlueMapCommon/webapp/src/js/map/lowres/LowresFragmentShader.js
View File

@ -50,8 +50,7 @@ uniform vec2 tileSize;
uniform vec2 textureSize;
uniform float lod;
uniform float lodScale;
uniform bool hasVoid;
uniform vec3 skyColor;
uniform vec3 voidColor;
varying vec3 vPosition;
varying vec3 vWorldPosition;
@ -78,6 +77,9 @@ vec2 posToMetaUV(vec2 pos) {
return vec2(pos.x / textureSize.x, pos.y / textureSize.y + 0.5);
}
vec3 adjustColor(vec3 color) {
return vec3(color * max(sunlightStrength * sunlightStrength, ambientLight));
}
void main() {
//discard if hires tile is loaded at that position
@ -121,12 +123,10 @@ void main() {
float light = mix(blockLight, 15.0, sunlightStrength);
color.rgb *= mix(ambientLight, 1.0, light / 15.0);
if (!hasVoid) {
vec3 adjustedSkyColor = vec3(skyColor * max(sunlightStrength * sunlightStrength, ambientLight)); //calculation from SkyFragmentShader.js
//where there's transparency, there is void that needs to be coloured
color.rgb = mix(adjustedSkyColor, color.rgb, color.a);
}
color.a = 1.0; // don't display transparency
vec3 adjustedVoidColor = adjustColor(voidColor);
//where there's transparency, there is void that needs to be coloured
color.rgb = mix(adjustedVoidColor, color.rgb, color.a);
color.a = 1.0; //but don't actually display the transparency
gl_FragColor = color;

17
BlueMapCommon/webapp/src/js/skybox/SkyFragmentShader.js
View File

@ -26,20 +26,23 @@ export const SKY_FRAGMENT_SHADER = `
uniform float sunlightStrength;
uniform float ambientLight;
uniform vec3 skyColor;
uniform bool hasVoid;
uniform vec3 voidColor;
varying vec3 vPosition;
vec3 adjustColor(vec3 color) {
return vec3(color * max(sunlightStrength * sunlightStrength, ambientLight));
}
void main() {
float horizonWidth = 0.005;
float horizonHeight = 0.0;
vec4 color = vec4(skyColor * max(sunlightStrength * sunlightStrength, ambientLight), 1.0);
if (hasVoid) {
float voidMultiplier = (clamp(vPosition.y - horizonHeight, -horizonWidth, horizonWidth) + horizonWidth) / (horizonWidth * 2.0);
color.rgb *= voidMultiplier;
}
vec3 adjustedSkyColor = adjustColor(skyColor);
vec3 adjustedVoidColor = adjustColor(voidColor);
float voidMultiplier = (clamp(vPosition.y - horizonHeight, -horizonWidth, horizonWidth) + horizonWidth) / (horizonWidth * 2.0);
vec3 color = mix(adjustedVoidColor, adjustedSkyColor, voidMultiplier);
gl_FragColor = color;
gl_FragColor = vec4(color, 1.0);
}
`;