studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data fix
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2025-05-28 17:06:39 -04:00
parent c2da5ad7f8
commit 7a671459ed
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Data/macro/jobs.json
View File

@ -1,5 +1,5 @@
{ {
"jobs": [ "data": [
], ],
"files": [ "files": [
] ]

1
docs/src/progress/renderertodo.md
View File

@ -2032,6 +2032,7 @@ Server LOD component properly attaches physics bodies when the entity comes in r
Fix physics destruction on server via ServerLODComponent Fix physics destruction on server via ServerLODComponent
More job data scaffolding More job data scaffolding
Config class cleanup Config class cleanup
Fix jobs data, simplify block chunk gen algo

4
src/main/java/electrosphere/server/physics/block/manager/ServerBlockChunkGenerationThread.java
View File

@ -221,7 +221,6 @@ public class ServerBlockChunkGenerationThread implements Runnable {
List<VirtualStructure> filtered = macroData.getStructures().stream().filter((VirtualStructure struct) -> {return !struct.isRepairable() && struct.getAABB().testAABB(localAABB);}).collect(Collectors.toList()); List<VirtualStructure> filtered = macroData.getStructures().stream().filter((VirtualStructure struct) -> {return !struct.isRepairable() && struct.getAABB().testAABB(localAABB);}).collect(Collectors.toList());
if(filtered.size() > 0){ if(filtered.size() > 0){
Vector3i chunkPos = new Vector3i(worldX, worldY, worldZ); Vector3i chunkPos = new Vector3i(worldX, worldY, worldZ);
Vector3i blockPos = new Vector3i(0,0,0);
Vector3d chunkRealPos = ServerWorldData.convertChunkToRealSpace(chunkPos); Vector3d chunkRealPos = ServerWorldData.convertChunkToRealSpace(chunkPos);
Vector3d localBlockPos = new Vector3d(); Vector3d localBlockPos = new Vector3d();
Vector3d currRealPos = new Vector3d(chunkRealPos); Vector3d currRealPos = new Vector3d(chunkRealPos);
@ -232,11 +231,8 @@ public class ServerBlockChunkGenerationThread implements Runnable {
boolean placedBlock = false; boolean placedBlock = false;
currRealPos.set(chunkRealPos).add(x * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER,y * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER,z * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER); currRealPos.set(chunkRealPos).add(x * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER,y * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER,z * strideMultiplier * BlockChunkData.BLOCK_SIZE_MULTIPLIER);
ServerWorldData.convertRealToLocalBlockSpace(currRealPos,blockPos);
ServerWorldData.convertRealToChunkSpace(currRealPos,chunkPos);
//try placing a structure block //try placing a structure block
blockPos.set(x*strideMultiplier,y*strideMultiplier,z*strideMultiplier);
for(VirtualStructure struct : filtered){ for(VirtualStructure struct : filtered){
if(struct.getAABB().testPoint(currRealPos.x, currRealPos.y, currRealPos.z)){ if(struct.getAABB().testPoint(currRealPos.x, currRealPos.y, currRealPos.z)){
AABBd aabb = struct.getAABB(); AABBd aabb = struct.getAABB();