vtm-desktop: decouple libGDX LWJGL backend (#714)

This commit is contained in:
Gustl22
2019-04-17 16:16:14 +02:00
committed by Emux
parent d6e55edd8e
commit 5979161611
54 changed files with 98 additions and 152 deletions

View File

@@ -1,7 +1,7 @@
apply plugin: 'application'
dependencies {
implementation project(':vtm-desktop')
implementation project(':vtm-desktop-lwjgl')
file("${rootDir}/vtm-desktop/natives").eachDir() { dir ->
implementation files(dir.path)
}

View File

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

View File

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

View File

@@ -18,7 +18,7 @@ package org.oscim.test;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.GeoPoint;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.marker.ItemizedLayer;
import org.oscim.layers.marker.MarkerItem;
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.Paint;
import org.oscim.core.GeoPoint;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.marker.ItemizedLayer;
import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerSymbol;

View File

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

View File

@@ -17,8 +17,7 @@
package org.oscim.test;
import com.badlogic.gdx.Input;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.renderer.MapRenderer;
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.canvas.Color;
import org.oscim.core.GeometryBuffer;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport;

View File

@@ -19,14 +19,8 @@ import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Color;
import org.oscim.core.GeoPoint;
import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.marker.ClusterMarkerRenderer;
import org.oscim.layers.marker.ItemizedLayer;
import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerLayer;
import org.oscim.layers.marker.MarkerRenderer;
import org.oscim.layers.marker.MarkerRendererFactory;
import org.oscim.layers.marker.MarkerSymbol;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.marker.*;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.OkHttpEngine;

View File

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

View File

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

View File

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

View File

@@ -24,10 +24,9 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.viewport.ScreenViewport;
import com.badlogic.gdx.utils.viewport.Viewport;
import org.oscim.backend.GL;
import org.oscim.core.Point;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.renderer.GLState;
import org.oscim.renderer.MapRenderer;
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.Paint.Cap;
import org.oscim.core.GeometryBuffer;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport;

View File

@@ -18,12 +18,11 @@
package org.oscim.test;
import com.badlogic.gdx.Input;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Color;
import org.oscim.backend.canvas.Paint.Cap;
import org.oscim.core.GeometryBuffer;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport;

View File

@@ -2,10 +2,9 @@ package org.oscim.test;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import org.oscim.backend.canvas.Color;
import org.oscim.core.GeometryBuffer;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer;
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.MapPosition;
import org.oscim.event.Event;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.vector.PathLayer;
import org.oscim.layers.vector.geometries.Style;

View File

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

View File

@@ -14,8 +14,10 @@
*/
package org.oscim.test;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -29,9 +31,6 @@ import org.oscim.tiling.source.mvt.MapilionMvtTileSource;
import java.io.File;
import java.util.UUID;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
public class MapilionMvtTest extends GdxMapApp {
// Metered API key for demonstration purposes

View File

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

View File

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

View File

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

View File

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

View File

@@ -20,7 +20,7 @@ package org.oscim.test;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
import org.oscim.event.Event;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.gdx.poi3d.Poi3DLayer;
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.buildings.S3DBLayer;
@@ -30,11 +30,7 @@ import org.oscim.map.Map;
import org.oscim.renderer.BitmapRenderer;
import org.oscim.renderer.ExtrusionRenderer;
import org.oscim.renderer.GLViewport;
import org.oscim.scalebar.DefaultMapScaleBar;
import org.oscim.scalebar.ImperialUnitAdapter;
import org.oscim.scalebar.MapScaleBar;
import org.oscim.scalebar.MapScaleBarLayer;
import org.oscim.scalebar.MetricUnitAdapter;
import org.oscim.scalebar.*;
import org.oscim.theme.VtmThemes;
import org.oscim.tiling.source.mapfile.MapFileTileSource;
import org.oscim.tiling.source.mapfile.MapInfo;

View File

@@ -14,8 +14,10 @@
*/
package org.oscim.test;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.geojson.MapzenGeojsonTileSource;
import java.io.File;
import java.util.UUID;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
public class MapzenGeojsonTest extends GdxMapApp {
private static final boolean USE_CACHE = false;

View File

@@ -14,8 +14,10 @@
*/
package org.oscim.test;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.mvt.MapzenMvtTileSource;
import java.io.File;
import java.util.UUID;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
public class MapzenMvtTest extends GdxMapApp {
private static final boolean USE_CACHE = false;

View File

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

View File

@@ -14,8 +14,10 @@
*/
package org.oscim.test;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.geojson.NextzenGeojsonTileSource;
import java.io.File;
import java.util.UUID;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
public class NextzenGeojsonTest extends GdxMapApp {
private static final boolean USE_CACHE = false;

View File

@@ -14,8 +14,10 @@
*/
package org.oscim.test;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.mvt.NextzenMvtTileSource;
import java.io.File;
import java.util.UUID;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
public class NextzenMvtTest extends GdxMapApp {
private static final boolean USE_CACHE = false;

View File

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

View File

@@ -14,8 +14,10 @@
*/
package org.oscim.test;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import org.oscim.core.MapPosition;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.mvt.OpenMapTilesMvtTileSource;
import java.io.File;
import java.util.UUID;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
public class OpenMapTilesMvtTest extends GdxMapApp {
private static final boolean USE_CACHE = false;

View File

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

View File

@@ -17,7 +17,7 @@
*/
package org.oscim.test;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.utils.Parameters;
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.Gesture;
import org.oscim.event.MotionEvent;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.vector.PathLayer;
import org.oscim.map.Map.UpdateListener;

View File

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

View File

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

View File

@@ -17,7 +17,7 @@
package org.oscim.test;
import org.oscim.core.MapPosition;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.GroupLayer;
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -25,11 +25,7 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer;
import org.oscim.map.Map;
import org.oscim.renderer.BitmapRenderer;
import org.oscim.renderer.GLViewport;
import org.oscim.scalebar.DefaultMapScaleBar;
import org.oscim.scalebar.ImperialUnitAdapter;
import org.oscim.scalebar.MapScaleBar;
import org.oscim.scalebar.MapScaleBarLayer;
import org.oscim.scalebar.MetricUnitAdapter;
import org.oscim.scalebar.*;
import org.oscim.theme.VtmThemes;
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.OkHttpEngine;

View File

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

View File

@@ -21,13 +21,9 @@ import org.oscim.core.MapElement;
import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
import org.oscim.event.Event;
import org.oscim.gdx.GdxMapApp;
import org.oscim.layers.tile.MapTile;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.*;
import org.oscim.layers.tile.MapTile.TileNode;
import org.oscim.layers.tile.TileLoader;
import org.oscim.layers.tile.TileManager;
import org.oscim.layers.tile.TileSet;
import org.oscim.layers.tile.VectorTileRenderer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.VectorTileLoader;
import org.oscim.layers.tile.vector.labeling.LabelLayer;

View File

@@ -17,7 +17,7 @@
package org.oscim.test;
import org.oscim.backend.canvas.Color;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.vector.VectorLayer;
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.vector.VectorDataset;
import org.oscim.backend.canvas.Color;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.JeoVectorLayer;
import org.oscim.layers.OSMIndoorLayer;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;

View File

@@ -16,7 +16,7 @@
*/
package org.oscim.test.jeo;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.renderer.MapRenderer;
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.Paint.Cap;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer;
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.core.GeometryBuffer;
import org.oscim.core.Point;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.GLViewport;

View File

@@ -18,15 +18,9 @@ package org.oscim.test.renderer;
import org.oscim.backend.GL;
import org.oscim.backend.canvas.Color;
import org.oscim.gdx.GdxMapApp;
import org.oscim.gdx.lwjgl.GdxMapApp;
import org.oscim.layers.GenericLayer;
import org.oscim.renderer.BucketRenderer;
import org.oscim.renderer.BufferObject;
import org.oscim.renderer.GLShader;
import org.oscim.renderer.GLState;
import org.oscim.renderer.GLUtils;
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.MapRenderer;
import org.oscim.renderer.*;
import org.oscim.utils.FastMath;
import java.nio.FloatBuffer;