diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java index fef5fcf61..b32289618 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java @@ -14,35 +14,28 @@ import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; -import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhApplyRenderer; 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.texture.BlazeTextureViewWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeLodUniformBufferWrapper; import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.BlazeVertexBufferWrapper; import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuadBuilder; -import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.common.render.nativeGl.glObject.GLEnums; import com.seibel.distanthorizons.common.render.nativeGl.glObject.buffer.QuadElementBuffer; import com.seibel.distanthorizons.core.render.RenderParams; -import com.seibel.distanthorizons.core.util.ColorUtil; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.util.objects.SortedArraySet; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTerrainRenderer; import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper; -import net.minecraft.client.Minecraft; import net.minecraft.resources.Identifier; import org.lwjgl.opengl.GL32; import org.lwjgl.system.MemoryUtil; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/glObject/OpenGlDummyUniformData.java b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/glObject/OpenGlDummyUniformData.java index b7e1f5f6b..03df57f71 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/glObject/OpenGlDummyUniformData.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/nativeGl/glObject/OpenGlDummyUniformData.java @@ -3,6 +3,10 @@ package com.seibel.distanthorizons.common.render.nativeGl.glObject; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.ILodContainerUniformBufferWrapper; +/** + * With OpenGL all uniform data is uploaded during the rendering phase + * so nothing is needed here. + */ public class OpenGlDummyUniformData implements ILodContainerUniformBufferWrapper { @Override public void createUniformData(LodBufferContainer bufferContainer) { } diff --git a/coreSubProjects b/coreSubProjects index 9e7d0a153..b51ab3d9c 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 9e7d0a15386986c3cb172ecdb3f2c9aef98ecc04 +Subproject commit b51ab3d9cd5bfeb2b81beb884a6b9b25935444ce