From 243af371be5a054110048d87ef3c4bcc8510f763 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Fri, 18 Jul 2014 17:36:36 +0200
Subject: [PATCH] switch to libgdx-jglfw desktop backend
---
vtm-desktop/build.gradle | 3 +-
vtm-desktop/src/org/oscim/gdx/GdxGL20.java | 895 -------------------
vtm-desktop/src/org/oscim/gdx/GdxMapApp.java | 24 +-
3 files changed, 17 insertions(+), 905 deletions(-)
delete mode 100644 vtm-desktop/src/org/oscim/gdx/GdxGL20.java
diff --git a/vtm-desktop/build.gradle b/vtm-desktop/build.gradle
index 2591ade3..5db4678f 100644
--- a/vtm-desktop/build.gradle
+++ b/vtm-desktop/build.gradle
@@ -28,7 +28,8 @@ sourceSets {
dependencies {
compile project(':vtm-gdx')
compile project(':vtm-themes')
- compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
+ //compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
+ compile "com.badlogicgames.gdx:gdx-backend-jglfw:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile 'org.slf4j:slf4j-simple:1.7.5'
compile files('../vtm-ext-libs/gdx/vtm-jni-natives.jar')
diff --git a/vtm-desktop/src/org/oscim/gdx/GdxGL20.java b/vtm-desktop/src/org/oscim/gdx/GdxGL20.java
deleted file mode 100644
index 715bee51..00000000
--- a/vtm-desktop/src/org/oscim/gdx/GdxGL20.java
+++ /dev/null
@@ -1,895 +0,0 @@
-package org.oscim.gdx;
-
-/*******************************************************************************
- * Copyright 2011 Mario Zechner <badlogicgames@gmail.com>
- * Copyright 2011 Nathan Sweet <nathan.sweet@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
-
-import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.EXTFramebufferObject;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL13;
-import org.lwjgl.opengl.GL14;
-import org.lwjgl.opengl.GL15;
-import org.lwjgl.opengl.GL20;
-
-import com.badlogic.gdx.utils.GdxRuntimeException;
-
-/**
- * An implementation of the {@link GL20} interface based on LWJGL. Note that
- * LWJGL shaders and OpenGL ES shaders will not be 100%
- * compatible. Some glGetXXX methods are not implemented.
- *
- * @author mzechner
- */
-final class GdxGL20 implements org.oscim.backend.GL20 {
- public void glActiveTexture(int texture) {
- GL13.glActiveTexture(texture);
- }
-
- public void glAttachShader(int program, int shader) {
- GL20.glAttachShader(program, shader);
- }
-
- public void glBindAttribLocation(int program, int index, String name) {
- GL20.glBindAttribLocation(program, index, name);
- }
-
- public void glBindBuffer(int target, int buffer) {
- GL15.glBindBuffer(target, buffer);
- }
-
- public void glBindFramebuffer(int target, int framebuffer) {
- EXTFramebufferObject.glBindFramebufferEXT(target, framebuffer);
- }
-
- public void glBindRenderbuffer(int target, int renderbuffer) {
- EXTFramebufferObject.glBindRenderbufferEXT(target, renderbuffer);
- }
-
- public void glBindTexture(int target, int texture) {
- GL11.glBindTexture(target, texture);
- }
-
- public void glBlendColor(float red, float green, float blue, float alpha) {
- GL14.glBlendColor(red, green, blue, alpha);
- }
-
- public void glBlendEquation(int mode) {
- GL14.glBlendEquation(mode);
- }
-
- public void glBlendEquationSeparate(int modeRGB, int modeAlpha) {
- GL20.glBlendEquationSeparate(modeRGB, modeAlpha);
- }
-
- public void glBlendFunc(int sfactor, int dfactor) {
- GL11.glBlendFunc(sfactor, dfactor);
- }
-
- public void glBlendFuncSeparate(int srcRGB, int dstRGB, int srcAlpha, int dstAlpha) {
- GL14.glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
- }
-
- public void glBufferData(int target, int size, Buffer data, int usage) {
- if (data == null)
- throw new GdxRuntimeException("Using null for the data not possible, blame LWJGL");
- else if (data instanceof ByteBuffer)
- GL15.glBufferData(target, (ByteBuffer) data, usage);
- else if (data instanceof IntBuffer)
- GL15.glBufferData(target, (IntBuffer) data, usage);
- else if (data instanceof FloatBuffer)
- GL15.glBufferData(target, (FloatBuffer) data, usage);
- else if (data instanceof DoubleBuffer)
- GL15.glBufferData(target, (DoubleBuffer) data, usage);
- else if (data instanceof ShortBuffer) //
- GL15.glBufferData(target, (ShortBuffer) data, usage);
- }
-
- public void glBufferSubData(int target, int offset, int size, Buffer data) {
- if (data == null)
- throw new GdxRuntimeException("Using null for the data not possible, blame LWJGL");
- else if (data instanceof ByteBuffer)
- GL15.glBufferSubData(target, offset, (ByteBuffer) data);
- else if (data instanceof IntBuffer)
- GL15.glBufferSubData(target, offset, (IntBuffer) data);
- else if (data instanceof FloatBuffer)
- GL15.glBufferSubData(target, offset, (FloatBuffer) data);
- else if (data instanceof DoubleBuffer)
- GL15.glBufferSubData(target, offset, (DoubleBuffer) data);
- else if (data instanceof ShortBuffer) //
- GL15.glBufferSubData(target, offset, (ShortBuffer) data);
- }
-
- public int glCheckFramebufferStatus(int target) {
- return EXTFramebufferObject.glCheckFramebufferStatusEXT(target);
- }
-
- public void glClear(int mask) {
- GL11.glClear(mask);
- }
-
- public void glClearColor(float red, float green, float blue, float alpha) {
- GL11.glClearColor(red, green, blue, alpha);
- }
-
- public void glClearDepthf(float depth) {
- GL11.glClearDepth(depth);
- }
-
- public void glClearStencil(int s) {
- GL11.glClearStencil(s);
- }
-
- public void glColorMask(boolean red, boolean green, boolean blue, boolean alpha) {
- GL11.glColorMask(red, green, blue, alpha);
- }
-
- public void glCompileShader(int shader) {
- GL20.glCompileShader(shader);
- }
-
- public void glCompressedTexImage2D(int target, int level, int internalformat, int width,
- int height, int border,
- int imageSize, Buffer data) {
- if (data instanceof ByteBuffer) {
- GL13.glCompressedTexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- (ByteBuffer) data);
- } else {
- throw new GdxRuntimeException("Can't use " + data.getClass().getName()
- + " with this method. Use ByteBuffer instead.");
- }
- }
-
- public void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset,
- int width, int height, int format,
- int imageSize, Buffer data) {
- throw new GdxRuntimeException("not implemented");
- }
-
- public void glCopyTexImage2D(int target, int level, int internalformat, int x, int y,
- int width, int height, int border) {
- GL11.glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
- }
-
- public void glCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
- int width, int height) {
- GL11.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
- }
-
- public int glCreateProgram() {
- return GL20.glCreateProgram();
- }
-
- public int glCreateShader(int type) {
- return GL20.glCreateShader(type);
- }
-
- public void glCullFace(int mode) {
- GL11.glCullFace(mode);
- }
-
- public void glDeleteBuffers(int n, IntBuffer buffers) {
- GL15.glDeleteBuffers(buffers);
- }
-
- public void glDeleteFramebuffers(int n, IntBuffer framebuffers) {
- EXTFramebufferObject.glDeleteFramebuffersEXT(framebuffers);
- }
-
- public void glDeleteProgram(int program) {
- GL20.glDeleteProgram(program);
- }
-
- public void glDeleteRenderbuffers(int n, IntBuffer renderbuffers) {
- EXTFramebufferObject.glDeleteRenderbuffersEXT(renderbuffers);
- }
-
- public void glDeleteShader(int shader) {
- GL20.glDeleteShader(shader);
- }
-
- public void glDeleteTextures(int n, IntBuffer textures) {
- GL11.glDeleteTextures(textures);
- }
-
- public void glDepthFunc(int func) {
- GL11.glDepthFunc(func);
- }
-
- public void glDepthMask(boolean flag) {
- GL11.glDepthMask(flag);
- }
-
- public void glDepthRangef(float zNear, float zFar) {
- GL11.glDepthRange(zNear, zFar);
- }
-
- public void glDetachShader(int program, int shader) {
- GL20.glDetachShader(program, shader);
- }
-
- public void glDisable(int cap) {
- GL11.glDisable(cap);
- }
-
- public void glDisableVertexAttribArray(int index) {
- GL20.glDisableVertexAttribArray(index);
- }
-
- public void glDrawArrays(int mode, int first, int count) {
- GL11.glDrawArrays(mode, first, count);
- }
-
- public void glDrawElements(int mode, int count, int type, Buffer indices) {
- if (indices instanceof ShortBuffer && type == GL_UNSIGNED_SHORT)
- GL11.glDrawElements(mode, (ShortBuffer) indices);
- else if (indices instanceof ByteBuffer && type == GL_UNSIGNED_SHORT)
- GL11.glDrawElements(mode, ((ByteBuffer) indices).asShortBuffer()); // FIXME yay...
- else if (indices instanceof ByteBuffer && type == GL_UNSIGNED_BYTE)
- GL11.glDrawElements(mode, (ByteBuffer) indices);
- else
- throw new GdxRuntimeException("Can't use " + indices.getClass().getName()
- + " with this method. Use ShortBuffer or ByteBuffer instead. Blame LWJGL");
- }
-
- public void glEnable(int cap) {
- GL11.glEnable(cap);
- }
-
- public void glEnableVertexAttribArray(int index) {
- GL20.glEnableVertexAttribArray(index);
- }
-
- public void glFinish() {
- GL11.glFinish();
- }
-
- public void glFlush() {
- GL11.glFlush();
- }
-
- public void glFramebufferRenderbuffer(int target, int attachment, int renderbuffertarget,
- int renderbuffer) {
- EXTFramebufferObject.glFramebufferRenderbufferEXT(target,
- attachment,
- renderbuffertarget,
- renderbuffer);
- }
-
- public void glFramebufferTexture2D(int target, int attachment, int textarget, int texture,
- int level) {
- EXTFramebufferObject.glFramebufferTexture2DEXT(target,
- attachment,
- textarget,
- texture,
- level);
- }
-
- public void glFrontFace(int mode) {
- GL11.glFrontFace(mode);
- }
-
- public void glGenBuffers(int n, IntBuffer buffers) {
- GL15.glGenBuffers(buffers);
- }
-
- public void glGenFramebuffers(int n, IntBuffer framebuffers) {
- EXTFramebufferObject.glGenFramebuffersEXT(framebuffers);
- }
-
- public void glGenRenderbuffers(int n, IntBuffer renderbuffers) {
- EXTFramebufferObject.glGenRenderbuffersEXT(renderbuffers);
- }
-
- public void glGenTextures(int n, IntBuffer textures) {
- GL11.glGenTextures(textures);
- }
-
- public void glGenerateMipmap(int target) {
- EXTFramebufferObject.glGenerateMipmapEXT(target);
- }
-
- public String glGetActiveAttrib(int program, int index, IntBuffer size, Buffer type) {
- // FIXME this is less than ideal of course...
- IntBuffer typeTmp = BufferUtils.createIntBuffer(2);
- String name = GL20.glGetActiveAttrib(program, index, 256, typeTmp);
- size.put(typeTmp.get(0));
- if (type instanceof IntBuffer)
- ((IntBuffer) type).put(typeTmp.get(1));
- return name;
- }
-
- public String glGetActiveUniform(int program, int index, IntBuffer size, Buffer type) {
- // FIXME this is less than ideal of course...
- IntBuffer typeTmp = BufferUtils.createIntBuffer(2);
- String name = GL20.glGetActiveUniform(program, index, 256, typeTmp);
- size.put(typeTmp.get(0));
- if (type instanceof IntBuffer)
- ((IntBuffer) type).put(typeTmp.get(1));
- return name;
- }
-
- public void glGetAttachedShaders(int program, int maxcount, Buffer count, IntBuffer shaders) {
- GL20.glGetAttachedShaders(program, (IntBuffer) count, shaders);
- }
-
- public int glGetAttribLocation(int program, String name) {
- return GL20.glGetAttribLocation(program, name);
- }
-
- public void glGetBooleanv(int pname, Buffer params) {
- GL11.glGetBoolean(pname, (ByteBuffer) params);
- }
-
- public void glGetBufferParameteriv(int target, int pname, IntBuffer params) {
- GL15.glGetBufferParameter(target, pname, params);
- }
-
- public int glGetError() {
- return GL11.glGetError();
- }
-
- public void glGetFloatv(int pname, FloatBuffer params) {
- GL11.glGetFloat(pname, params);
- }
-
- public void glGetFramebufferAttachmentParameteriv(int target, int attachment, int pname,
- IntBuffer params) {
- EXTFramebufferObject.glGetFramebufferAttachmentParameterEXT(target,
- attachment,
- pname,
- params);
- }
-
- public void glGetIntegerv(int pname, IntBuffer params) {
- GL11.glGetInteger(pname, params);
- }
-
- public String glGetProgramInfoLog(int program) {
- ByteBuffer buffer = ByteBuffer.allocateDirect(1024 * 10);
- buffer.order(ByteOrder.nativeOrder());
- ByteBuffer tmp = ByteBuffer.allocateDirect(4);
- tmp.order(ByteOrder.nativeOrder());
- IntBuffer intBuffer = tmp.asIntBuffer();
-
- GL20.glGetProgramInfoLog(program, intBuffer, buffer);
- int numBytes = intBuffer.get(0);
- byte[] bytes = new byte[numBytes];
- buffer.get(bytes);
- return new String(bytes);
- }
-
- public void glGetProgramiv(int program, int pname, IntBuffer params) {
- GL20.glGetProgram(program, pname, params);
- }
-
- public void glGetRenderbufferParameteriv(int target, int pname, IntBuffer params) {
- EXTFramebufferObject.glGetRenderbufferParameterEXT(target, pname, params);
- }
-
- public String glGetShaderInfoLog(int shader) {
- ByteBuffer buffer = ByteBuffer.allocateDirect(1024 * 10);
- buffer.order(ByteOrder.nativeOrder());
- ByteBuffer tmp = ByteBuffer.allocateDirect(4);
- tmp.order(ByteOrder.nativeOrder());
- IntBuffer intBuffer = tmp.asIntBuffer();
-
- GL20.glGetShaderInfoLog(shader, intBuffer, buffer);
- int numBytes = intBuffer.get(0);
- byte[] bytes = new byte[numBytes];
- buffer.get(bytes);
- return new String(bytes);
- }
-
- public void glGetShaderPrecisionFormat(int shadertype, int precisiontype, IntBuffer range,
- IntBuffer precision) {
- throw new UnsupportedOperationException("unsupported, won't implement");
- }
-
- public void glGetShaderiv(int shader, int pname, IntBuffer params) {
- GL20.glGetShader(shader, pname, params);
- }
-
- public String glGetString(int name) {
- return GL11.glGetString(name);
- }
-
- public void glGetTexParameterfv(int target, int pname, FloatBuffer params) {
- GL11.glGetTexParameter(target, pname, params);
- }
-
- public void glGetTexParameteriv(int target, int pname, IntBuffer params) {
- GL11.glGetTexParameter(target, pname, params);
- }
-
- public int glGetUniformLocation(int program, String name) {
- return GL20.glGetUniformLocation(program, name);
- }
-
- public void glGetUniformfv(int program, int location, FloatBuffer params) {
- GL20.glGetUniform(program, location, params);
- }
-
- public void glGetUniformiv(int program, int location, IntBuffer params) {
- GL20.glGetUniform(program, location, params);
- }
-
- public void glGetVertexAttribPointerv(int index, int pname, Buffer pointer) {
- throw new UnsupportedOperationException("unsupported, won't implement");
- }
-
- public void glGetVertexAttribfv(int index, int pname, FloatBuffer params) {
- GL20.glGetVertexAttrib(index, pname, params);
- }
-
- public void glGetVertexAttribiv(int index, int pname, IntBuffer params) {
- GL20.glGetVertexAttrib(index, pname, params);
- }
-
- public void glHint(int target, int mode) {
- GL11.glHint(target, mode);
- }
-
- public boolean glIsBuffer(int buffer) {
- return GL15.glIsBuffer(buffer);
- }
-
- public boolean glIsEnabled(int cap) {
- return GL11.glIsEnabled(cap);
- }
-
- public boolean glIsFramebuffer(int framebuffer) {
- return EXTFramebufferObject.glIsFramebufferEXT(framebuffer);
- }
-
- public boolean glIsProgram(int program) {
- return GL20.glIsProgram(program);
- }
-
- public boolean glIsRenderbuffer(int renderbuffer) {
- return EXTFramebufferObject.glIsRenderbufferEXT(renderbuffer);
- }
-
- public boolean glIsShader(int shader) {
- return GL20.glIsShader(shader);
- }
-
- public boolean glIsTexture(int texture) {
- return GL11.glIsTexture(texture);
- }
-
- public void glLineWidth(float width) {
- GL11.glLineWidth(width);
- }
-
- public void glLinkProgram(int program) {
- GL20.glLinkProgram(program);
- }
-
- public void glPixelStorei(int pname, int param) {
- GL11.glPixelStorei(pname, param);
- }
-
- public void glPolygonOffset(float factor, float units) {
- GL11.glPolygonOffset(factor, units);
- }
-
- public void glReadPixels(int x, int y, int width, int height, int format, int type,
- Buffer pixels) {
- if (pixels instanceof ByteBuffer)
- GL11.glReadPixels(x, y, width, height, format, type, (ByteBuffer) pixels);
- else if (pixels instanceof ShortBuffer)
- GL11.glReadPixels(x, y, width, height, format, type, (ShortBuffer) pixels);
- else if (pixels instanceof IntBuffer)
- GL11.glReadPixels(x, y, width, height, format, type, (IntBuffer) pixels);
- else if (pixels instanceof FloatBuffer)
- GL11.glReadPixels(x, y, width, height, format, type, (FloatBuffer) pixels);
- else
- throw new GdxRuntimeException("Can't use "
- + pixels.getClass().getName()
- + " with this method. Use ByteBuffer, ShortBuffer, IntBuffer or FloatBuffer instead. Blame LWJGL");
- }
-
- public void glReleaseShaderCompiler() {
- // nothing to do here
- }
-
- public void glRenderbufferStorage(int target, int internalformat, int width, int height) {
- EXTFramebufferObject.glRenderbufferStorageEXT(target, internalformat, width, height);
- }
-
- public void glSampleCoverage(float value, boolean invert) {
- GL13.glSampleCoverage(value, invert);
- }
-
- public void glScissor(int x, int y, int width, int height) {
- GL11.glScissor(x, y, width, height);
- }
-
- public void glShaderBinary(int n, IntBuffer shaders, int binaryformat, Buffer binary, int length) {
- throw new UnsupportedOperationException("unsupported, won't implement");
- }
-
- public void glShaderSource(int shader, String string) {
- GL20.glShaderSource(shader, string);
- }
-
- public void glStencilFunc(int func, int ref, int mask) {
- GL11.glStencilFunc(func, ref, mask);
- }
-
- public void glStencilFuncSeparate(int face, int func, int ref, int mask) {
- GL20.glStencilFuncSeparate(face, func, ref, mask);
- }
-
- public void glStencilMask(int mask) {
- GL11.glStencilMask(mask);
- }
-
- public void glStencilMaskSeparate(int face, int mask) {
- GL20.glStencilMaskSeparate(face, mask);
- }
-
- public void glStencilOp(int fail, int zfail, int zpass) {
- GL11.glStencilOp(fail, zfail, zpass);
- }
-
- public void glStencilOpSeparate(int face, int fail, int zfail, int zpass) {
- GL20.glStencilOpSeparate(face, fail, zfail, zpass);
- }
-
- public void glTexImage2D(int target, int level, int internalformat, int width, int height,
- int border, int format, int type,
- Buffer pixels) {
- if (pixels == null)
- GL11.glTexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- (ByteBuffer) null);
- else if (pixels instanceof ByteBuffer)
- GL11.glTexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- (ByteBuffer) pixels);
- else if (pixels instanceof ShortBuffer)
- GL11.glTexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- (ShortBuffer) pixels);
- else if (pixels instanceof IntBuffer)
- GL11.glTexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- (IntBuffer) pixels);
- else if (pixels instanceof FloatBuffer)
- GL11.glTexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- (FloatBuffer) pixels);
- else if (pixels instanceof DoubleBuffer)
- GL11.glTexImage2D(target,
- level,
- internalformat,
- width,
- height,
- border,
- format,
- type,
- (DoubleBuffer) pixels);
- else
- throw new GdxRuntimeException("Can't use "
- + pixels.getClass().getName()
- + " with this method. Use ByteBuffer, ShortBuffer, IntBuffer, FloatBuffer or DoubleBuffer instead. Blame LWJGL");
- }
-
- public void glTexParameterf(int target, int pname, float param) {
- GL11.glTexParameterf(target, pname, param);
- }
-
- public void glTexParameterfv(int target, int pname, FloatBuffer params) {
- GL11.glTexParameter(target, pname, params);
- }
-
- public void glTexParameteri(int target, int pname, int param) {
- GL11.glTexParameteri(target, pname, param);
- }
-
- public void glTexParameteriv(int target, int pname, IntBuffer params) {
- GL11.glTexParameter(target, pname, params);
- }
-
- public void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width,
- int height, int format, int type,
- Buffer pixels) {
- if (pixels instanceof ByteBuffer)
- GL11.glTexSubImage2D(target,
- level,
- xoffset,
- yoffset,
- width,
- height,
- format,
- type,
- (ByteBuffer) pixels);
- else if (pixels instanceof ShortBuffer)
- GL11.glTexSubImage2D(target,
- level,
- xoffset,
- yoffset,
- width,
- height,
- format,
- type,
- (ShortBuffer) pixels);
- else if (pixels instanceof IntBuffer)
- GL11.glTexSubImage2D(target,
- level,
- xoffset,
- yoffset,
- width,
- height,
- format,
- type,
- (IntBuffer) pixels);
- else if (pixels instanceof FloatBuffer)
- GL11.glTexSubImage2D(target,
- level,
- xoffset,
- yoffset,
- width,
- height,
- format,
- type,
- (FloatBuffer) pixels);
- else if (pixels instanceof DoubleBuffer)
- GL11.glTexSubImage2D(target,
- level,
- xoffset,
- yoffset,
- width,
- height,
- format,
- type,
- (DoubleBuffer) pixels);
- else
- throw new GdxRuntimeException("Can't use "
- + pixels.getClass().getName()
- + " with this method. Use ByteBuffer, ShortBuffer, IntBuffer, FloatBuffer or DoubleBuffer instead. Blame LWJGL");
- }
-
- public void glUniform1f(int location, float x) {
- GL20.glUniform1f(location, x);
- }
-
- public void glUniform1fv(int location, int count, FloatBuffer v) {
- GL20.glUniform1(location, v);
- }
-
- public void glUniform1i(int location, int x) {
- GL20.glUniform1i(location, x);
- }
-
- public void glUniform1iv(int location, int count, IntBuffer v) {
- GL20.glUniform1(location, v);
- }
-
- public void glUniform2f(int location, float x, float y) {
- GL20.glUniform2f(location, x, y);
- }
-
- public void glUniform2fv(int location, int count, FloatBuffer v) {
- GL20.glUniform2(location, v);
- }
-
- public void glUniform2i(int location, int x, int y) {
- GL20.glUniform2i(location, x, y);
- }
-
- public void glUniform2iv(int location, int count, IntBuffer v) {
- GL20.glUniform2(location, v);
- }
-
- public void glUniform3f(int location, float x, float y, float z) {
- GL20.glUniform3f(location, x, y, z);
- }
-
- public void glUniform3fv(int location, int count, FloatBuffer v) {
- GL20.glUniform3(location, v);
- }
-
- public void glUniform3i(int location, int x, int y, int z) {
- GL20.glUniform3i(location, x, y, z);
- }
-
- public void glUniform3iv(int location, int count, IntBuffer v) {
- GL20.glUniform3(location, v);
- }
-
- public void glUniform4f(int location, float x, float y, float z, float w) {
- GL20.glUniform4f(location, x, y, z, w);
- }
-
- public void glUniform4fv(int location, int count, FloatBuffer v) {
- GL20.glUniform4(location, v);
- }
-
- public void glUniform4i(int location, int x, int y, int z, int w) {
- GL20.glUniform4i(location, x, y, z, w);
- }
-
- public void glUniform4iv(int location, int count, IntBuffer v) {
- GL20.glUniform4(location, v);
- }
-
- public void glUniformMatrix2fv(int location, int count, boolean transpose, FloatBuffer value) {
- GL20.glUniformMatrix2(location, transpose, value);
- }
-
- public void glUniformMatrix3fv(int location, int count, boolean transpose, FloatBuffer value) {
- GL20.glUniformMatrix3(location, transpose, value);
- }
-
- public void glUniformMatrix4fv(int location, int count, boolean transpose, FloatBuffer value) {
- GL20.glUniformMatrix4(location, transpose, value);
- }
-
- public void glUseProgram(int program) {
- GL20.glUseProgram(program);
- }
-
- public void glValidateProgram(int program) {
- GL20.glValidateProgram(program);
- }
-
- public void glVertexAttrib1f(int indx, float x) {
- GL20.glVertexAttrib1f(indx, x);
- }
-
- public void glVertexAttrib1fv(int indx, FloatBuffer values) {
- GL20.glVertexAttrib1f(indx, values.get());
- }
-
- public void glVertexAttrib2f(int indx, float x, float y) {
- GL20.glVertexAttrib2f(indx, x, y);
- }
-
- public void glVertexAttrib2fv(int indx, FloatBuffer values) {
- GL20.glVertexAttrib2f(indx, values.get(), values.get());
- }
-
- public void glVertexAttrib3f(int indx, float x, float y, float z) {
- GL20.glVertexAttrib3f(indx, x, y, z);
- }
-
- public void glVertexAttrib3fv(int indx, FloatBuffer values) {
- GL20.glVertexAttrib3f(indx, values.get(), values.get(), values.get());
- }
-
- public void glVertexAttrib4f(int indx, float x, float y, float z, float w) {
- GL20.glVertexAttrib4f(indx, x, y, z, w);
- }
-
- public void glVertexAttrib4fv(int indx, FloatBuffer values) {
- GL20.glVertexAttrib4f(indx, values.get(), values.get(), values.get(), values.get());
- }
-
- public void glVertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
- Buffer buffer) {
- if (buffer instanceof ByteBuffer) {
- if (type == GL_BYTE)
- GL20.glVertexAttribPointer(indx,
- size,
- false,
- normalized,
- stride,
- (ByteBuffer) buffer);
- else if (type == GL_UNSIGNED_BYTE)
- GL20.glVertexAttribPointer(indx,
- size,
- true,
- normalized,
- stride,
- (ByteBuffer) buffer);
- else if (type == GL_SHORT)
- GL20.glVertexAttribPointer(indx,
- size,
- false,
- normalized,
- stride,
- ((ByteBuffer) buffer).asShortBuffer());
- else if (type == GL_UNSIGNED_SHORT)
- GL20.glVertexAttribPointer(indx,
- size,
- true,
- normalized,
- stride,
- ((ByteBuffer) buffer).asShortBuffer());
- else if (type == GL_FLOAT)
- GL20.glVertexAttribPointer(indx,
- size,
- normalized,
- stride,
- ((ByteBuffer) buffer).asFloatBuffer());
- else
- throw new GdxRuntimeException(
- "Can't use "
- + buffer.getClass().getName()
- + " with type "
- + type
- + " with this method. Use ByteBuffer and one of GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT or GL_FLOAT for type. Blame LWJGL");
- } else
- throw new GdxRuntimeException("Can't use " + buffer.getClass().getName()
- + " with this method. Use ByteBuffer instead. Blame LWJGL");
- }
-
- public void glViewport(int x, int y, int width, int height) {
- GL11.glViewport(x, y, width, height);
- }
-
- public void glDrawElements(int mode, int count, int type, int indices) {
- GL11.glDrawElements(mode, count, type, indices);
- }
-
- public void glVertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
- int ptr) {
- GL20.glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
- }
-
- @Override
- public void glGetShaderSource(int shader, int bufsize, Buffer length, String source) {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java b/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java
index 3d4fe1cc..9d98d46f 100644
--- a/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java
+++ b/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java
@@ -17,46 +17,52 @@
package org.oscim.gdx;
import org.oscim.awt.AwtGraphics;
+import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.core.Tile;
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.oscim.utils.FastMath;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
+import com.badlogic.gdx.backends.jglfw.JglfwApplication;
+import com.badlogic.gdx.backends.jglfw.JglfwApplicationConfiguration;
+import com.badlogic.gdx.backends.jglfw.JglfwGL20;
import com.badlogic.gdx.utils.SharedLibraryLoader;
public class GdxMapApp extends GdxMap {
+ static class GdxGL20Wrapper extends JglfwGL20 implements GL20 {
+
+ }
+
public static void init() {
// load native library
new SharedLibraryLoader().load("vtm-jni");
// init globals
AwtGraphics.init();
GdxAssets.init("assets/");
- GLAdapter.init(new GdxGL20());
+ GLAdapter.init(new GdxGL20Wrapper());
GLAdapter.GDX_DESKTOP_QUIRKS = true;
}
public static void main(String[] args) {
Tile.SIZE = 360;
init();
- new LwjglApplication(new GdxMapApp(), getConfig());
+ new JglfwApplication(new GdxMapApp(), getConfig());
}
- public static void run(GdxMap map, LwjglApplicationConfiguration config, int tileSize) {
+ public static void run(GdxMap map, JglfwApplicationConfiguration config, int tileSize) {
Tile.SIZE = FastMath.clamp(tileSize, 128, 512);
- new LwjglApplication(map, (config == null ? getConfig() : config));
+ new JglfwApplication(map, (config == null ? getConfig() : config));
}
- public static void run(LwjglApplicationConfiguration config, int tileSize, GdxMap map) {
+ public static void run(JglfwApplicationConfiguration config, int tileSize, GdxMap map) {
run(map, config, tileSize);
}
- static protected LwjglApplicationConfiguration getConfig() {
- LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
+ static protected JglfwApplicationConfiguration getConfig() {
+ JglfwApplicationConfiguration cfg = new JglfwApplicationConfiguration();
cfg.title = "vtm-gdx";
cfg.width = 1280;
cfg.height = 800;