vtm-desktop-lwjgl: revert package #259

This commit is contained in:
Emux
2019-04-22 10:16:19 +03:00
parent 5f1c3c3186
commit 63ccf0dcfa
49 changed files with 98 additions and 101 deletions

View File

@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License along with * You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.oscim.gdx.lwjgl; package org.oscim.gdx;
import com.badlogic.gdx.Files; import com.badlogic.gdx.Files;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
@@ -28,8 +28,6 @@ import org.oscim.backend.DateTime;
import org.oscim.backend.DateTimeAdapter; import org.oscim.backend.DateTimeAdapter;
import org.oscim.backend.GLAdapter; import org.oscim.backend.GLAdapter;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.gdx.GdxAssets;
import org.oscim.gdx.GdxMap;
import org.oscim.tiling.TileSource; import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.oscim.utils.FastMath; import org.oscim.utils.FastMath;

View File

@@ -30,7 +30,7 @@
* limitations under the License. * limitations under the License.
******************************************************************************/ ******************************************************************************/
package org.oscim.gdx.lwjgl; package org.oscim.gdx;
import com.badlogic.gdx.utils.GdxRuntimeException; import com.badlogic.gdx.utils.GdxRuntimeException;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;

View File

@@ -14,18 +14,17 @@
* limitations under the License. * limitations under the License.
******************************************************************************/ ******************************************************************************/
package org.oscim.gdx.lwjgl; package org.oscim.gdx;
import com.badlogic.gdx.utils.GdxRuntimeException; import com.badlogic.gdx.utils.GdxRuntimeException;
import org.lwjgl.opengl.*; import org.lwjgl.opengl.*;
import org.oscim.backend.GL30;
import java.nio.*; import java.nio.*;
/** /**
* See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglGL30.java * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglGL30.java
*/ */
public class LwjglGL30 extends LwjglGL20 implements GL30 { public class LwjglGL30 extends LwjglGL20 implements org.oscim.backend.GL30 {
@Override @Override
public void readBuffer(int mode) { public void readBuffer(int mode) {
GL11.glReadBuffer(mode); GL11.glReadBuffer(mode);
@@ -205,246 +204,246 @@ public class LwjglGL30 extends LwjglGL20 implements GL30 {
@Override @Override
public void blitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, public void blitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1,
int mask, int filter) { int mask, int filter) {
org.lwjgl.opengl.GL30.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); GL30.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
} }
@Override @Override
public void bindFramebuffer(int target, int framebuffer) { public void bindFramebuffer(int target, int framebuffer) {
org.lwjgl.opengl.GL30.glBindFramebuffer(target, framebuffer); GL30.glBindFramebuffer(target, framebuffer);
} }
@Override @Override
public void bindRenderbuffer(int target, int renderbuffer) { public void bindRenderbuffer(int target, int renderbuffer) {
org.lwjgl.opengl.GL30.glBindRenderbuffer(target, renderbuffer); GL30.glBindRenderbuffer(target, renderbuffer);
} }
@Override @Override
public int checkFramebufferStatus(int target) { public int checkFramebufferStatus(int target) {
return org.lwjgl.opengl.GL30.glCheckFramebufferStatus(target); return GL30.glCheckFramebufferStatus(target);
} }
@Override @Override
public void deleteFramebuffers(int n, IntBuffer framebuffers) { public void deleteFramebuffers(int n, IntBuffer framebuffers) {
org.lwjgl.opengl.GL30.glDeleteFramebuffers(framebuffers); GL30.glDeleteFramebuffers(framebuffers);
} }
@Override @Override
public void deleteFramebuffer(int framebuffer) { public void deleteFramebuffer(int framebuffer) {
org.lwjgl.opengl.GL30.glDeleteFramebuffers(framebuffer); GL30.glDeleteFramebuffers(framebuffer);
} }
@Override @Override
public void deleteRenderbuffers(int n, IntBuffer renderbuffers) { public void deleteRenderbuffers(int n, IntBuffer renderbuffers) {
org.lwjgl.opengl.GL30.glDeleteRenderbuffers(renderbuffers); GL30.glDeleteRenderbuffers(renderbuffers);
} }
@Override @Override
public void deleteRenderbuffer(int renderbuffer) { public void deleteRenderbuffer(int renderbuffer) {
org.lwjgl.opengl.GL30.glDeleteRenderbuffers(renderbuffer); GL30.glDeleteRenderbuffers(renderbuffer);
} }
@Override @Override
public void generateMipmap(int target) { public void generateMipmap(int target) {
org.lwjgl.opengl.GL30.glGenerateMipmap(target); GL30.glGenerateMipmap(target);
} }
@Override @Override
public void genFramebuffers(int n, IntBuffer framebuffers) { public void genFramebuffers(int n, IntBuffer framebuffers) {
org.lwjgl.opengl.GL30.glGenFramebuffers(framebuffers); GL30.glGenFramebuffers(framebuffers);
} }
@Override @Override
public int genFramebuffer() { public int genFramebuffer() {
return org.lwjgl.opengl.GL30.glGenFramebuffers(); return GL30.glGenFramebuffers();
} }
@Override @Override
public void genRenderbuffers(int n, IntBuffer renderbuffers) { public void genRenderbuffers(int n, IntBuffer renderbuffers) {
org.lwjgl.opengl.GL30.glGenRenderbuffers(renderbuffers); GL30.glGenRenderbuffers(renderbuffers);
} }
@Override @Override
public int genRenderbuffer() { public int genRenderbuffer() {
return org.lwjgl.opengl.GL30.glGenRenderbuffers(); return GL30.glGenRenderbuffers();
} }
@Override @Override
public void getRenderbufferParameteriv(int target, int pname, IntBuffer params) { public void getRenderbufferParameteriv(int target, int pname, IntBuffer params) {
org.lwjgl.opengl.GL30.glGetRenderbufferParameter(target, pname, params); GL30.glGetRenderbufferParameter(target, pname, params);
} }
@Override @Override
public boolean isFramebuffer(int framebuffer) { public boolean isFramebuffer(int framebuffer) {
return org.lwjgl.opengl.GL30.glIsFramebuffer(framebuffer); return GL30.glIsFramebuffer(framebuffer);
} }
@Override @Override
public boolean isRenderbuffer(int renderbuffer) { public boolean isRenderbuffer(int renderbuffer) {
return org.lwjgl.opengl.GL30.glIsRenderbuffer(renderbuffer); return GL30.glIsRenderbuffer(renderbuffer);
} }
@Override @Override
public void renderbufferStorage(int target, int internalformat, int width, int height) { public void renderbufferStorage(int target, int internalformat, int width, int height) {
org.lwjgl.opengl.GL30.glRenderbufferStorage(target, internalformat, width, height); GL30.glRenderbufferStorage(target, internalformat, width, height);
} }
@Override @Override
public void renderbufferStorageMultisample(int target, int samples, int internalformat, int width, int height) { public void renderbufferStorageMultisample(int target, int samples, int internalformat, int width, int height) {
org.lwjgl.opengl.GL30.glRenderbufferStorageMultisample(target, samples, internalformat, width, height); GL30.glRenderbufferStorageMultisample(target, samples, internalformat, width, height);
} }
@Override @Override
public void framebufferTexture2D(int target, int attachment, int textarget, int texture, int level) { public void framebufferTexture2D(int target, int attachment, int textarget, int texture, int level) {
org.lwjgl.opengl.GL30.glFramebufferTexture2D(target, attachment, textarget, texture, level); GL30.glFramebufferTexture2D(target, attachment, textarget, texture, level);
} }
@Override @Override
public void framebufferRenderbuffer(int target, int attachment, int renderbuffertarget, int renderbuffer) { public void framebufferRenderbuffer(int target, int attachment, int renderbuffertarget, int renderbuffer) {
org.lwjgl.opengl.GL30.glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer); GL30.glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
} }
@Override @Override
public void framebufferTextureLayer(int target, int attachment, int texture, int level, int layer) { public void framebufferTextureLayer(int target, int attachment, int texture, int level, int layer) {
org.lwjgl.opengl.GL30.glFramebufferTextureLayer(target, attachment, texture, level, layer); GL30.glFramebufferTextureLayer(target, attachment, texture, level, layer);
} }
@Override @Override
public void flushMappedBufferRange(int target, int offset, int length) { public void flushMappedBufferRange(int target, int offset, int length) {
org.lwjgl.opengl.GL30.glFlushMappedBufferRange(target, offset, length); GL30.glFlushMappedBufferRange(target, offset, length);
} }
@Override @Override
public void bindVertexArray(int array) { public void bindVertexArray(int array) {
org.lwjgl.opengl.GL30.glBindVertexArray(array); GL30.glBindVertexArray(array);
} }
@Override @Override
public void deleteVertexArrays(int n, int[] arrays, int offset) { public void deleteVertexArrays(int n, int[] arrays, int offset) {
for (int i = offset; i < offset + n; i++) { for (int i = offset; i < offset + n; i++) {
org.lwjgl.opengl.GL30.glDeleteVertexArrays(arrays[i]); GL30.glDeleteVertexArrays(arrays[i]);
} }
} }
@Override @Override
public void deleteVertexArrays(int n, IntBuffer arrays) { public void deleteVertexArrays(int n, IntBuffer arrays) {
org.lwjgl.opengl.GL30.glDeleteVertexArrays(arrays); GL30.glDeleteVertexArrays(arrays);
} }
@Override @Override
public void genVertexArrays(int n, int[] arrays, int offset) { public void genVertexArrays(int n, int[] arrays, int offset) {
for (int i = offset; i < offset + n; i++) { for (int i = offset; i < offset + n; i++) {
arrays[i] = org.lwjgl.opengl.GL30.glGenVertexArrays(); arrays[i] = GL30.glGenVertexArrays();
} }
} }
@Override @Override
public void genVertexArrays(int n, IntBuffer arrays) { public void genVertexArrays(int n, IntBuffer arrays) {
org.lwjgl.opengl.GL30.glGenVertexArrays(arrays); GL30.glGenVertexArrays(arrays);
} }
@Override @Override
public boolean isVertexArray(int array) { public boolean isVertexArray(int array) {
return org.lwjgl.opengl.GL30.glIsVertexArray(array); return GL30.glIsVertexArray(array);
} }
@Override @Override
public void beginTransformFeedback(int primitiveMode) { public void beginTransformFeedback(int primitiveMode) {
org.lwjgl.opengl.GL30.glBeginTransformFeedback(primitiveMode); GL30.glBeginTransformFeedback(primitiveMode);
} }
@Override @Override
public void endTransformFeedback() { public void endTransformFeedback() {
org.lwjgl.opengl.GL30.glEndTransformFeedback(); GL30.glEndTransformFeedback();
} }
@Override @Override
public void bindBufferRange(int target, int index, int buffer, int offset, int size) { public void bindBufferRange(int target, int index, int buffer, int offset, int size) {
org.lwjgl.opengl.GL30.glBindBufferRange(target, index, buffer, offset, size); GL30.glBindBufferRange(target, index, buffer, offset, size);
} }
@Override @Override
public void bindBufferBase(int target, int index, int buffer) { public void bindBufferBase(int target, int index, int buffer) {
org.lwjgl.opengl.GL30.glBindBufferBase(target, index, buffer); GL30.glBindBufferBase(target, index, buffer);
} }
@Override @Override
public void transformFeedbackVaryings(int program, String[] varyings, int bufferMode) { public void transformFeedbackVaryings(int program, String[] varyings, int bufferMode) {
org.lwjgl.opengl.GL30.glTransformFeedbackVaryings(program, varyings, bufferMode); GL30.glTransformFeedbackVaryings(program, varyings, bufferMode);
} }
@Override @Override
public void vertexAttribIPointer(int index, int size, int type, int stride, int offset) { public void vertexAttribIPointer(int index, int size, int type, int stride, int offset) {
org.lwjgl.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, offset); GL30.glVertexAttribIPointer(index, size, type, stride, offset);
} }
@Override @Override
public void getVertexAttribIiv(int index, int pname, IntBuffer params) { public void getVertexAttribIiv(int index, int pname, IntBuffer params) {
org.lwjgl.opengl.GL30.glGetVertexAttribI(index, pname, params); GL30.glGetVertexAttribI(index, pname, params);
} }
@Override @Override
public void getVertexAttribIuiv(int index, int pname, IntBuffer params) { public void getVertexAttribIuiv(int index, int pname, IntBuffer params) {
org.lwjgl.opengl.GL30.glGetVertexAttribIu(index, pname, params); GL30.glGetVertexAttribIu(index, pname, params);
} }
@Override @Override
public void vertexAttribI4i(int index, int x, int y, int z, int w) { public void vertexAttribI4i(int index, int x, int y, int z, int w) {
org.lwjgl.opengl.GL30.glVertexAttribI4i(index, x, y, z, w); GL30.glVertexAttribI4i(index, x, y, z, w);
} }
@Override @Override
public void vertexAttribI4ui(int index, int x, int y, int z, int w) { public void vertexAttribI4ui(int index, int x, int y, int z, int w) {
org.lwjgl.opengl.GL30.glVertexAttribI4ui(index, x, y, z, w); GL30.glVertexAttribI4ui(index, x, y, z, w);
} }
@Override @Override
public void getUniformuiv(int program, int location, IntBuffer params) { public void getUniformuiv(int program, int location, IntBuffer params) {
org.lwjgl.opengl.GL30.glGetUniformu(program, location, params); GL30.glGetUniformu(program, location, params);
} }
@Override @Override
public int getFragDataLocation(int program, String name) { public int getFragDataLocation(int program, String name) {
return org.lwjgl.opengl.GL30.glGetFragDataLocation(program, name); return GL30.glGetFragDataLocation(program, name);
} }
@Override @Override
public void uniform1uiv(int location, int count, IntBuffer value) { public void uniform1uiv(int location, int count, IntBuffer value) {
org.lwjgl.opengl.GL30.glUniform1u(location, value); GL30.glUniform1u(location, value);
} }
@Override @Override
public void uniform3uiv(int location, int count, IntBuffer value) { public void uniform3uiv(int location, int count, IntBuffer value) {
org.lwjgl.opengl.GL30.glUniform3u(location, value); GL30.glUniform3u(location, value);
} }
@Override @Override
public void uniform4uiv(int location, int count, IntBuffer value) { public void uniform4uiv(int location, int count, IntBuffer value) {
org.lwjgl.opengl.GL30.glUniform4u(location, value); GL30.glUniform4u(location, value);
} }
@Override @Override
public void clearBufferiv(int buffer, int drawbuffer, IntBuffer value) { public void clearBufferiv(int buffer, int drawbuffer, IntBuffer value) {
org.lwjgl.opengl.GL30.glClearBuffer(buffer, drawbuffer, value); GL30.glClearBuffer(buffer, drawbuffer, value);
} }
@Override @Override
public void clearBufferuiv(int buffer, int drawbuffer, IntBuffer value) { public void clearBufferuiv(int buffer, int drawbuffer, IntBuffer value) {
org.lwjgl.opengl.GL30.glClearBufferu(buffer, drawbuffer, value); GL30.glClearBufferu(buffer, drawbuffer, value);
} }
@Override @Override
public void clearBufferfv(int buffer, int drawbuffer, FloatBuffer value) { public void clearBufferfv(int buffer, int drawbuffer, FloatBuffer value) {
org.lwjgl.opengl.GL30.glClearBuffer(buffer, drawbuffer, value); GL30.glClearBuffer(buffer, drawbuffer, value);
} }
@Override @Override
public void clearBufferfi(int buffer, int drawbuffer, float depth, int stencil) { public void clearBufferfi(int buffer, int drawbuffer, float depth, int stencil) {
org.lwjgl.opengl.GL30.glClearBufferfi(buffer, drawbuffer, depth, stencil); GL30.glClearBufferfi(buffer, drawbuffer, depth, stencil);
} }
@Override @Override
public String getStringi(int name, int index) { public String getStringi(int name, int index) {
return org.lwjgl.opengl.GL30.glGetStringi(name, index); return GL30.glGetStringi(name, index);
} }
@Override @Override

