Skip to content
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

client: make client biome impl equivalent to contracts #2660

Merged
merged 2 commits into from
Jan 24, 2025
Merged

client: make client biome impl equivalent to contracts #2660

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0567a9c
client: make client biome impl equivalent to contracts
credence0x Jan 23, 2025
9eff604
client: improve biome impl
credence0x Jan 24, 2025
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
114 changes: 69 additions & 45 deletions client/apps/game/src/three/managers/biome.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
import { snoise } from "@dojoengine/utils";
import { Fixed, FixedTrait } from "@/utils/biome/fixed-point";
import { noise as snoise } from "@/utils/biome/simplex-noise";
import { Vec3 } from "@/utils/biome/vec3";
import * as THREE from "three";

const MAP_AMPLITUDE = 60;
const MOISTURE_OCTAVE = 2;
const ELEVATION_OCTAVES = [1, 0.25, 0.1];
const ELEVATION_OCTAVES_SUM = ELEVATION_OCTAVES.reduce((a, b) => a + b, 0);
const MAP_AMPLITUDE = FixedTrait.fromInt(60n);
const MOISTURE_OCTAVE = FixedTrait.fromInt(2n);
const ELEVATION_OCTAVES = [
FixedTrait.fromInt(1n), // 1
FixedTrait.divi(FixedTrait.fromInt(1n), FixedTrait.fromInt(4n)), // 0.25
FixedTrait.divi(FixedTrait.fromInt(1n), FixedTrait.fromInt(10n)) // 0.1
];
const ELEVATION_OCTAVES_SUM = ELEVATION_OCTAVES.reduce((a, b) => a.add(b), FixedTrait.ZERO);


export type BiomeType =
| "DeepOcean"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we use an enum instead ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

Expand Down Expand Up @@ -44,12 +51,12 @@ export const BIOME_COLORS: Record<BiomeType, THREE.Color> = {
};

const LEVEL = {
DEEP_OCEAN: 0.25,
OCEAN: 0.5,
SAND: 0.53,
FOREST: 0.6,
DESERT: 0.72,
MOUNTAIN: 0.8,
DEEP_OCEAN: FixedTrait.divi(FixedTrait.fromInt(25n), FixedTrait.fromInt(100n)), // 0.25
OCEAN: FixedTrait.divi(FixedTrait.fromInt(50n), FixedTrait.fromInt(100n)), // 0.5
SAND: FixedTrait.divi(FixedTrait.fromInt(53n), FixedTrait.fromInt(100n)), // 0.53
FOREST: FixedTrait.divi(FixedTrait.fromInt(60n), FixedTrait.fromInt(100n)), // 0.6
DESERT: FixedTrait.divi(FixedTrait.fromInt(72n), FixedTrait.fromInt(100n)), // 0.72
MOUNTAIN: FixedTrait.divi(FixedTrait.fromInt(80n), FixedTrait.fromInt(100n)), // 0.8
};

