diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodBufferContainer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodBufferContainer.java index c0303c158..c3bf2124b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodBufferContainer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodBufferContainer.java @@ -75,8 +75,6 @@ public class LodBufferContainer implements AutoCloseable this.minCornerBlockPos = minCornerBlockPos; this.vboOpaqueWrappers = new IVertexBufferWrapper[0]; this.vboTransparentWrappers = new IVertexBufferWrapper[0]; - - this.uniformContainer.createUniformData(this); } //endregion diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/objects/ILodContainerUniformBufferWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/objects/ILodContainerUniformBufferWrapper.java index b6f0ed0ff..ed5e8eaec 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/objects/ILodContainerUniformBufferWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/objects/ILodContainerUniformBufferWrapper.java @@ -24,11 +24,11 @@ import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBuff /** * @see LodBufferContainer */ -public interface ILodContainerUniformBufferWrapper extends IUniformBufferWrapper +public interface ILodContainerUniformBufferWrapper extends AutoCloseable { + /** does nothing if the buffer has already been uploaded */ + void tryUpload(LodBufferContainer bufferContainer); - void createUniformData(LodBufferContainer bufferContainer); - - void tryUpload(); + @Override void close(); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/objects/IUniformBufferWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/objects/IUniformBufferWrapper.java deleted file mode 100644 index 3553675da..000000000 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/render/objects/IUniformBufferWrapper.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the Distant Horizons mod - * licensed under the GNU LGPL v3 License. - * - * Copyright (C) 2020 James Seibel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.seibel.distanthorizons.core.wrapperInterfaces.render.objects; - -import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; - -public interface IUniformBufferWrapper extends IBindable, AutoCloseable -{ - void upload(); - - @Override - void close(); - -}