akanealw/misode.github.io
1
0
Fork 0
mirror of https://github.com/misode/misode.github.io.git synced 2026-04-27 00:38:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use terrain_shaper noise setting in visualization

Browse Source
This commit is contained in:
Misode
2021-10-30 02:45:09 +02:00
parent 3e4d8d7df5
commit 561f9a3956
4 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/components/previews/BiomeSourcePreview.tsx
View File

@@ -1,6 +1,6 @@
import { Path } from '@mcschema/core'
import { DataModel, Path } from '@mcschema/core'
import type { NoiseOctaves } from 'deepslate'
import { NoiseGeneratorSettings } from 'deepslate'
import { NoiseGeneratorSettings, TerrainShaper } from 'deepslate'
import { useEffect, useRef, useState } from 'preact/hooks'
import type { PreviewProps } from '.'
import { Btn, BtnMenu } from '..'
@@ -11,6 +11,8 @@ import { newSeed } from '../../Utils'
const LAYERS = ['biomes', 'temperature', 'humidity', 'continentalness', 'erosion', 'weirdness', 'offset', 'factor', 'jaggedness'] as const
const OverworldShaper = TerrainShaper.overworld()
export const BiomeSourcePreview = ({ model, data, shown, lang, version }: PreviewProps) => {
const [scale, setScale] = useState(2)
const [focused, setFocused] = useState<string | undefined>(undefined)
@@ -21,7 +23,8 @@ export const BiomeSourcePreview = ({ model, data, shown, lang, version }: Previe
const seed = BigInt(model.get(new Path(['generator', 'seed'])))
const octaves = getOctaves(model.get(new Path(['generator', 'settings'])))
const state = shown ? calculateState(data, octaves) : ''
const shaper = getShaper(model.get(new Path(['generator', 'settings'])))
const state = shown ? calculateState(data, octaves, shaper) : ''
const type: string = data.type?.replace(/^minecraft:/, '')
const { canvas, redraw } = useCanvas({
@@ -29,7 +32,7 @@ export const BiomeSourcePreview = ({ model, data, shown, lang, version }: Previe
return [200 / res.current, 200 / res.current]
},
async draw(img) {
const options = { octaves, biomeColors: {}, layers, offset: offset.current, scale, seed, res: res.current, version }
const options = { octaves, shaper, biomeColors: {}, layers, offset: offset.current, scale, seed, res: res.current, version }
await biomeMap(data, img, options)
if (res.current === 4) {
clearTimeout(refineTimeout.current)
@@ -47,7 +50,7 @@ export const BiomeSourcePreview = ({ model, data, shown, lang, version }: Previe
redraw()
},
async onHover(x, y) {
const options = { octaves, biomeColors: {}, layers, offset: offset.current, scale, seed, res: 1, version }
const options = { octaves, shaper, biomeColors: {}, layers, offset: offset.current, scale, seed, res: 1, version }
const biome = await getBiome(data, Math.floor(x * 200), Math.floor(y * 200), options)
setFocused(biome)
},
@@ -99,13 +102,13 @@ export const BiomeSourcePreview = ({ model, data, shown, lang, version }: Previe
</>
}
function calculateState(data: any, octaves: NoiseOctaves) {
return JSON.stringify([data, octaves])
function calculateState(data: any, octaves: NoiseOctaves, shaper: TerrainShaper) {
return JSON.stringify([data, octaves, shaper.toJson()])
}
function getOctaves(obj: any): NoiseOctaves {
if (typeof obj !== 'string') {
const settings = NoiseGeneratorSettings.fromJson(obj)
const settings = NoiseGeneratorSettings.fromJson(DataModel.unwrapLists(obj))
obj = settings.noise.densityFactor === 0 && settings.noise.densityOffset === -0.030078125
? 'minecraft:nether' : 'minecraft:overworld'
}
@@ -141,3 +144,16 @@ function getOctaves(obj: any): NoiseOctaves {
}
}
}
function getShaper(obj: any): TerrainShaper {
if (typeof obj === 'string') {
switch (obj.replace(/^minecraft:/, '')) {
case 'overworld':
case 'amplified':
return OverworldShaper
default:
return TerrainShaper.fromJson({ offset: 0, factor: 0, jaggedness: 0 })
}
}
return TerrainShaper.fromJson(DataModel.unwrapLists(obj?.noise?.terrain_shaper))
}

11
src/app/previews/BiomeSource.ts
View File

@@ -16,8 +16,6 @@ async function loadWasm() {
console.debug(`Loaded deepslate-rs from "${wasm}"`)
}
const OverworldShaper = TerrainShaper.overworld()
const LAYERS = {
temperature: [-1, 1],
humidity: [-1, 1],
@@ -33,6 +31,7 @@ type Triple = [number, number, number]
type BiomeColors = Record<string, Triple>
type BiomeSourceOptions = {
octaves: NoiseOctaves,
shaper: TerrainShaper,
biomeColors: BiomeColors,
offset: [number, number],
scale: number,
@@ -99,7 +98,7 @@ export async function getBiome(state: any, x: number, z: number, options: BiomeS
}
async function getCached(state: any, options: BiomeSourceOptions): Promise<{ biomeSource: CachedBiomeSource}> {
const newState = [state, options.octaves, `${options.seed}`, options.version]
const newState = [state, options.octaves, options.shaper.toJson(), `${options.seed}`, options.version]
if (!deepEqual(newState, cacheState)) {
cacheState = deepClone(newState)
@@ -182,9 +181,9 @@ async function getBiomeSource(state: any, options: BiomeSourceOptions): Promise<
continentalness: c,
erosion: e,
weirdness: w,
...layers.has('offset') && { offset: OverworldShaper.offset(point) },
...layers.has('factor') && { factor: OverworldShaper.factor(point) },
...layers.has('jaggedness') && { jaggedness: OverworldShaper.jaggedness(point) },
...layers.has('offset') && { offset: options.shaper.offset(point) },
...layers.has('factor') && { factor: options.shaper.factor(point) },
...layers.has('jaggedness') && { jaggedness: options.shaper.jaggedness(point) },
})
}
return result