From 786e00e88f3871c47fca58e7cf798ae8fd45f02b Mon Sep 17 00:00:00 2001 From: Morippi Date: Wed, 11 May 2022 09:52:20 +0200 Subject: [PATCH] small fixes --- .../com/seibel/lod/core/objects/a7/RenderDataContainer.java | 1 + src/main/java/com/seibel/lod/core/util/DataPointUtil.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/seibel/lod/core/objects/a7/RenderDataContainer.java b/src/main/java/com/seibel/lod/core/objects/a7/RenderDataContainer.java index 0786aa587..773652735 100644 --- a/src/main/java/com/seibel/lod/core/objects/a7/RenderDataContainer.java +++ b/src/main/java/com/seibel/lod/core/objects/a7/RenderDataContainer.java @@ -296,6 +296,7 @@ public class RenderDataContainer int targetMaxVerticalData = DetailDistanceUtil.getMaxVerticalData(detailLevel); verticalSize = targetMaxVerticalData; dataContainer = DataPointUtil.changeMaxVertSize(tempDataContainer, fileMaxVerticalData, verticalSize); + airDataContainer = new int[AIR_SECTION_SIZE * AIR_SECTION_SIZE * DetailDistanceUtil.getMaxVerticalData(detailLevel)]; } public LevelContainer expand() diff --git a/src/main/java/com/seibel/lod/core/util/DataPointUtil.java b/src/main/java/com/seibel/lod/core/util/DataPointUtil.java index 1484c745e..ec3345af4 100644 --- a/src/main/java/com/seibel/lod/core/util/DataPointUtil.java +++ b/src/main/java/com/seibel/lod/core/util/DataPointUtil.java @@ -639,11 +639,12 @@ public class DataPointUtil for (int index = 0; index < size; index++) { //we scan the lods in the position from top to bottom - for (dataIndex = dataIndexesCache[index]; dataIndexesCache[index] < inputVerticalData; dataIndexesCache[index]++) + while(dataIndexesCache[index] < inputVerticalData) { - singleData = dataToMerge[index * inputVerticalData + dataIndex]; + singleData = dataToMerge[index * inputVerticalData + dataIndexesCache[index]]; if (doesItExist(singleData) && !isVoid(singleData)) { + dataIndexesCache[index]++; if ((depth <= getDepth(singleData) && getDepth(singleData) < height) || (depth < getHeight(singleData) && getHeight(singleData) <= height)) { @@ -656,7 +657,6 @@ public class DataPointUtil } if (!doesItExist(data)) { - singleData = dataToMerge[index * inputVerticalData]; data = createVoidDataPoint(genMode); }