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

wrapper movement

Browse Source
This commit is contained in:
James Seibel
2026-03-09 12:28:58 -05:00
parent b04a308090
commit e530d0ffda
16 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java
+3 -3
View File
@@ -44,7 +44,7 @@ import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading;
import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeGenericObjectVertexContainer;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler;
import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -397,7 +397,7 @@ public class McGenericObjectRenderer implements IMcGenericRenderer
boxGroup.tryUpdateInstancedDataAsync();
// skip groups that haven't been uploaded yet
if (boxGroup.instancedVbos.getState() != IGenericObjectVertexBufferContainer.EState.RENDER)
if (boxGroup.vertexBufferContainer.getState() != IGenericObjectVertexBufferContainer.EState.RENDER)
{
continue;
}
@@ -548,7 +548,7 @@ public class McGenericObjectRenderer implements IMcGenericRenderer
profiler.push("vertex setup");
BlazeGenericObjectVertexContainer container = (BlazeGenericObjectVertexContainer) boxGroup.instancedVbos;
BlazeGenericObjectVertexContainer container = (BlazeGenericObjectVertexContainer) boxGroup.vertexBufferContainer;
LightMapWrapper lightMapWrapper = (LightMapWrapper) renderEventParam.lightmap;
BlazeTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper();
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java
+4 -4
View File
@@ -19,10 +19,10 @@ import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer;
import com.seibel.distanthorizons.common.render.blaze.helpers.*;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.LodUniformBufferWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.VertexBufferWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.LodUniformBufferWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.VertexBufferWrapper;
import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
import com.seibel.distanthorizons.core.config.Config;
import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java
+1 -1
View File
@@ -32,7 +32,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.textures.*;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.core.logging.DhLogger;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java
+2 -2
View File
@@ -30,8 +30,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.textures.*;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.core.logging.DhLogger;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java
+2 -2
View File
@@ -37,8 +37,8 @@ import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer;
import com.seibel.distanthorizons.common.render.blaze.helpers.*;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
import com.seibel.distanthorizons.core.logging.DhLogger;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.render.renderer.RenderParams;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java
+1 -1
View File
@@ -42,7 +42,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
import com.seibel.distanthorizons.common.render.blaze.McLodRenderer;
import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler;
import com.seibel.distanthorizons.core.config.Config;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java
+1 -1
View File
@@ -39,7 +39,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
import com.seibel.distanthorizons.common.render.blaze.McLodRenderer;
import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java
+2 -2
View File
@@ -37,8 +37,8 @@ import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer;
import com.seibel.distanthorizons.common.render.blaze.helpers.*;
import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
import com.seibel.distanthorizons.core.config.Config;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.logging.DhLogger;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/VertexBufferWrapper.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/VertexBufferWrapper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.distanthorizons.common.render.blaze.wrappers;
package com.seibel.distanthorizons.common.render.blaze.wrappers.buffer;
import com.mojang.blaze3d.buffers.GpuBuffer;
import com.mojang.blaze3d.buffers.GpuBufferSlice;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureViewWrapper.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.distanthorizons.common.render.blaze.wrappers;
package com.seibel.distanthorizons.common.render.blaze.wrappers.texture;
import com.mojang.blaze3d.systems.CommandEncoder;
import com.mojang.blaze3d.systems.GpuDevice;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureWrapper.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.distanthorizons.common.render.blaze.wrappers;
package com.seibel.distanthorizons.common.render.blaze.wrappers.texture;
import com.mojang.blaze3d.buffers.GpuBuffer;
import com.mojang.blaze3d.systems.CommandEncoder;
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/AbstractUniformBufferWrapper.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/AbstractUniformBufferWrapper.java
+2 -1
View File
@@ -1,4 +1,4 @@
package com.seibel.distanthorizons.common.render.blaze.helpers;
package com.seibel.distanthorizons.common.render.blaze.wrappers.uniform;
import com.mojang.blaze3d.buffers.GpuBuffer;
import com.mojang.blaze3d.buffers.GpuBufferSlice;
@@ -26,6 +26,7 @@ public abstract class AbstractUniformBufferWrapper implements IUniformBufferWrap
public GpuBuffer gpuBuffer = null;
//=============//
// constructor //
//=============//
common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/LodUniformBufferWrapper.java → common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/LodUniformBufferWrapper.java
+1 -2
View File
@@ -1,8 +1,7 @@
package com.seibel.distanthorizons.common.render.blaze.wrappers;
package com.seibel.distanthorizons.common.render.blaze.wrappers.uniform;
import com.mojang.blaze3d.buffers.Std140Builder;
import com.mojang.blaze3d.buffers.Std140SizeCalculator;
import com.seibel.distanthorizons.common.render.blaze.helpers.AbstractUniformBufferWrapper;
import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer;
import com.seibel.distanthorizons.core.render.renderer.RenderParams;
import com.seibel.distanthorizons.core.util.math.Mat4f;
common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java
+22 -13
View File
@@ -26,8 +26,8 @@ import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.distanthorizons.api.interfaces.factories.IDhApiWrapperFactory;
import com.seibel.distanthorizons.common.render.blaze.McGenericObjectRenderer;
import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeGenericObjectVertexContainer;
import com.seibel.distanthorizons.common.render.blaze.wrappers.LodUniformBufferWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.VertexBufferWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.LodUniformBufferWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.VertexBufferWrapper;
import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@@ -72,6 +72,7 @@ public class WrapperFactory implements IWrapperFactory
//==============//
// core methods //
//==============//
//region
@Override
public IBatchGeneratorEnvironmentWrapper createBatchGenerator(IDhLevel targetLevel)
@@ -218,10 +219,25 @@ public class WrapperFactory implements IWrapperFactory
}
@Override
public IVertexBufferWrapper createVboWrapper(String name) { return new VertexBufferWrapper(name); }
@Override
public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new LodUniformBufferWrapper(); }
@Override
public IGenericObjectVertexBufferContainer createInstancedVboContainer() { return new BlazeGenericObjectVertexContainer(); }
@Override
public IMcGenericRenderer createGenericRenderer() { return new McGenericObjectRenderer(); }
//endregion
//=============//
// api methods //
//=============//
//region
// documentation should be in the API interface
@@ -320,12 +336,15 @@ public class WrapperFactory implements IWrapperFactory
return createWrapperErrorMessage("BlockState wrapper", expectedClassNames, objectArray);
}
//endregion
//================//
// helper methods //
//================//
//region
private static String createWrapperErrorMessage(String wrapperName, String[] expectedClassNames, Object[] objectArray)
{
@@ -361,17 +380,7 @@ public class WrapperFactory implements IWrapperFactory
return message.toString();
}
@Override
public IVertexBufferWrapper createVboWrapper(String name) { return new VertexBufferWrapper(name); }
@Override
public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new LodUniformBufferWrapper(); }
@Override
public IGenericObjectVertexBufferContainer createInstancedVboContainer() { return new BlazeGenericObjectVertexContainer(); }
@Override
public IMcGenericRenderer createGenericRenderer() { return new McGenericObjectRenderer(); }
//endregion
common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java
+1 -1
View File
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.common.wrappers.misc;
import com.mojang.blaze3d.platform.NativeImage;
import com.mojang.blaze3d.textures.GpuTexture;
import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
coreSubProjects
+1 -1
Submodule coreSubProjects updated: fee0aadcbe...39dd1c8509