Skip to content

Commit

Permalink
update known block are not rendered test
Browse files Browse the repository at this point in the history
  • Loading branch information
@zardoy
zardoy committed May 22, 2024
1 parent 8b959fa commit bb85512
Show file tree
Hide file tree
Showing 2 changed files with 153 additions and 85 deletions.
237 changes: 152 additions & 85 deletions prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,96 +1,163 @@
import { test, expect } from 'vitest'
import { setup } from './mesherTester'
import minecraftData from 'minecraft-data'
import minecraftAssets from 'minecraft-assets'

const version = '1.18.1'
const version = minecraftAssets.versions.at(-1)

const addPositions = [
// [[0, 0, 0], 'diamond_block'],
[[1, 0, 0], 'stone'],
[[-1, 0, 0], 'stone'],
[[0, 1, 0], 'stone'],
[[0, -1, 0], 'stone'],
[[0, 0, 1], 'stone'],
[[0, 0, -1], 'stone'],
// [[0, 0, 0], 'diamond_block'],
// [[1, 0, 0], 'stone'],
// [[-1, 0, 0], 'stone'],
// [[0, 1, 0], 'stone'],
// [[0, -1, 0], 'stone'],
// [[0, 0, 1], 'stone'],
// [[0, 0, -1], 'stone'],
] as const