export class Biome {
Expand All @@ -64,52 +71,69 @@ export class Biome {
private calculateElevation(
col: number,
row: number,
mapAmplitude: number,
octaves: number[],
octavesSum: number,
): number {
let elevation = 0;
mapAmplitude: Fixed,
octaves: Fixed[],
octavesSum: Fixed,
): Fixed {
let elevation = FixedTrait.ZERO;
let _100 = FixedTrait.fromInt(100n);
let _2 = FixedTrait.fromInt(2n);
for (const octave of octaves) {
const x = col / octave / mapAmplitude;
const z = row / octave / mapAmplitude;
const noise = ((snoise([x, 0, z]) + 1) * 100) / 2;
elevation += octave * Math.floor(noise);
let x = FixedTrait.fromInt(BigInt(col)).div(octave).div(mapAmplitude);
let z = FixedTrait.fromInt(BigInt(row)).div(octave).div(mapAmplitude);

let sn = snoise(Vec3.new(x, FixedTrait.ZERO, z));
const noise = sn.add(FixedTrait.ONE).mul(_100).div(_2);
elevation = elevation.add(octave.mul(noise.floor()));
}
elevation = elevation / octavesSum;
return elevation / 100;

return elevation.div(octavesSum).div(FixedTrait.fromInt(100n));
}

private calculateMoisture(col: number, row: number, mapAmplitude: number, moistureOctave: number): number {
const moistureX = (moistureOctave * col) / mapAmplitude;
const moistureZ = (moistureOctave * row) / mapAmplitude;
const noise = ((snoise([moistureX, 0, moistureZ]) + 1) * 100) / 2;
return Math.floor(noise) / 100;

private calculateMoisture(col: number, row: number, mapAmplitude: Fixed, moistureOctave: Fixed): Fixed {
const moistureX = moistureOctave.mul(FixedTrait.fromInt(BigInt(col))).div(mapAmplitude);
const moistureZ = moistureOctave.mul(FixedTrait.fromInt(BigInt(row))).div(mapAmplitude);
const noise = snoise(Vec3.new(moistureX, FixedTrait.ZERO, moistureZ)).add(FixedTrait.ONE).mul(FixedTrait.fromInt(100n)).div(FixedTrait.fromInt(2n));
return FixedTrait.floor(noise).div(FixedTrait.fromInt(100n));
}

private determineBiome(elevation: number, moisture: number, level: typeof LEVEL): BiomeType {
if (elevation < level.DEEP_OCEAN) return "DeepOcean";
if (elevation < level.OCEAN) return "Ocean";
if (elevation < level.SAND) return "Beach";
if (elevation > level.MOUNTAIN) {
if (moisture < 0.1) return "Scorched";
if (moisture < 0.4) return "Bare";
if (moisture < 0.5) return "Tundra";
private determineBiome(elevation: Fixed, moisture: Fixed, level: typeof LEVEL): BiomeType {
if (elevation.value < level.DEEP_OCEAN.value) return "DeepOcean";
if (elevation.value < level.OCEAN.value) return "Ocean";
if (elevation.value < level.SAND.value) return "Beach";
if (elevation.value > level.MOUNTAIN.value) {
if (moisture.value < FixedTrait.constants()._0_1.value) return "Scorched";
if (moisture.value < FixedTrait.constants()._0_4.value) return "Bare";
if (moisture.value < FixedTrait.constants()._0_5.value) return "Tundra";
return "Snow";
}
if (elevation > level.DESERT) {
if (moisture < 0.33) return "TemperateDesert";
if (moisture < 0.66) return "Shrubland";
if (elevation.value > level.DESERT.value) {
if (moisture.value < FixedTrait.constants()._0_33.value) return "TemperateDesert";
if (moisture.value < FixedTrait.constants()._0_66.value) return "Shrubland";
return "Taiga";
}
if (elevation > level.FOREST) {
if (moisture < 0.16) return "TemperateDesert";
if (moisture < 0.5) return "Grassland";
if (moisture < 0.83) return "TemperateDeciduousForest";
if (elevation.value > level.FOREST.value) {
if (moisture.value < FixedTrait.constants()._0_16.value) return "TemperateDesert";
if (moisture.value < FixedTrait.constants()._0_5.value) return "Grassland";
if (moisture.value < FixedTrait.constants()._0_83.value) return "TemperateDeciduousForest";
return "TemperateRainForest";
}
if (moisture < 0.16) return "SubtropicalDesert";
if (moisture < 0.33) return "Grassland";
if (moisture < 0.66) return "TropicalSeasonalForest";
if (moisture.value < FixedTrait.constants()._0_16.value) return "SubtropicalDesert";
if (moisture.value < FixedTrait.constants()._0_33.value) return "Grassland";
if (moisture.value < FixedTrait.constants()._0_66.value) return "TropicalSeasonalForest";
return "TropicalRainForest";
}
}

// function testBiomeGeneration() {
// const biome = new Biome();
// const start = 5000871265127650;
// const end = 5000871265127678;
// for (let i = start; i <= end; i++) {
// const result = biome.getBiome(i - 5, i + 10);
// console.log(`biome for ${i - 5} ${i + 10} is ${result} \n`);
// }
// }

// testBiomeGeneration();
Loading
Loading