POT textures (#334)

This commit is contained in:
Longri
2017-03-16 11:43:38 +01:00
committed by Emux
parent d614809df0
commit d1fdca170e
12 changed files with 244 additions and 13 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 Longri
* Copyright 2016-2017 Longri
* Copyright 2016 devemux86
*
* This program is free software: you can redistribute it and/or modify it under the
@@ -19,6 +19,7 @@ import com.badlogic.gdx.backends.iosrobovm.IOSApplication;
import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration;
import org.oscim.backend.CanvasAdapter;
import org.oscim.theme.ThemeLoader;
import org.robovm.apple.foundation.NSAutoreleasePool;
import org.robovm.apple.glkit.GLKViewDrawableStencilFormat;
import org.robovm.apple.uikit.UIApplication;
@@ -37,12 +38,12 @@ public class ExampleLauncher extends IOSApplication.Delegate {
float scale = (float) (getIosVersion() >= 8 ? UIScreen.getMainScreen().getNativeScale() : UIScreen.getMainScreen().getScale());
CanvasAdapter.dpi *= scale;
// IOSMapApp iosMapApp = new IOSMapApp();
// IOSMapApp iosMapApp = new IOSMapApp();
IOSLineTexTest iosMapApp = new IOSLineTexTest();
// IOSMapAppCluster iosMapApp = new IOSMapAppCluster();
IOSLineTexTest iosMapApp = new IOSLineTexTest();
ThemeLoader.POT_TEXTURES = true;
iosMapApp.init();
return new IOSApplication(iosMapApp, config);

View File

@@ -1,6 +1,6 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2016 Longri
* Copyright 2016-2017 Longri
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
@@ -17,7 +17,6 @@
*/
package org.oscim.ios.test;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GLAdapter;
import org.oscim.backend.canvas.Color;
import org.oscim.core.GeoPoint;
@@ -35,6 +34,7 @@ import org.oscim.layers.vector.geometries.Style;
import org.oscim.map.Map;
import org.oscim.renderer.bucket.TextureItem;
import org.oscim.theme.VtmThemes;
import org.oscim.theme.XmlThemeBuilder;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import java.util.ArrayList;
@@ -63,7 +63,8 @@ public class IOSLineTexTest extends GdxMap {
mMap.setMapPosition(0, 0, 1 << 2);
tex = new TextureItem(CanvasAdapter.getBitmapAsset("", "patterns/pike.png"));
tex = XmlThemeBuilder.loadTexture("", "patterns/pike.png", 0, 0, 100);
// tex = new TextureItem(CanvasAdapter.getBitmapAsset("", "patterns/pike.png"));
tex.mipmap = true;
createLayers(1, true);

View File

@@ -1,6 +1,6 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2016 Longri
* Copyright 2016-2017 Longri
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
@@ -69,7 +69,7 @@ public class IOSMapApp extends GdxMap {
renderer.setOffset(5, 0);
map.layers().add(mapScaleBarLayer);
map.setTheme(VtmThemes.DEFAULT);
map.setTheme(VtmThemes.OSMARENDER);
map.setMapPosition(53.075, 8.808, 1 << 17);
}
}