android: move GL classes to gl package

vtm-android/src/org/oscim/android/gl/GLView.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2012 Hannes Janetzek
+ *
+ * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * 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.android.gl;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+import org.oscim.map.Map;
+
+import android.content.Context;
+import android.opengl.GLSurfaceView;
+
+public class GLView extends GLSurfaceView {
+
+	class GLRenderer extends org.oscim.renderer.MapRenderer implements GLSurfaceView.Renderer {
+
+		public GLRenderer(Map map) {
+			super(map);
+		}
+
+		@Override
+		public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+			super.onSurfaceCreated();
+		}
+
+		@Override
+		public void onSurfaceChanged(GL10 gl, int width, int height) {
+			super.onSurfaceChanged(width, height);
+
+		}
+
+		@Override
+		public void onDrawFrame(GL10 gl) {
+			super.onDrawFrame();
+		}
+	}
+
+	public GLView(Context context, Map map) {
+		super(context);
+		setEGLConfigChooser(new GlConfigChooser());
+		setEGLContextClientVersion(2);
+
+		setDebugFlags(DEBUG_CHECK_GL_ERROR | DEBUG_LOG_GL_CALLS);
+		setRenderer(new GLRenderer(map));
+
+		setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+	}
+}

vtm-android/src/org/oscim/android/gl/GlConfigChooser.java

@@ -0,0 +1,72 @@
+package org.oscim.android.gl;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+import android.opengl.GLSurfaceView;
+
+public class GlConfigChooser implements GLSurfaceView.EGLConfigChooser {
+
+	@Override
+	public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
+		int[] val = new int[1];
+
+		// Try to find a normal multisample configuration first.
+		int[] configSpec = {
+		        EGL10.EGL_RED_SIZE, 5,
+		        EGL10.EGL_GREEN_SIZE, 6,
+		        EGL10.EGL_BLUE_SIZE, 5,
+		        EGL10.EGL_ALPHA_SIZE, 8,
+		        EGL10.EGL_DEPTH_SIZE, 16,
+		        // Requires that setEGLContextClientVersion(2) is called on the view.
+		        EGL10.EGL_RENDERABLE_TYPE, 4 /* EGL_OPENGL_ES2_BIT */,
+		        EGL10.EGL_STENCIL_SIZE, 8,
+		        EGL10.EGL_NONE };
+
+		if (!egl.eglChooseConfig(display, configSpec, null, 0, val)) {
+			throw new IllegalArgumentException("eglChooseConfig failed");
+		}
+		int numConfigs = val[0];
+
+		if (numConfigs <= 0) {
+
+			configSpec = new int[] {
+			        // EGL10.EGL_RENDERABLE_TYPE, 4, EGL10.EGL_NONE };
+			        EGL10.EGL_RED_SIZE, 8,
+			        EGL10.EGL_GREEN_SIZE, 8,
+			        EGL10.EGL_BLUE_SIZE, 8,
+			        EGL10.EGL_ALPHA_SIZE, 8,
+			        EGL10.EGL_DEPTH_SIZE, 16,
+			        EGL10.EGL_RENDERABLE_TYPE, 4 /* EGL_OPENGL_ES2_BIT */,
+			        EGL10.EGL_STENCIL_SIZE, 8,
+			        EGL10.EGL_NONE };
+
+			if (!egl.eglChooseConfig(display, configSpec, null, 0, val)) {
+				throw new IllegalArgumentException("eglChooseConfig failed");
+			}
+			numConfigs = val[0];
+
+			if (numConfigs <= 0) {
+				throw new IllegalArgumentException("No configs match configSpec");
+			}
+		}
+
+		// Get all matching configurations.
+		EGLConfig[] configs = new EGLConfig[numConfigs];
+		if (!egl.eglChooseConfig(display, configSpec, configs, numConfigs, val)) {
+			throw new IllegalArgumentException("data eglChooseConfig failed");
+		}
+
+		// CAUTION! eglChooseConfigs returns configs with higher bit depth
+		// first: Even though we asked for rgb565 configurations, rgb888
+		// configurations are considered to be "better" and returned first.
+		// You need to explicitly filter the data returned by eglChooseConfig!
+
+		EGLConfig config = configs.length > 0 ? configs[0] : null;
+		if (config == null) {
+			throw new IllegalArgumentException("No config chosen");
+		}
+		return config;
+	}
+}