From 7ebacd26a0fdbc8b8e8811fa781f75f6c3d4f0f7 Mon Sep 17 00:00:00 2001 From: josua Date: Sun, 4 Oct 2020 23:11:41 +1100 Subject: [PATCH] Fixed buffers to work in newer versions of java --- .settings/org.eclipse.jdt.core.prefs | 1 + src/gl_engine/texture/TextureAtlas2D.java | 3 ++- src/gl_engine/texture/TextureAtlas3D.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 3a21537..ec1937b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/src/gl_engine/texture/TextureAtlas2D.java b/src/gl_engine/texture/TextureAtlas2D.java index f6f093a..0b6acd2 100644 --- a/src/gl_engine/texture/TextureAtlas2D.java +++ b/src/gl_engine/texture/TextureAtlas2D.java @@ -12,6 +12,7 @@ import static org.lwjgl.opengl.GL11.glTexImage2D; import static org.lwjgl.opengl.GL11.glTexParameteri; import static org.lwjgl.opengl.GL30.glGenerateMipmap; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Comparator; @@ -324,7 +325,7 @@ public class TextureAtlas2D ByteBuffer texmap_buff = ByteBuffer.allocateDirect(texmap_b.length); texmap_buff.put(texmap_b); - texmap_buff.position(0); + ((Buffer)texmap_buff).position(0); texture = glGenTextures(); glBindTexture(GL_TEXTURE_2D, texture); diff --git a/src/gl_engine/texture/TextureAtlas3D.java b/src/gl_engine/texture/TextureAtlas3D.java index 3b697ea..70b9e00 100644 --- a/src/gl_engine/texture/TextureAtlas3D.java +++ b/src/gl_engine/texture/TextureAtlas3D.java @@ -13,6 +13,7 @@ import static org.lwjgl.opengl.GL12.GL_TEXTURE_3D; import static org.lwjgl.opengl.GL12.glTexImage3D; import static org.lwjgl.opengl.GL30.glGenerateMipmap; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Comparator; @@ -361,7 +362,7 @@ public class TextureAtlas3D ByteBuffer texmap_buff = ByteBuffer.allocateDirect(texmap_b.length); texmap_buff.put(texmap_b); - texmap_buff.position(0); + ((Buffer)texmap_buff).position(0); texture = glGenTextures(); glBindTexture(GL_TEXTURE_3D, texture);