GL30 adapter (#652)

vtm-ios-example/src/org/oscim/ios/test/IOSLineTexBucketTest.java

@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 Longri
+ * Copyright 2019 Gustl22
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -16,6 +17,8 @@
  */
 package org.oscim.ios.test;
 
+import com.badlogic.gdx.graphics.glutils.GLVersion;
+
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.GLAdapter;
 import org.oscim.core.GeometryBuffer;
@@ -24,6 +27,7 @@ import org.oscim.core.TagSet;
 import org.oscim.gdx.GdxAssets;
 import org.oscim.gdx.GdxMap;
 import org.oscim.ios.backend.IosGL;
+import org.oscim.ios.backend.IosGL30;
 import org.oscim.ios.backend.IosGraphics;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
@@ -45,13 +49,20 @@ public class IOSLineTexBucketTest extends GdxMap {
         // init globals
         IosGraphics.init();
         GdxAssets.init("assets/");
-        GLAdapter.init(new IosGL());
     }
 
     GeometryBuffer mLine = new GeometryBuffer(2, 1);
 
     LineTest l = new LineTest();
 
+    @Override
+    protected void initGLAdapter(GLVersion version) {
+        if (version.getMajorVersion() >= 3)
+            GLAdapter.init(new IosGL30());
+        else
+            GLAdapter.init(new IosGL());
+    }
+
     @Override
     public void createLayers() {
         MapRenderer.setBackgroundColor(0xffffffff);

vtm-ios-example/src/org/oscim/ios/test/IOSMapApp.java

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016-2017 Longri
+ * Copyright 2019 Gustl22
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -17,12 +18,15 @@
  */
 package org.oscim.ios.test;
 
+import com.badlogic.gdx.graphics.glutils.GLVersion;
+
 import org.oscim.backend.DateTime;
 import org.oscim.backend.DateTimeAdapter;
 import org.oscim.backend.GLAdapter;
 import org.oscim.gdx.GdxAssets;
 import org.oscim.gdx.GdxMap;
 import org.oscim.ios.backend.IosGL;
+import org.oscim.ios.backend.IosGL30;
 import org.oscim.ios.backend.IosGraphics;
 import org.oscim.layers.GroupLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
@@ -45,10 +49,17 @@ public class IOSMapApp extends GdxMap {
         // init globals
         IosGraphics.init();
         GdxAssets.init("assets/");
-        GLAdapter.init(new IosGL());
         DateTimeAdapter.init(new DateTime());
     }
 
+    @Override
+    protected void initGLAdapter(GLVersion version) {
+        if (version.getMajorVersion() >= 3)
+            GLAdapter.init(new IosGL30());
+        else
+            GLAdapter.init(new IosGL());
+    }
+
     @Override
     public void createLayers() {
         Map map = getMap();

vtm-ios-example/src/org/oscim/ios/test/IOSPathLayerTest.java

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016-2017 Longri
+ * Copyright 2019 Gustl22
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -17,6 +18,8 @@
  */
 package org.oscim.ios.test;
 
+import com.badlogic.gdx.graphics.glutils.GLVersion;
+
 import org.oscim.backend.GLAdapter;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeoPoint;
@@ -25,6 +28,7 @@ import org.oscim.event.Event;
 import org.oscim.gdx.GdxAssets;
 import org.oscim.gdx.GdxMap;
 import org.oscim.ios.backend.IosGL;
+import org.oscim.ios.backend.IosGL30;
 import org.oscim.ios.backend.IosGraphics;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -46,7 +50,6 @@ public class IOSPathLayerTest extends GdxMap {
         // init globals
         IosGraphics.init();
         GdxAssets.init("assets/");
-        GLAdapter.init(new IosGL());
     }
 
     private static final boolean ANIMATION = false;
@@ -54,6 +57,14 @@ public class IOSPathLayerTest extends GdxMap {
     private List<PathLayer> mPathLayers = new ArrayList<>();
     private TextureItem tex;
 
+    @Override
+    protected void initGLAdapter(GLVersion version) {
+        if (version.getMajorVersion() >= 3)
+            GLAdapter.init(new IosGL30());
+        else
+            GLAdapter.init(new IosGL());
+    }
+
     @Override
     public void createLayers() {
         VectorTileLayer l = mMap.setBaseMap(new OSciMap4TileSource());