xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gustl22 2019-04-17 16:16:14 +02:00 committed by Emux
parent d6e55edd8e
commit 5979161611
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
54 changed files with 98 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
settings.gradle
View File

@ -5,6 +5,7 @@ include ':vtm-android-example'
include ':vtm-android-gdx'
include ':vtm-app'
include ':vtm-desktop'
include ':vtm-desktop-lwjgl'
include ':vtm-extras'
include ':vtm-gdx'
include ':vtm-gdx-poi3d'

19
vtm-desktop-lwjgl/build.gradle Normal file
View File

@ -0,0 +1,19 @@
apply plugin: 'java-library'
apply plugin: 'maven'
dependencies {
api project(':vtm-desktop')
api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
}
sourceSets {
main {
java.srcDirs = ['src']
}
}
if (project.hasProperty("SONATYPE_USERNAME")) {
afterEvaluate {
project.apply from: "${rootProject.projectDir}/deploy.gradle"
}
}

7
vtm-desktop/src/org/oscim/gdx/GdxMapApp.java → vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/GdxMapApp.java
View File

@ -16,19 +16,20 @@
* 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/>.
*/
package org.oscim.gdx;
package org.oscim.gdx.lwjgl;
import com.badlogic.gdx.Files;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
import com.badlogic.gdx.graphics.glutils.GLVersion;
import com.badlogic.gdx.utils.SharedLibraryLoader;
import org.oscim.awt.AwtGraphics;
import org.oscim.backend.DateTime;
import org.oscim.backend.DateTimeAdapter;
import org.oscim.backend.GLAdapter;
import org.oscim.core.Tile;
import org.oscim.gdx.GdxAssets;
import org.oscim.gdx.GdxMap;
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.oscim.utils.FastMath;
@ -66,7 +67,7 @@ public class GdxMapApp extends GdxMap {
protected static LwjglApplicationConfiguration getConfig(String title) {
LwjglApplicationConfiguration.disableAudio = true;
LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
cfg.title = title != null ? title : "vtm-gdx";
cfg.title = title != null ? title : "vtm-gdx-lwjgl";
int[] sizes = new int[]{128, 64, 32, 16};
for (int size : sizes) {

18
vtm-desktop/src/org/oscim/gdx/LwjglGL20.java → vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/LwjglGL20.java
View File

@ -30,26 +30,14 @@
* limitations under the License.
******************************************************************************/
package org.oscim.gdx;
package org.oscim.gdx.lwjgl;
import com.badlogic.gdx.utils.GdxRuntimeException;
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 org.lwjgl.opengl.*;
import org.oscim.backend.GL;
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 java.nio.*;
/**
* An implementation of the {@link GL20} interface based on LWJGL. Note that LWJGL shaders and OpenGL ES shaders will not be 100%

25
vtm-desktop/src/org/oscim/gdx/LwjglGL30.java → vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/LwjglGL30.java
View File

@ -14,33 +14,16 @@
* limitations under the License.
******************************************************************************/
package org.oscim.gdx;
package org.oscim.gdx.lwjgl;
import com.badlogic.gdx.utils.GdxRuntimeException;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import org.lwjgl.opengl.GL15;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL21;
import org.lwjgl.opengl.GL31;
import org.lwjgl.opengl.GL32;
import org.lwjgl.opengl.GL33;
import org.lwjgl.opengl.GL40;
import org.lwjgl.opengl.GL41;
import org.lwjgl.opengl.GL43;
import org.lwjgl.opengl.*;
import org.oscim.backend.GL30;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.DoubleBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.nio.LongBuffer;
import java.nio.ShortBuffer;
import java.nio.*;
/**
* See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/Lwjgl3GL30.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 {
@Override

1
vtm-desktop/build.gradle
View File

@ -3,7 +3,6 @@ apply plugin: 'maven'
dependencies {
api project(':vtm-gdx')
api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
api 'com.github.blackears:svgSalamander:v1.1.1'
}

2
vtm-playground/build.gradle
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)
}

2
vtm-playground/src/org/oscim/stuff/MapzenTest.java
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;

3
vtm-playground/src/org/oscim/test/AnimatorTest.java
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;

2
vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java
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;

2
vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java
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;

2
vtm-playground/src/org/oscim/test/AtlasThemeTest.java
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 {

3
vtm-playground/src/org/oscim/test/BitmapTileTest.java
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;

2
vtm-playground/src/org/oscim/test/CircleTest.java
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;

10
vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java
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;

3
vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java
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;

2
vtm-playground/src/org/oscim/test/ExtrusionsTest.java
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;

2
vtm-playground/src/org/oscim/test/GdxPoi3DTest.java
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;

3
vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java
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;

2
vtm-playground/src/org/oscim/test/HairLineTest.java
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;

3
vtm-playground/src/org/oscim/test/LineRenderTest.java
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;

3
vtm-playground/src/org/oscim/test/LineTest.java
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;

2
vtm-playground/src/org/oscim/test/LineTexTest.java
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;

2
vtm-playground/src/org/oscim/test/MapEventLayer2Test.java
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 {

7
vtm-playground/src/org/oscim/test/MapilionMvtTest.java
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

2
vtm-playground/src/org/oscim/test/MapsforgeMultiTest.java
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;

2
vtm-playground/src/org/oscim/test/MapsforgePoi3DTest.java
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;

2
vtm-playground/src/org/oscim/test/MapsforgeS3DBTest.java
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;

3
vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java
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;

8
vtm-playground/src/org/oscim/test/MapsforgeTest.java
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;

7
vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java
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;

7
vtm-playground/src/org/oscim/test/MapzenMvtTest.java
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;

2
vtm-playground/src/org/oscim/test/MarkerLayerLabelsTest.java
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;

2
vtm-playground/src/org/oscim/test/MarkerLayerTest.java
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;

7
vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java
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;

7
vtm-playground/src/org/oscim/test/NextzenMvtTest.java
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;

2
vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java
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;

7
vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java
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;

2
vtm-playground/src/org/oscim/test/OverpassTest.java
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;

2
vtm-playground/src/org/oscim/test/POTTextureTest.java
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 {

2
vtm-playground/src/org/oscim/test/PathLayerTest.java
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;

2
vtm-playground/src/org/oscim/test/RotateMarkerLayerTest.java
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;

3
vtm-playground/src/org/oscim/test/RuleVisitorTest.java
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;

8
vtm-playground/src/org/oscim/test/SimpleMapTest.java
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;

2
vtm-playground/src/org/oscim/test/ThemeBuilderTest.java
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;

8
vtm-playground/src/org/oscim/test/TileRenderTest.java
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;

2
vtm-playground/src/org/oscim/test/VectorLayerTest.java
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;

2
vtm-playground/src/org/oscim/test/jeo/LayerTest.java
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;

2
vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
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;

2
vtm-playground/src/org/oscim/test/renderer/AtlasTest.java
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;

2
vtm-playground/src/org/oscim/test/renderer/BezierTest.java
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;

10
vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java
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;

2
vtm-theme-comparator/build.gradle
View File

@ -8,7 +8,7 @@ configurations.all {
*/
dependencies {
implementation project(':vtm-desktop')
implementation project(':vtm-desktop-lwjgl')
file("${rootDir}/vtm-desktop/natives").eachDir() { dir ->
implementation files(dir.path)
}

13
vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java
View File

@ -15,16 +15,16 @@
*/
package org.oscim.theme.comparator;
import ch.qos.logback.classic.LoggerContext;
import com.badlogic.gdx.utils.SharedLibraryLoader;
import com.jtattoo.plaf.DecorationHelper;
import com.jtattoo.plaf.hifi.HiFiLookAndFeel;
import org.oscim.awt.AwtGraphics;
import org.oscim.backend.DateTime;
import org.oscim.backend.DateTimeAdapter;
import org.oscim.backend.GLAdapter;
import org.oscim.gdx.GdxAssets;
import org.oscim.gdx.LwjglGL20;
import org.oscim.gdx.lwjgl.LwjglGL20;
import org.oscim.theme.comparator.logging.AllAppender;
import org.oscim.theme.comparator.logging.BaseAppender;
import org.oscim.theme.comparator.logging.MapsforgeAppender;
@ -32,18 +32,11 @@ import org.oscim.theme.comparator.logging.VtmAppender;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.*;
import java.util.Properties;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import javax.swing.ImageIcon;
import javax.swing.JFrame;
import javax.swing.JRootPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import ch.qos.logback.classic.LoggerContext;
public class Main {
public static Preferences prefs = Preferences.userNodeForPackage(Main.class);