wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create issue #54

Browse Source
This commit is contained in:
James Seibel
2021-08-08 22:06:45 -05:00
parent 54e5fd30ab
commit 52608a9f3f
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/objects/LodQuadTreeDimension.java
+4 -4
View File
@@ -385,10 +385,10 @@ public class LodQuadTreeDimension
if (detailLevel > LodQuadTreeNode.REGION_LEVEL)
throw new IllegalArgumentException("getLodFromCoordinates given a level of \"" + detailLevel + "\" when \"" + LodQuadTreeNode.REGION_LEVEL + "\" is the max.");
// TODO possibly put this in LodUtil
int regionPosX = Math.floorDiv(chunkPos.x, (int) Math.pow(2,LodQuadTreeNode.REGION_LEVEL - detailLevel));
int regionPosZ = Math.floorDiv(chunkPos.z, (int) Math.pow(2,LodQuadTreeNode.REGION_LEVEL - detailLevel));
LodQuadTree region = getRegion(new RegionPos(regionPosX, regionPosZ));
// issue #54
// TODO this works, but only in all positive coordinates.
int[] relativePos = LodUtil.convertAbsolutePosToQuadTreeRelativePos(chunkPos.x, chunkPos.z, LodQuadTreeNode.CHUNK_LEVEL);
LodQuadTree region = getRegion(new RegionPos(relativePos[0], relativePos[1]));
if(region == null)
{
src/main/java/com/seibel/lod/util/LodUtil.java
+6 -18
View File
@@ -20,12 +20,11 @@ package com.seibel.lod.util;
import java.awt.Color;
import java.io.File;
import com.seibel.lod.objects.RegionPos;
import com.seibel.lod.objects.LodQuadTreeNode;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.server.integrated.IntegratedServer;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.DimensionType;
import net.minecraft.world.IWorld;
import net.minecraft.world.chunk.ChunkSection;
@@ -96,25 +95,14 @@ public class LodUtil
}
/**
* Convert the given ChunkPos into a RegionPos.
* Convert a 2D absolute position into a quad tree relative position.
*/
public static RegionPos convertChunkPosToRegionPos(ChunkPos pos)
public static int[] convertAbsolutePosToQuadTreeRelativePos(int x, int z, int detailLevel)
{
RegionPos rPos = new RegionPos();
rPos.x = pos.x / 512;
rPos.z = pos.z / 512;
int relativePosX = Math.floorDiv(x, (int) Math.pow(2, LodQuadTreeNode.REGION_LEVEL - detailLevel));
int relativePosZ = Math.floorDiv(z, (int) Math.pow(2, LodQuadTreeNode.REGION_LEVEL - detailLevel));
// prevent issues if X/Z is negative and less than 16
if (pos.x < 0)
{
rPos.x = (Math.abs(rPos.x) * -1) - 1;
}
if (pos.z < 0)
{
rPos.z = (Math.abs(rPos.z) * -1) - 1;
}
return rPos;
return new int[] {relativePosX, relativePosZ};
}
/**