View File

@@ -16,7 +16,7 @@
*/ */
package org.oscim.stuff; package org.oscim.stuff;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -19,7 +19,7 @@ package org.oscim.test;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import org.oscim.core.BoundingBox; import org.oscim.core.BoundingBox;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
import org.oscim.tiling.TileSource; import org.oscim.tiling.TileSource;

View File

@@ -18,7 +18,7 @@ package org.oscim.test;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.GeoPoint; import org.oscim.core.GeoPoint;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.marker.ItemizedLayer; import org.oscim.layers.marker.ItemizedLayer;
import org.oscim.layers.marker.MarkerItem; import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerSymbol; import org.oscim.layers.marker.MarkerSymbol;

View File

@@ -21,7 +21,7 @@ import org.oscim.backend.canvas.Canvas;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.backend.canvas.Paint; import org.oscim.backend.canvas.Paint;
import org.oscim.core.GeoPoint; import org.oscim.core.GeoPoint;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.marker.ItemizedLayer; import org.oscim.layers.marker.ItemizedLayer;
import org.oscim.layers.marker.MarkerItem; import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerSymbol; import org.oscim.layers.marker.MarkerSymbol;

View File

@@ -15,7 +15,7 @@
*/ */
package org.oscim.test; package org.oscim.test;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.utils.Parameters; import org.oscim.utils.Parameters;
public class AtlasThemeTest extends SimpleMapTest { public class AtlasThemeTest extends SimpleMapTest {

View File

@@ -17,7 +17,7 @@
package org.oscim.test; package org.oscim.test;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
import org.oscim.tiling.source.bitmap.DefaultSources; import org.oscim.tiling.source.bitmap.DefaultSources;

View File

@@ -17,7 +17,7 @@ package org.oscim.test;
import org.oscim.backend.GLAdapter; import org.oscim.backend.GLAdapter;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.core.GeometryBuffer; import org.oscim.core.GeometryBuffer;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GenericLayer; import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer; import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;

View File

@@ -19,7 +19,7 @@ import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.core.GeoPoint; import org.oscim.core.GeoPoint;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.marker.*; import org.oscim.layers.marker.*;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.tiling.TileSource; import org.oscim.tiling.TileSource;

View File

@@ -17,7 +17,7 @@
package org.oscim.test; package org.oscim.test;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;

View File

@@ -17,7 +17,7 @@ package org.oscim.test;
import org.oscim.core.MapElement; import org.oscim.core.MapElement;
import org.oscim.core.Tag; import org.oscim.core.Tag;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.TileGridLayer; import org.oscim.layers.TileGridLayer;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.buildings.S3DBLayer; import org.oscim.layers.tile.buildings.S3DBLayer;

View File

@@ -18,7 +18,7 @@
package org.oscim.test; package org.oscim.test;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.poi3d.Poi3DLayer; import org.oscim.gdx.poi3d.Poi3DLayer;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;

View File

@@ -26,7 +26,7 @@ import com.badlogic.gdx.utils.viewport.ScreenViewport;
import com.badlogic.gdx.utils.viewport.Viewport; import com.badlogic.gdx.utils.viewport.Viewport;
import org.oscim.backend.GL; import org.oscim.backend.GL;
import org.oscim.core.Point; import org.oscim.core.Point;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.renderer.GLState; import org.oscim.renderer.GLState;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
import org.oscim.tiling.TileSource; import org.oscim.tiling.TileSource;

View File

@@ -19,7 +19,7 @@ package org.oscim.test;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.backend.canvas.Paint.Cap; import org.oscim.backend.canvas.Paint.Cap;
import org.oscim.core.GeometryBuffer; import org.oscim.core.GeometryBuffer;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GenericLayer; import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer; import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;

View File

@@ -22,7 +22,7 @@ import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.backend.canvas.Paint.Cap; import org.oscim.backend.canvas.Paint.Cap;
import org.oscim.core.GeometryBuffer; import org.oscim.core.GeometryBuffer;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GenericLayer; import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer; import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;

View File

@@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.core.GeometryBuffer; import org.oscim.core.GeometryBuffer;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GenericLayer; import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer; import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;

View File

@@ -22,7 +22,7 @@ import org.oscim.backend.canvas.Color;
import org.oscim.core.GeoPoint; import org.oscim.core.GeoPoint;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.event.Event; import org.oscim.event.Event;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.vector.PathLayer; import org.oscim.layers.vector.PathLayer;
import org.oscim.layers.vector.geometries.Style; import org.oscim.layers.vector.geometries.Style;

View File

@@ -14,7 +14,7 @@
*/ */
package org.oscim.test; package org.oscim.test;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.utils.Parameters; import org.oscim.utils.Parameters;
public class MapEventLayer2Test extends MarkerLayerTest { public class MapEventLayer2Test extends MarkerLayerTest {

View File

@@ -17,7 +17,7 @@ package org.oscim.test;
import okhttp3.Cache; import okhttp3.Cache;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;

View File

@@ -16,7 +16,7 @@ package org.oscim.test;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -15,7 +15,7 @@
*/ */
package org.oscim.test; package org.oscim.test;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import java.io.File; import java.io.File;

View File

@@ -14,7 +14,7 @@
*/ */
package org.oscim.test; package org.oscim.test;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import java.io.File; import java.io.File;

View File

@@ -15,7 +15,7 @@
package org.oscim.test; package org.oscim.test;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.theme.StreamRenderTheme; import org.oscim.theme.StreamRenderTheme;
import org.oscim.theme.XmlRenderThemeMenuCallback; import org.oscim.theme.XmlRenderThemeMenuCallback;
import org.oscim.theme.XmlRenderThemeStyleLayer; import org.oscim.theme.XmlRenderThemeStyleLayer;

View File

@@ -20,7 +20,7 @@ package org.oscim.test;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.event.Event; import org.oscim.event.Event;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.poi3d.Poi3DLayer; import org.oscim.gdx.poi3d.Poi3DLayer;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.buildings.S3DBLayer; import org.oscim.layers.tile.buildings.S3DBLayer;

View File

@@ -17,7 +17,7 @@ package org.oscim.test;
import okhttp3.Cache; import okhttp3.Cache;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -17,7 +17,7 @@ package org.oscim.test;
import okhttp3.Cache; import okhttp3.Cache;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -22,7 +22,7 @@ import org.oscim.core.GeoPoint;
import org.oscim.event.Gesture; import org.oscim.event.Gesture;
import org.oscim.event.GestureListener; import org.oscim.event.GestureListener;
import org.oscim.event.MotionEvent; import org.oscim.event.MotionEvent;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.Layer; import org.oscim.layers.Layer;
import org.oscim.layers.marker.ItemizedLayer; import org.oscim.layers.marker.ItemizedLayer;
import org.oscim.layers.marker.MarkerItem; import org.oscim.layers.marker.MarkerItem;

View File

@@ -20,7 +20,7 @@ import org.oscim.core.GeoPoint;
import org.oscim.event.Gesture; import org.oscim.event.Gesture;
import org.oscim.event.GestureListener; import org.oscim.event.GestureListener;
import org.oscim.event.MotionEvent; import org.oscim.event.MotionEvent;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.Layer; import org.oscim.layers.Layer;
import org.oscim.layers.marker.ItemizedLayer; import org.oscim.layers.marker.ItemizedLayer;
import org.oscim.layers.marker.MarkerItem; import org.oscim.layers.marker.MarkerItem;

View File

@@ -17,7 +17,7 @@ package org.oscim.test;
import okhttp3.Cache; import okhttp3.Cache;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -17,7 +17,7 @@ package org.oscim.test;
import okhttp3.Cache; import okhttp3.Cache;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -16,7 +16,7 @@
*/ */
package org.oscim.test; package org.oscim.test;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.buildings.S3DBTileLayer; import org.oscim.layers.tile.buildings.S3DBTileLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -17,7 +17,7 @@ package org.oscim.test;
import okhttp3.Cache; import okhttp3.Cache;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -18,7 +18,7 @@
package org.oscim.test; package org.oscim.test;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GroupLayer; import org.oscim.layers.GroupLayer;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;

View File

@@ -17,7 +17,7 @@
*/ */
package org.oscim.test; package org.oscim.test;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.utils.Parameters; import org.oscim.utils.Parameters;
public class POTTextureTest extends SimpleMapTest { public class POTTextureTest extends SimpleMapTest {

View File

@@ -22,7 +22,7 @@ import org.oscim.core.MapPosition;
import org.oscim.event.Event; import org.oscim.event.Event;
import org.oscim.event.Gesture; import org.oscim.event.Gesture;
import org.oscim.event.MotionEvent; import org.oscim.event.MotionEvent;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.vector.PathLayer; import org.oscim.layers.vector.PathLayer;
import org.oscim.map.Map.UpdateListener; import org.oscim.map.Map.UpdateListener;

View File

@@ -15,7 +15,7 @@
*/ */
package org.oscim.test; package org.oscim.test;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.marker.MarkerItem; import org.oscim.layers.marker.MarkerItem;
import java.util.Timer; import java.util.Timer;

View File

@@ -17,7 +17,7 @@
package org.oscim.test; package org.oscim.test;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
import org.oscim.theme.RenderTheme; import org.oscim.theme.RenderTheme;

View File

@@ -17,7 +17,7 @@
package org.oscim.test; package org.oscim.test;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GroupLayer; import org.oscim.layers.GroupLayer;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;

View File

@@ -18,7 +18,7 @@ package org.oscim.test;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.backend.canvas.Paint.Cap; import org.oscim.backend.canvas.Paint.Cap;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;
import org.oscim.theme.RenderTheme; import org.oscim.theme.RenderTheme;

View File

@@ -21,7 +21,7 @@ import org.oscim.core.MapElement;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection; import org.oscim.core.MercatorProjection;
import org.oscim.event.Event; import org.oscim.event.Event;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.*; import org.oscim.layers.tile.*;
import org.oscim.layers.tile.MapTile.TileNode; import org.oscim.layers.tile.MapTile.TileNode;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;

View File

@@ -17,7 +17,7 @@
package org.oscim.test; package org.oscim.test;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.vector.VectorLayer; import org.oscim.layers.vector.VectorLayer;
import org.oscim.layers.vector.geometries.PointDrawable; import org.oscim.layers.vector.geometries.PointDrawable;

View File

@@ -20,7 +20,7 @@ package org.oscim.test.jeo;
import org.jeo.map.Style; import org.jeo.map.Style;
import org.jeo.vector.VectorDataset; import org.jeo.vector.VectorDataset;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.JeoVectorLayer; import org.oscim.layers.JeoVectorLayer;
import org.oscim.layers.OSMIndoorLayer; import org.oscim.layers.OSMIndoorLayer;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;

View File

@@ -16,7 +16,7 @@
*/ */
package org.oscim.test.jeo; package org.oscim.test.jeo;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
import org.oscim.theme.carto.RenderTheme; import org.oscim.theme.carto.RenderTheme;

View File

@@ -18,7 +18,7 @@ package org.oscim.test.renderer;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.backend.canvas.Paint.Cap; import org.oscim.backend.canvas.Paint.Cap;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GenericLayer; import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer; import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;

View File

@@ -19,7 +19,7 @@ package org.oscim.test.renderer;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.core.GeometryBuffer; import org.oscim.core.GeometryBuffer;
import org.oscim.core.Point; import org.oscim.core.Point;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GenericLayer; import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer; import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;

View File

@@ -18,7 +18,7 @@ package org.oscim.test.renderer;
import org.oscim.backend.GL; import org.oscim.backend.GL;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.gdx.lwjgl.GdxMapApp; import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.GenericLayer; import org.oscim.layers.GenericLayer;
import org.oscim.renderer.*; import org.oscim.renderer.*;
import org.oscim.utils.FastMath; import org.oscim.utils.FastMath;

View File

@@ -24,7 +24,7 @@ import org.oscim.backend.DateTime;
import org.oscim.backend.DateTimeAdapter; import org.oscim.backend.DateTimeAdapter;
import org.oscim.backend.GLAdapter; import org.oscim.backend.GLAdapter;
import org.oscim.gdx.GdxAssets; import org.oscim.gdx.GdxAssets;
import org.oscim.gdx.lwjgl.LwjglGL20; import org.oscim.gdx.LwjglGL20;
import org.oscim.theme.comparator.logging.AllAppender; import org.oscim.theme.comparator.logging.AllAppender;
import org.oscim.theme.comparator.logging.BaseAppender; import org.oscim.theme.comparator.logging.BaseAppender;
import org.oscim.theme.comparator.logging.MapsforgeAppender; import org.oscim.theme.comparator.logging.MapsforgeAppender;