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

GL30 adapter (#652)

Browse Source
This commit is contained in:
Gustl22
2019-02-03 21:10:11 +01:00
committed by Emux
parent f6f00c2521
commit 45cf4057d1
11 changed files with 191 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vtm-web-app/src/org/oscim/web/client/GwtMap.java
View File

@@ -2,6 +2,7 @@
* Copyright 2013 Hannes Janetzek
* Copyright 2016-2018 Izumi Kawashima
* Copyright 2017-2018 devemux86
* Copyright 2019 Gustl22
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
@@ -21,11 +22,13 @@ package org.oscim.web.client;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.gwt.GwtApplication;
import com.badlogic.gdx.backends.gwt.GwtGraphics;
import com.badlogic.gdx.graphics.glutils.GLVersion;
import org.oscim.backend.AssetAdapter;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.DateTimeAdapter;
import org.oscim.backend.GL;
import org.oscim.backend.GL30;
import org.oscim.backend.GLAdapter;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
@@ -79,7 +82,6 @@ class GwtMap extends GdxMap {
Tile.SIZE = Tile.calculateTileSize();
log.debug("GLAdapter.init");
GLAdapter.init((GL) Gdx.graphics.getGL20());
MapRenderer.setBackgroundColor(0xffffff);
//Gdx.app.setLogLevel(Application.LOG_DEBUG);
@@ -166,6 +168,14 @@ class GwtMap extends GdxMap {
mSearchBox = new SearchBox(mMap);
}
@Override
protected void initGLAdapter(GLVersion version) {
if (version.getMajorVersion() >= 3)
GLAdapter.init((GL30) Gdx.graphics.getGL30());
else
GLAdapter.init((GL) Gdx.graphics.getGL20());
}
@Override
protected void createLayers() {
mBuildingSolutionControl = new BuildingSolutionControl("#building-solution-input");