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

Move files into Full and Render dataType packages

Browse Source
This commit is contained in:
James Seibel
2023-02-18 09:53:16 -06:00
parent 3b621ac497
commit 16c6dffdd6
33 changed files with 46 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/Initializer.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.seibel.lod.core;
import com.seibel.lod.core.api.external.methods.config.DhApiConfig;
import com.seibel.lod.core.api.external.methods.data.DhApiTerrainDataRepo;
import com.seibel.lod.core.datatype.column.ColumnRenderLoader;
import com.seibel.lod.core.datatype.render.ColumnRenderLoader;
import com.seibel.lod.core.datatype.full.FullDataLoader;
import com.seibel.lod.core.datatype.full.SparseFullDataLoader;
import com.seibel.lod.api.DhApiMain;
core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ import com.seibel.lod.api.objects.data.DhApiTerrainDataPoint;
import com.seibel.lod.api.interfaces.data.IDhApiTerrainDataRepo;
import com.seibel.lod.api.objects.math.DhApiVec3i;
import com.seibel.lod.core.api.internal.SharedApi;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.FullDataPoint;
import com.seibel.lod.core.datatype.full.FullDataPointIdMap;
import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView;
core/src/main/java/com/seibel/lod/core/datatype/PlaceHolderRenderSource.java
-62
View File
@@ -1,62 +0,0 @@
package com.seibel.lod.core.datatype;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.render.LodQuadTree;
import com.seibel.lod.core.render.AbstractRenderBuffer;
import com.seibel.lod.core.file.renderfile.RenderMetaDataFile;
import java.io.IOException;
import java.io.OutputStream;
import java.util.concurrent.atomic.AtomicReference;
public class PlaceHolderRenderSource implements IRenderSource
{
final DhSectionPos pos;
boolean isValid = true;
public PlaceHolderRenderSource(DhSectionPos pos) { this.pos = pos; }
@Override
public DhSectionPos getSectionPos() { return pos; }
@Override
public byte getDataDetail() { return 0; }
@Override
public void enableRender(IDhClientLevel level, LodQuadTree quadTree) { /* TODO */ }
@Override
public void disableRender() { /* TODO */ }
@Override
public void dispose() { /* TODO */ }
@Override
public boolean trySwapRenderBufferAsync(LodQuadTree quadTree, AtomicReference<AbstractRenderBuffer> referenceSlots) { return false; }
@Override
public void saveRender(IDhClientLevel level, RenderMetaDataFile file, OutputStream dataStream) throws IOException
{
throw new UnsupportedOperationException("EmptyRenderSource should NEVER be saved!");
}
@Override
public byte getRenderVersion() { return 0; }
public void markInvalid() { isValid = false; }
@Override
public boolean isValid() { return isValid; }
@Override
public boolean isEmpty() { return true; }
@Override
public void fastWrite(ChunkSizedFullDataSource chunkData, IDhClientLevel level) { /* TODO */ }
@Override
public void updateFromRenderSource(IRenderSource source) { /* TODO */ }
}
core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.seibel.lod.core.datatype.column.render;
import com.seibel.lod.core.datatype.column.ColumnRenderSource;
import com.seibel.lod.core.datatype.render.ColumnRenderSource;
import com.seibel.lod.core.datatype.column.accessor.ColumnArrayView;
import com.seibel.lod.core.datatype.column.accessor.ColumnFormat;
import com.seibel.lod.core.level.IDhClientLevel;
core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java
+1 -1
View File
@@ -19,7 +19,7 @@
package com.seibel.lod.core.datatype.column.render;
import com.seibel.lod.core.datatype.column.ColumnRenderSource;
import com.seibel.lod.core.datatype.render.ColumnRenderSource;
import com.seibel.lod.core.datatype.column.accessor.ColumnFormat;
import com.seibel.lod.api.enums.rendering.EDebugMode;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
core/src/main/java/com/seibel/lod/core/datatype/AbstractFullDataSourceLoader.java → core/src/main/java/com/seibel/lod/core/datatype/full/AbstractFullDataSourceLoader.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.core.datatype;
package com.seibel.lod.core.datatype.full;
import com.google.common.collect.HashMultimap;
import com.seibel.lod.core.level.IDhLevel;
core/src/main/java/com/seibel/lod/core/datatype/full/FullDataDownSampler.java
-1
View File
@@ -1,6 +1,5 @@
package com.seibel.lod.core.datatype.full;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView;
import com.seibel.lod.core.datatype.full.sources.FullDataSource;
import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider;
core/src/main/java/com/seibel/lod/core/datatype/full/FullDataLoader.java
-2
View File
@@ -1,7 +1,5 @@
package com.seibel.lod.core.datatype.full;
import com.seibel.lod.core.datatype.AbstractFullDataSourceLoader;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.sources.FullDataSource;
import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile;
import com.seibel.lod.core.level.IDhLevel;
core/src/main/java/com/seibel/lod/core/datatype/IFullDataSource.java → core/src/main/java/com/seibel/lod/core/datatype/full/IFullDataSource.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.core.datatype;
package com.seibel.lod.core.datatype.full;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.datatype.full.FullDataPointIdMap;
core/src/main/java/com/seibel/lod/core/datatype/IIncompleteFullDataSource.java → core/src/main/java/com/seibel/lod/core/datatype/full/IIncompleteFullDataSource.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.core.datatype;
package com.seibel.lod.core.datatype.full;
public interface IIncompleteFullDataSource extends IFullDataSource
{
core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataLoader.java
-2
View File
@@ -1,7 +1,5 @@
package com.seibel.lod.core.datatype.full;
import com.seibel.lod.core.datatype.AbstractFullDataSourceLoader;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.sources.SingleChunkFullDataSource;
import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile;
import com.seibel.lod.core.level.IDhLevel;
core/src/main/java/com/seibel/lod/core/datatype/full/SparseFullDataLoader.java
-2
View File
@@ -1,7 +1,5 @@
package com.seibel.lod.core.datatype.full;
import com.seibel.lod.core.datatype.AbstractFullDataSourceLoader;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.sources.SparseFullDataSource;
import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile;
import com.seibel.lod.core.level.IDhLevel;
core/src/main/java/com/seibel/lod/core/datatype/full/sources/FullDataSource.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.seibel.lod.core.datatype.full.sources;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.FullDataPointIdMap;
import com.seibel.lod.core.datatype.full.accessor.FullArrayView;
import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView;
core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.seibel.lod.core.datatype.full.sources;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.full.FullDataPointIdMap;
import com.seibel.lod.core.datatype.full.accessor.FullArrayView;
import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView;
core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.seibel.lod.core.datatype.full.sources;
import com.seibel.lod.core.datatype.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.FullDataPointIdMap;
import com.seibel.lod.core.datatype.full.accessor.FullArrayView;
import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView;
core/src/main/java/com/seibel/lod/core/datatype/AbstractRenderSourceLoader.java → core/src/main/java/com/seibel/lod/core/datatype/render/AbstractRenderSourceLoader.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.seibel.lod.core.datatype;
package com.seibel.lod.core.datatype.render;
import com.google.common.collect.HashMultimap;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.file.renderfile.RenderMetaDataFile;
core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderLoader.java → core/src/main/java/com/seibel/lod/core/datatype/render/ColumnRenderLoader.java
+3 -5
View File
@@ -1,12 +1,10 @@
package com.seibel.lod.core.datatype.column;
package com.seibel.lod.core.datatype.render;
import com.seibel.lod.core.datatype.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.sources.FullDataSource;
import com.seibel.lod.core.datatype.transform.FullToColumnTransformer;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.datatype.AbstractRenderSourceLoader;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.file.renderfile.RenderMetaDataFile;
import com.seibel.lod.core.logging.DhLoggerBuilder;
core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java → core/src/main/java/com/seibel/lod/core/datatype/render/ColumnRenderSource.java
+1 -2
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.core.datatype.column;
package com.seibel.lod.core.datatype.render;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.core.datatype.column.accessor.*;
@@ -14,7 +14,6 @@ import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.render.LodQuadTree;
import com.seibel.lod.core.render.LodRenderSection;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.util.ColorUtil;
import com.seibel.lod.core.util.objects.Reference;
import com.seibel.lod.core.util.LodUtil;
core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java → core/src/main/java/com/seibel/lod/core/datatype/render/IRenderSource.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.seibel.lod.core.datatype;
package com.seibel.lod.core.datatype.render;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.level.IDhClientLevel;
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicReference;
/**
* This represents LOD data that is stored in system memory <br>
* Example: {@link com.seibel.lod.core.datatype.column.ColumnRenderSource ColumnRenderSource} <br><br>
* Example: {@link ColumnRenderSource ColumnRenderSource} <br><br>
*
* These are created via {@link com.seibel.lod.core.file.renderfile.ILodRenderSourceProvider ILodRenderSourceProvider}'s
*/
core/src/main/java/com/seibel/lod/core/datatype/transform/DataRenderTransformer.java
+4 -4
View File
@@ -1,9 +1,9 @@
package com.seibel.lod.core.datatype.transform;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.datatype.column.ColumnRenderLoader;
import com.seibel.lod.core.datatype.column.ColumnRenderSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.render.IRenderSource;
import com.seibel.lod.core.datatype.render.ColumnRenderLoader;
import com.seibel.lod.core.datatype.render.ColumnRenderSource;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.util.LodUtil;
core/src/main/java/com/seibel/lod/core/datatype/transform/FullToColumnTransformer.java
+3 -3
View File
@@ -1,9 +1,9 @@
package com.seibel.lod.core.datatype.transform;
import com.seibel.lod.core.datatype.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.render.IRenderSource;
import com.seibel.lod.core.datatype.column.accessor.ColumnFormat;
import com.seibel.lod.core.datatype.column.ColumnRenderSource;
import com.seibel.lod.core.datatype.render.ColumnRenderSource;
import com.seibel.lod.core.datatype.column.accessor.ColumnArrayView;
import com.seibel.lod.core.datatype.column.accessor.ColumnQuadView;
import com.seibel.lod.core.datatype.full.*;
core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.seibel.lod.core.file.fullDatafile;
import com.google.common.collect.HashMultimap;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.datatype.full.sources.FullDataSource;
import com.seibel.lod.core.datatype.full.sources.SingleChunkFullDataSource;
core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java
+2 -2
View File
@@ -8,8 +8,8 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.AbstractFullDataSourceLoader;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.AbstractFullDataSourceLoader;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.file.metaData.MetaData;
core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.seibel.lod.core.file.fullDatafile;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.datatype.full.sources.SparseFullDataSource;
import com.seibel.lod.core.datatype.full.sources.SingleChunkFullDataSource;
core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.seibel.lod.core.file.fullDatafile;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.file.metaData.MetaData;
import com.seibel.lod.core.pos.DhSectionPos;
core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.seibel.lod.core.file.renderfile;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.datatype.render.IRenderSource;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.pos.DhSectionPos;
core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java
+4 -4
View File
@@ -1,11 +1,11 @@
package com.seibel.lod.core.file.renderfile;
import com.google.common.collect.HashMultimap;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.PlaceHolderRenderSource;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.datatype.AbstractRenderSourceLoader;
import com.seibel.lod.core.datatype.column.ColumnRenderSource;
import com.seibel.lod.core.datatype.render.IRenderSource;
import com.seibel.lod.core.datatype.render.AbstractRenderSourceLoader;
import com.seibel.lod.core.datatype.render.ColumnRenderSource;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.datatype.transform.DataRenderTransformer;
import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider;
core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.seibel.lod.core.file.renderfile;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.datatype.AbstractRenderSourceLoader;
import com.seibel.lod.core.datatype.render.IRenderSource;
import com.seibel.lod.core.datatype.render.AbstractRenderSourceLoader;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.file.metaData.MetaData;
import com.seibel.lod.core.level.IDhClientLevel;
core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.seibel.lod.core.file.subDimMatching;
import com.seibel.lod.core.config.Config;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource;
import com.seibel.lod.core.datatype.full.FullDataPoint;
import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView;
core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.seibel.lod.core.pos;
import com.seibel.lod.core.datatype.IFullDataSource;
import com.seibel.lod.core.datatype.full.IFullDataSource;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.core.util.LodUtil;
import org.jetbrains.annotations.NotNull;
core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.seibel.lod.core.render;
import com.seibel.lod.core.datatype.column.ColumnRenderSource;
import com.seibel.lod.core.datatype.render.ColumnRenderSource;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.pos.DhBlockPos2D;
import com.seibel.lod.core.pos.DhSectionPos;
core/src/main/java/com/seibel/lod/core/render/LodRenderSection.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.seibel.lod.core.render;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.datatype.render.IRenderSource;
import com.seibel.lod.core.file.renderfile.ILodRenderSourceProvider;
import org.apache.logging.log4j.Logger;
core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.seibel.lod.core.render;
import com.seibel.lod.core.datatype.IRenderSource;
import com.seibel.lod.core.datatype.render.IRenderSource;
import com.seibel.lod.core.enums.ELodDirection;
import com.seibel.lod.core.pos.Pos2D;
import com.seibel.lod.core.pos.DhSectionPos;