Skip to content

Commit

Permalink
fix: missing file commit
Browse files Browse the repository at this point in the history
  • Loading branch information
etienne-85 authored and Sceat committed Sep 16, 2024
1 parent 7927d5e commit a6836de
Showing 1 changed file with 28 additions and 16 deletions.
44 changes: 28 additions & 16 deletions src/tools/ChunkFactory.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { Vector3 } from 'three'

import { PatchId } from '../common/types'
import { asBox2, asVect3, chunkBoxFromId, serializeChunkId } from '../common/utils'
import {
asBox2,
asVect3,
chunkBoxFromId,
serializeChunkId,
} from '../common/utils'
import { EntityChunk } from '../datacontainers/EntityChunk'
import { WorldChunk, WorldChunkStub } from '../datacontainers/WorldChunk'
import { BlockMode, BlockType, GroundPatch, WorldConf } from '../index'
Expand Down Expand Up @@ -70,25 +76,31 @@ export class ChunkFactory {
return worldChunksStubs
}

mergeGroundBlocks(worldChunk: WorldChunk, patch: GroundPatch){
mergeGroundBlocks(worldChunk: WorldChunk, patch: GroundPatch) {
const blocks = patch.iterBlocksQuery(undefined, false)
for (const block of blocks) {
const blockData = block.data
const blockType = block.data.type
const blockLocalPos = block.localPos as Vector3
blockLocalPos.x += 1
// block.localPos.y = patch.bbox.max.y
blockLocalPos.z += 1
blockData.type =
highlightPatchBorders(blockLocalPos, blockType) || blockType
worldChunk.writeBlock(blockLocalPos, blockData, block.buffer || [])
}
for (const block of blocks) {
const blockData = block.data
const blockType = block.data.type
const blockLocalPos = block.localPos as Vector3
blockLocalPos.x += 1
// block.localPos.y = patch.bbox.max.y
blockLocalPos.z += 1
blockData.type =
highlightPatchBorders(blockLocalPos, blockType) || blockType
worldChunk.writeBlock(blockLocalPos, blockData, block.buffer || [])
}
}

mergePatchEntities(worldChunk: WorldChunk, patch: GroundPatch, patchEntities: EntityChunk[]) {
mergePatchEntities(
worldChunk: WorldChunk,
patch: GroundPatch,
patchEntities: EntityChunk[],
) {
patchEntities.forEach(entityChunk => {
// return overlapping blocks between entity and container
const patchBlocksIter = patch.iterBlocksQuery(asBox2(entityChunk.chunkBox))
const patchBlocksIter = patch.iterBlocksQuery(
asBox2(entityChunk.chunkBox),
)
// iter over entity blocks
for (const block of patchBlocksIter) {
// const buffer = entityChunk.data.slice(chunkBufferIndex, chunkBufferIndex + entityDims.y)
Expand All @@ -107,4 +119,4 @@ export class ChunkFactory {
}
})
}
}
}

0 comments on commit a6836de

Please sign in to comment.