Skip to content
This repository was archived by the owner on Apr 27, 2024. It is now read-only.

Commit cb3296e

Browse files
committed
playground tests
1 parent a8400dd commit cb3296e

18 files changed

+212
-219
lines changed

vtm-desktop/src/org/oscim/gdx/GdxMapApp.java

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.oscim.tiling.TileSource;
2424
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
2525
import org.oscim.utils.FastMath;
26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
2628

2729
import com.badlogic.gdx.backends.jglfw.JglfwApplication;
2830
import com.badlogic.gdx.backends.jglfw.JglfwApplicationConfiguration;
@@ -31,6 +33,8 @@
3133

3234
public class GdxMapApp extends GdxMap {
3335

36+
public static final Logger log = LoggerFactory.getLogger(GdxMapApp.class);
37+
3438
static class GdxGL20Wrapper extends JglfwGL20 implements GL20 {
3539

3640
}

vtm-playground/src/org/oscim/test/HairLineTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ static class Renderer extends BucketRenderer {
5454
.build());
5555

5656
@Override
57-
protected boolean setup() {
57+
public boolean setup() {
5858
//ll.roundCap = true;
5959
return super.setup();
6060
}
6161

6262
@Override
63-
protected void update(GLViewport v) {
63+
public void update(GLViewport v) {
6464
if (!init) {
6565
mMapPosition.copy(v.pos);
6666
init = true;

vtm-playground/src/org/oscim/test/LineRenderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public synchronized void clear() {
185185
}
186186

187187
@Override
188-
protected synchronized void update(GLViewport v) {
188+
public synchronized void update(GLViewport v) {
189189

190190
if (mMapPosition.scale == 0)
191191
mMapPosition.copy(v.pos);

vtm-playground/src/org/oscim/test/LineTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ protected void createLayers() {
4242
boolean init;
4343

4444
LineBucket ll = buckets.addLineBucket(0,
45-
new LineStyle(Color.fade(Color.CYAN, 0.5f), 1.5f));
45+
new LineStyle(Color.fade(Color.CYAN, 0.5f), 1.5f));
4646

4747
GeometryBuffer g = new GeometryBuffer(10, 1);
4848

4949
@Override
50-
protected void update(GLViewport v) {
50+
public void update(GLViewport v) {
5151
if (!init) {
5252
mMapPosition.copy(v.pos);
5353
init = true;
@@ -82,13 +82,13 @@ protected void update(GLViewport v) {
8282
buckets.clear();
8383
buckets.set(ll);
8484
g.clear();
85-
for (int i = 0; i < 60; i++) {
86-
g.startLine();
87-
g.addPoint(-1, 0);
88-
g.addPoint(0, 0);
89-
g.addPoint((float) Math.cos(Math.toRadians(angle)),
90-
(float) Math.sin(Math.toRadians(angle)));
91-
}
85+
//for (int i = 0; i < 60; i++) {
86+
g.startLine();
87+
g.addPoint(-1, 0);
88+
g.addPoint(0, 0);
89+
g.addPoint((float) Math.cos(Math.toRadians(angle)),
90+
(float) Math.sin(Math.toRadians(angle)));
91+
//}
9292

9393
g.scale(100, 100);
9494

vtm-playground/src/org/oscim/test/MapTest.java

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
package org.oscim.test;
22

3-
import org.oscim.gdx.GdxMap;
43
import org.oscim.gdx.GdxMapApp;
54
import org.oscim.layers.tile.buildings.BuildingLayer;
65
import org.oscim.layers.tile.vector.VectorTileLayer;
76
import org.oscim.layers.tile.vector.labeling.LabelLayer;
7+
import org.oscim.map.Map;
88
import org.oscim.theme.VtmThemes;
99
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
10-
import org.slf4j.Logger;
11-
import org.slf4j.LoggerFactory;
1210

13-
public class MapTest extends GdxMap {
14-
15-
final Logger log = LoggerFactory.getLogger(MeshTest.class);
11+
public class MapTest extends GdxMapApp {
1612

1713
@Override
1814
public void createLayers() {
15+
Map map = getMap();
1916

20-
VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource());
21-
mMap.setTheme(VtmThemes.DEFAULT);
22-
mMap.layers().add(new BuildingLayer(mMap, l));
23-
mMap.layers().add(new LabelLayer(mMap, l));
17+
VectorTileLayer l = map.setBaseMap(new OSciMap4TileSource());
2418

25-
mMap.setMapPosition(53.08, 8.82, 1 << 17);
19+
map.layers().add(new BuildingLayer(map, l));
20+
map.layers().add(new LabelLayer(map, l));
2621

22+
map.setTheme(VtmThemes.DEFAULT);
23+
map.setMapPosition(53.075, 8.808, 1 << 17);
2724
}
2825

2926
public static void main(String[] args) {

vtm-playground/src/org/oscim/test/MeshTest.java

-47
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package org.oscim.test;
2+
3+
import org.oscim.gdx.GdxMapApp;
4+
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
5+
import org.oscim.layers.tile.buildings.S3DBLayer;
6+
import org.oscim.tiling.TileSource;
7+
import org.oscim.tiling.source.bitmap.DefaultSources;
8+
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
9+
10+
public class S3DBLayerTest extends GdxMapApp {
11+
12+
@Override
13+
public void createLayers() {
14+
15+
//VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource());
16+
//mMap.setTheme(VtmThemes.DEFAULT);
17+
18+
mMap.setBaseMap(new BitmapTileLayer(mMap, DefaultSources.STAMEN_TONER.build()));
19+
20+
TileSource ts = OSciMap4TileSource
21+
.builder()
22+
.url("http://opensciencemap.org/tiles/s3db")
23+
.build();
24+
25+
S3DBLayer tl = new S3DBLayer(mMap, ts);
26+
mMap.layers().add(tl);
27+
28+
mMap.setMapPosition(53.08, 8.82, 1 << 17);
29+
30+
}
31+
32+
public static void main(String[] args) {
33+
init();
34+
run(new S3DBLayerTest(), null, 400);
35+
}
36+
}

vtm-playground/src/org/oscim/test/TessellatorTest.java

-70
This file was deleted.

vtm-playground/src/org/oscim/test/ThemeBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
public class ThemeBuilderTest extends GdxMap {
1515

16-
final Logger log = LoggerFactory.getLogger(MeshTest.class);
16+
final Logger log = LoggerFactory.getLogger(S3DBLayerTest.class);
1717

1818
static class MyTheme extends ThemeBuilder {
1919
public MyTheme() {

0 commit comments

Comments
 (0)