Skip to content

Uneven map border #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bananu7 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Uneven map border #111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa35c02
Prototype implementation of a 1D-noise based map edge
bananu7 Jul 2, 2024
aad2b4e
Added a todo about corners
bananu7 Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 81 additions & 9 deletions packages/client/src/gfx/MapBorder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function MapBorder(props: MapBorderProps) {
const color = tileTypeToColor(tileType, vec3Color);

// outline darker
vec3Color.g *= Math.abs(f(x,y));
vec3Color.g *= Math.min(f(x,y), 1.0);

const height = tileTypeToHeight(tileType);

Expand All @@ -72,22 +72,34 @@ export function MapBorder(props: MapBorderProps) {

// TODO this code is pretty unreadable, but at least it's only called once

const noise = new Simple1DNoise();
noise.setAmplitude(1)
noise.setScale(0.05)

const fadeoff = (f: number, noiseVar: number) => {
return Math.pow(f, 2) * (1 + Math.pow(noise.getVal(noiseVar), 2));
}

let off = 0;
//top
off += createRectangle(off, 0, -borderSize, w, 0, (x,y) => y/borderSize);
off += createRectangle(off, 0, -borderSize, w, 0, (x,y) => fadeoff(y/borderSize, x));
//bottom
off += createRectangle(off, 0, h, w, h+borderSize, (x,y) => (borderSize-y)/borderSize);
off += createRectangle(off, 0, h, w, h+borderSize, (x,y) => fadeoff((borderSize-y)/borderSize, x));
// left
off += createRectangle(off, -borderSize, 0, 0, h, (x,y) => x/borderSize);
off += createRectangle(off, -borderSize, 0, 0, h, (x,y) => fadeoff(x/borderSize, y));
//right
off += createRectangle(off, w, 0, w+borderSize, h, (x,y) => (borderSize-x)/borderSize);
off += createRectangle(off, w, 0, w+borderSize, h, (x,y) => fadeoff((borderSize-x)/borderSize, y));

// top-left
off += createRectangle(off, -borderSize, -borderSize, 0, 0,
(x,y) => {
const xi = borderSize-x;
const yi = borderSize-y;
return Math.max(1 - Math.sqrt(xi*xi+yi*yi)/Math.sqrt(borderSize*borderSize), 0);

const r = Math.max(1 - Math.sqrt(xi*xi+yi*yi)/Math.sqrt(borderSize*borderSize), 0);
const a = Math.atan2(y, x);

return fadeoff(r, a);
}
);

Expand All @@ -96,7 +108,11 @@ export function MapBorder(props: MapBorderProps) {
(x,y) => {
const xi = x;
const yi = borderSize-y;
return Math.max(1 - Math.sqrt(xi*xi+yi*yi)/Math.sqrt(borderSize*borderSize), 0);

const r = Math.max(1 - Math.sqrt(xi*xi+yi*yi)/Math.sqrt(borderSize*borderSize), 0);
const a = Math.atan2(y, x);

return fadeoff(r, a);
}
);

Expand All @@ -105,7 +121,11 @@ export function MapBorder(props: MapBorderProps) {
(x,y) => {
const xi = borderSize-x;
const yi = y;
return Math.max(1 - Math.sqrt(xi*xi+yi*yi)/Math.sqrt(borderSize*borderSize), 0);

const r = Math.max(1 - Math.sqrt(xi*xi+yi*yi)/Math.sqrt(borderSize*borderSize), 0);
const a = Math.atan2(y, x);

return fadeoff(r, a);
}
);

Expand All @@ -114,7 +134,12 @@ export function MapBorder(props: MapBorderProps) {
(x,y) => {
const xi = x;
const yi = y;
return Math.max(1 - Math.sqrt(xi*xi+yi*yi)/Math.sqrt(borderSize*borderSize), 0);

const r = Math.max(1 - Math.sqrt(xi*xi+yi*yi)/Math.sqrt(borderSize*borderSize), 0);
// TODO: lerp between w and h
const a = Math.atan2(y, x);

return fadeoff(r, a);
}
);

Expand All @@ -134,4 +159,51 @@ export function MapBorder(props: MapBorderProps) {
<meshStandardMaterial />
</instancedMesh>
);
}


const MAX_VERTICES = 256;
class Simple1DNoise {
vertices: number;
mask: number;
amplitude = 1;
scale = 1;

r: number[] = [];

constructor(vertices: number = MAX_VERTICES) {
this.vertices = vertices;
this.mask = vertices - 1;

for (let i = 0; i < this.vertices; ++i) {
this.r.push(Math.random());
}
}

getVal(x: number): number {
const scaledX = x * this.scale;
const xFloor = Math.floor(scaledX);
const t = scaledX - xFloor;
const tRemapSmoothstep = t * t * ( 3 - 2 * t );

/// Modulo using &
const xMin = xFloor & this.mask;
const xMax = ( xMin + 1 ) & this.mask;

const y = Simple1DNoise.lerp( this.r[ xMin ], this.r[ xMax ], tRemapSmoothstep );

return y * this.amplitude;
};

private static lerp(a: number, b: number, t: number): number {
return a * ( 1 - t ) + b * t;
};

setAmplitude(newAmplitude: number) {
this.amplitude = newAmplitude;
}

setScale(newScale: number) {
this.scale = newScale;
}
}