Upstream/BlueMapWeb
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMapWeb.git synced 2024-09-27 21:22:35 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Upstream:4ebb90f7d152dd51fafb7853583d6c55d3656a91
Branches Tags
Upstream:master
..
compare: Upstream:831d9185a2c4ec168656e6213539424b1b04cdfe
Branches Tags
Upstream:master

No commits in common. "4ebb90f7d152dd51fafb7853583d6c55d3656a91" and "831d9185a2c4ec168656e6213539424b1b04cdfe" have entirely different histories.
4ebb90f7d1 ... 831d9185a2

3 changed files with 7 additions and 45 deletions
Show Stats Expand all files Collapse all files

11
src/controls/map/MapControls.js
View File

@ -173,13 +173,10 @@ export class MapControls {
let maxAngleForZoom = this.getMaxPerspectiveAngleForDistance(this.manager.distance);
// rotation
this.mouseRotate.update(delta, map);
this.keyRotate.update(delta, map);
this.touchRotate.update(delta, map);
// snap rotation to north on orthographic view
if (this.manager.ortho !== 0 && Math.abs(this.manager.rotation) < 0.3) {
this.manager.rotation = softClamp(this.manager.rotation, 0, 0, 0.05);
if (this.manager.ortho === 0) {
this.mouseRotate.update(delta, map);
this.keyRotate.update(delta, map);
this.touchRotate.update(delta, map);
}
// tilt

9
src/map/LowresTileLoader.js
View File

@ -85,8 +85,6 @@ export class LowresTileLoader {
return;
}
const scale = Math.pow(this.tileSettings.lodFactor, this.lod - 1);
let material = new ShaderMaterial({
uniforms: {
...this.uniforms,
@ -99,12 +97,6 @@ export class LowresTileLoader {
textureImage: {
type: 't',
value: texture
},
lod: {
value: this.lod
},
lodScale: {
value: scale
}
},
vertexShader: this.vertexShader,
@ -119,6 +111,7 @@ export class LowresTileLoader {
let object = new Mesh(this.geometry, material);
const scale = Math.pow(this.tileSettings.lodFactor, this.lod - 1);
object.position.set(tileX * this.tileSettings.tileSize.x * scale, 0, tileZ * this.tileSettings.tileSize.z * scale);
object.scale.set(scale, 1, scale);

32
src/map/lowres/LowresFragmentShader.js
View File

@ -27,8 +27,6 @@ import { ShaderChunk } from 'three';
export const LOWRES_FRAGMENT_SHADER = `
${ShaderChunk.logdepthbuf_pars_fragment}
#define PI 3.1415926535897932
#ifndef texture
#define texture texture2D
#endif
@ -47,8 +45,6 @@ uniform TileMap hiresTileMap;
uniform sampler2D textureImage;
uniform vec2 tileSize;
uniform vec2 textureSize;
uniform float lod;
uniform float lodScale;
varying vec3 vPosition;
varying vec3 vWorldPosition;
@ -75,7 +71,6 @@ vec2 posToMetaUV(vec2 pos) {
return vec2(pos.x / textureSize.x, pos.y / textureSize.y + 0.5);
}
void main() {
//discard if hires tile is loaded at that position
if (vDistance < 900.0 && texture(hiresTileMap.map, ((vWorldPosition.xz - hiresTileMap.translate) / hiresTileMap.scale - hiresTileMap.pos) / hiresTileMap.size + 0.5).r > 0.75) discard;
@ -87,31 +82,8 @@ void main() {
float heightX = metaToHeight(texture(textureImage, posToMetaUV(vPosition.xz + vec2(1.0, 0.0))));
float heightZ = metaToHeight(texture(textureImage, posToMetaUV(vPosition.xz + vec2(0.0, 1.0))));
float heightDiff = ((height - heightX) + (height - heightZ)) / lodScale;
float shade = clamp(heightDiff * 0.06, -0.2, 0.04);
float ao = 0.0;
float aoStrength = 0.0;
if(lod == 1.0) {
aoStrength = smoothstep(PI - 0.8, PI - 0.2, acos(-clamp(viewMatrix[1][2], 0.0, 1.0)));
aoStrength *= 1.0 - smoothstep(200.0, 500.0, vDistance);
if (aoStrength > 0.0) {
const float r = 3.0;
const float step = 0.2;
const float o = step / r * 0.1;
for (float vx = -r; vx <= r; vx++) {
for (float vz = -r; vz <= r; vz++) {
heightDiff = height - metaToHeight(texture(textureImage, posToMetaUV(vPosition.xz + vec2(vx * step, vz * step))));
if (heightDiff < 0.0) {
ao -= o;
}
}
}
}
}
color.rgb += mix(shade, shade * 0.3 + ao, aoStrength);
float diff = (height - heightX) + (height - heightZ);
color.rgb += clamp(diff * 0.04, -0.2, 0.04);
float blockLight = metaToLight(meta);
float light = mix(blockLight, 15.0, sunlightStrength);