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

Add noise caves to preview

Browse Source
This commit is contained in:
Misode
2022-02-14 03:56:01 +01:00
parent 5cfd54ebc3
commit 4f98f9aa9b
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@@ -18,7 +18,7 @@
"@mcschema/locales": "^0.1.45",
"buffer": "^6.0.3",
"comment-json": "^4.1.1",
"deepslate": "^0.9.0-beta.8",
"deepslate": "^0.9.0-beta.9",
"deepslate-rs": "^0.1.6",
"howler": "^2.2.3",
"js-yaml": "^3.14.1",
@@ -1679,9 +1679,9 @@
"dev": true
},
"node_modules/deepslate": {
"version": "0.9.0-beta.8",
"resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.9.0-beta.8.tgz",
"integrity": "sha512-tq8IHZ3EWxuIb/sF0FgnXmYLzSmAwLufLkFjThuM/JUMKCOopeYyQq6sNjFOf0VQi9a3P9My2sgkZgJL1DkRlg==",
"version": "0.9.0-beta.9",
"resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.9.0-beta.9.tgz",
"integrity": "sha512-x+VZ8OnTRM+eL6kdMX2YkUbCQJaYWM8ISud/D0LsbSeGMkgm3b6XTBiSL5o1cNaNhWdHvYe1ZJOr54iZ8OmMkw==",
"dependencies": {
"gl-matrix": "^3.3.0",
"md5": "^2.3.0",
@@ -5663,9 +5663,9 @@
"dev": true
},
"deepslate": {
"version": "0.9.0-beta.8",
"resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.9.0-beta.8.tgz",
"integrity": "sha512-tq8IHZ3EWxuIb/sF0FgnXmYLzSmAwLufLkFjThuM/JUMKCOopeYyQq6sNjFOf0VQi9a3P9My2sgkZgJL1DkRlg==",
"version": "0.9.0-beta.9",
"resolved": "https://registry.npmjs.org/deepslate/-/deepslate-0.9.0-beta.9.tgz",
"integrity": "sha512-x+VZ8OnTRM+eL6kdMX2YkUbCQJaYWM8ISud/D0LsbSeGMkgm3b6XTBiSL5o1cNaNhWdHvYe1ZJOr54iZ8OmMkw==",
"requires": {
"gl-matrix": "^3.3.0",
"md5": "^2.3.0",

2
package.json
View File

@@ -24,7 +24,7 @@
"@mcschema/locales": "^0.1.45",
"buffer": "^6.0.3",
"comment-json": "^4.1.1",
"deepslate": "^0.9.0-beta.8",
"deepslate": "^0.9.0-beta.9",
"deepslate-rs": "^0.1.6",
"howler": "^2.2.3",
"js-yaml": "^3.14.1",

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

@@ -1,5 +1,5 @@
import { DataModel, Path } from '@mcschema/core'
import type { NoiseOctaves } from 'deepslate'
import type { NoiseParameters } from 'deepslate'
import { NoiseGeneratorSettings, TerrainShaper } from 'deepslate'
import { useEffect, useRef, useState } from 'preact/hooks'
import type { PreviewProps } from '.'
@@ -103,11 +103,11 @@ export const BiomeSourcePreview = ({ model, data, shown, version }: PreviewProps
</>
}
function calculateState(data: any, octaves: NoiseOctaves, shaper: TerrainShaper) {
function calculateState(data: any, octaves: Record<string, NoiseParameters>, shaper: TerrainShaper) {
return JSON.stringify([data, octaves, shaper.toJson()])
}
export function getOctaves(obj: any): NoiseOctaves {
export function getOctaves(obj: any): Record<string, NoiseParameters> {
if (typeof obj !== 'string') {
const settings = NoiseGeneratorSettings.fromJson(DataModel.unwrapLists(obj))
obj = settings.legacyRandomSource ? 'minecraft:nether' : 'minecraft:overworld'

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

@@ -1,5 +1,5 @@
import { DataModel } from '@mcschema/core'
import type { NoiseOctaves } from 'deepslate'
import type { NoiseParameters } from 'deepslate'
import { FixedBiome, LegacyRandom, NormalNoise, TerrainShaper } from 'deepslate'
import init, { biome_parameters, climate_noise, climate_sampler, multi_noise } from 'deepslate-rs'
// @ts-expect-error
@@ -30,7 +30,7 @@ const LAYERS = {
type Triple = [number, number, number]
type BiomeColors = Record<string, Triple>
type BiomeSourceOptions = {
octaves: NoiseOctaves,
octaves: Record<string, NoiseParameters>,
shaper: TerrainShaper,
biomeColors: BiomeColors,
offset: [number, number],

2
src/app/previews/NoiseSettings.ts
View File

@@ -1,7 +1,6 @@
import { DataModel } from '@mcschema/core'
import type { BlockState } from 'deepslate'
import { BlockPos, Chunk, ChunkPos, FixedBiome, NoiseChunkGenerator, NoiseGeneratorSettings } from 'deepslate'
import { getOctaves } from '../components'
import type { VersionId } from '../services'
import { checkVersion } from '../services'
import { deepClone, deepEqual } from '../Utils'
@@ -91,7 +90,6 @@ export function getNoiseBlock(x: number, y: number) {
function getCached(state: unknown, options: NoiseSettingsOptions) {
const settings = NoiseGeneratorSettings.fromJson(DataModel.unwrapLists(state))
settings.octaves = getOctaves(settings)
const newState = [state, `${options.seed}`, options.biome]
if (!deepEqual(newState, cacheState)) {