test('Known blocks are not rendered', () => {
const { mesherWorld, getGeometry, pos, mcData } = setup(version, addPositions as any)
const { mesherWorld, getGeometry, pos, mcData } = setup(version, addPositions as any)
const ignoreAsExpected = ['air', 'cave_air', 'void_air', 'barrier', 'water', 'lava', 'moving_piston', 'light']

let time = 0
let times = 0
const invalidBlocks = {}/* as {[number, number]} */
for (const block of mcData.blocksArray) {
if (block.maxStateId! - block.minStateId! > 100) continue
for (let i = block.minStateId!; i <= block.maxStateId!; i++) {
if (block.transparent) continue
mesherWorld.setBlockStateId(pos, i)
const start = performance.now()
const { centerFaces, totalTiles, centerTileNeighbors } = getGeometry()
time += performance.now() - start
times++
if (centerFaces === 0 && centerTileNeighbors !== 0) {
if (invalidBlocks[block.name]) continue
invalidBlocks[block.name] = [i - block.minStateId!, centerTileNeighbors]
// console.log('INVALID', block.name, centerTileNeighbors, i - block.minStateId)
}
}
}
console.log('Average time', time / times)
// Fully expected
expect(invalidBlocks).toMatchInlineSnapshot(`
{
"creeper_head": [
0,
6,
],
"creeper_wall_head": [
0,
6,
],
"dragon_head": [
0,
6,
],
"dragon_wall_head": [
0,
6,
],
"player_head": [
0,
6,
],
"player_wall_head": [
0,
6,
],
"powder_snow": [
0,
6,
],
"skeleton_skull": [
0,
6,
],
"skeleton_wall_skull": [
0,
6,
],
"wither_skeleton_skull": [
0,
6,
],
"wither_skeleton_wall_skull": [
0,
6,
],
"zombie_head": [
0,
6,
],
"zombie_wall_head": [
0,
6,
],
let time = 0
let times = 0
const invalidBlocks = {}/* as {[number, number]} */
for (const block of mcData.blocksArray) {
if (ignoreAsExpected.includes(block.name)) continue
// if (block.maxStateId! - block.minStateId! > 100) continue
// for (let i = block.minStateId!; i <= block.maxStateId!; i++) {
for (let i = block.defaultState!; i <= block.defaultState!; i++) {
// if (block.transparent) continue
mesherWorld.setBlockStateId(pos, i)
const start = performance.now()
const { centerFaces, totalTiles, centerTileNeighbors } = getGeometry()
time += performance.now() - start
times++
if (centerFaces === 0) {
if (invalidBlocks[block.name]) continue
invalidBlocks[block.name] = true
// invalidBlocks[block.name] = [i - block.defaultState!, centerTileNeighbors]
// console.log('INVALID', block.name, centerTileNeighbors, i - block.minStateId)
}
`)
}
}
console.log('Average time', time / times)
// should be fixed, but to avoid regressions & for visibility
expect(invalidBlocks).toMatchInlineSnapshot(`
{
"acacia_hanging_sign": true,
"acacia_wall_hanging_sign": true,
"bamboo_hanging_sign": true,
"bamboo_wall_hanging_sign": true,
"birch_hanging_sign": true,
"birch_wall_hanging_sign": true,
"black_banner": true,
"black_bed": true,
"black_candle": true,
"black_wall_banner": true,
"blue_banner": true,
"blue_bed": true,
"blue_candle": true,
"blue_wall_banner": true,
"brown_banner": true,
"brown_bed": true,
"brown_candle": true,
"brown_wall_banner": true,
"bubble_column": true,
"candle": true,
"cherry_hanging_sign": true,
"cherry_wall_hanging_sign": true,
"creeper_head": true,
"creeper_wall_head": true,
"crimson_hanging_sign": true,
"crimson_wall_hanging_sign": true,
"cyan_banner": true,
"cyan_bed": true,
"cyan_candle": true,
"cyan_wall_banner": true,
"dark_oak_hanging_sign": true,
"dark_oak_wall_hanging_sign": true,
"decorated_pot": true,
"dragon_head": true,
"dragon_wall_head": true,
"end_gateway": true,
"end_portal": true,
"gray_banner": true,
"gray_bed": true,
"gray_candle": true,
"gray_wall_banner": true,
"green_banner": true,
"green_bed": true,
"green_candle": true,
"green_wall_banner": true,
"jungle_hanging_sign": true,
"jungle_wall_hanging_sign": true,
"light_blue_banner": true,
"light_blue_bed": true,
"light_blue_candle": true,
"light_blue_wall_banner": true,
"light_gray_banner": true,
"light_gray_bed": true,
"light_gray_candle": true,
"light_gray_wall_banner": true,
"lime_banner": true,
"lime_bed": true,
"lime_candle": true,
"lime_wall_banner": true,
"magenta_banner": true,
"magenta_bed": true,
"magenta_candle": true,
"magenta_wall_banner": true,
"mangrove_hanging_sign": true,
"mangrove_wall_hanging_sign": true,
"oak_hanging_sign": true,
"oak_wall_hanging_sign": true,
"orange_banner": true,
"orange_bed": true,
"orange_candle": true,
"orange_wall_banner": true,
"piglin_head": true,
"piglin_wall_head": true,
"pink_banner": true,
"pink_bed": true,
"pink_candle": true,
"pink_petals": true,
"pink_wall_banner": true,
"player_head": true,
"player_wall_head": true,
"powder_snow_cauldron": true,
"purple_banner": true,
"purple_bed": true,
"purple_candle": true,
"purple_wall_banner": true,
"red_banner": true,
"red_bed": true,
"red_candle": true,
"red_wall_banner": true,
"repeater": true,
"sea_pickle": true,
"skeleton_skull": true,
"skeleton_wall_skull": true,
"snow": true,
"spruce_hanging_sign": true,
"spruce_wall_hanging_sign": true,
"structure_void": true,
"turtle_egg": true,
"warped_hanging_sign": true,
"warped_wall_hanging_sign": true,
"water_cauldron": true,
"white_banner": true,
"white_bed": true,
"white_candle": true,
"white_wall_banner": true,
"wither_skeleton_skull": true,
"wither_skeleton_wall_skull": true,
"yellow_banner": true,
"yellow_bed": true,
"yellow_candle": true,
"yellow_wall_banner": true,
"zombie_head": true,
"zombie_wall_head": true,
}
`)
})
1 change: 1 addition & 0 deletions prismarine-viewer/viewer/prepare/moreGeneratedBlocks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const handlers = [
[/(.+)_wall_sign$/, handleSign],
[/(.+)_sign$/, handleSign],
[/^(?:(ender|trapped)_)?chest$/, handleChest],
// [/(^|(.+)_)bed$/, handleBed],
// no-op just suppress warning
[/(^light|^moving_piston$)/, true],
] as const
Expand Down

0 comments on commit bb85512

Please sign in to comment.