From 8e45e74937cbfea93eb864647b27f5e0445a48d2 Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <igotti@gmail.com>
Date: Mon, 30 Sep 2019 00:35:51 +0300
Subject: [PATCH] Update Android sample, make it sim-friendly.

---
 samples/androidNativeActivity/README.md       |   4 +-
 .../androidNativeActivity/build.gradle.kts    |  18 +++---
 .../AndroidManifest.xml                       |   1 +
 .../assets/kotlin_logo.bmp                    | Bin
 .../kotlin/BMPHeader.kt                       |   0
 .../kotlin/Disposable.kt                      |   0
 .../{arm32Main => x86Main}/kotlin/Engine.kt   |   0
 .../kotlin/JniBridge.kt                       |   0
 .../kotlin/Polyhedra.kt                       |   0
 .../{arm32Main => x86Main}/kotlin/Renderer.kt |  57 ++++++------------
 .../{arm32Main => x86Main}/kotlin/Vectors.kt  |   0
 .../src/{arm32Main => x86Main}/kotlin/main.kt |   0
 .../res/mipmap-hdpi/konan_activity.png        | Bin
 .../res/mipmap-mdpi/konan_activity.png        | Bin
 .../res/mipmap-xhdpi/konan_activity.png       | Bin
 .../res/mipmap-xxhdpi/konan_activity.png      | Bin
 .../res/values/strings.xml                    |   0
 17 files changed, 32 insertions(+), 48 deletions(-)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/AndroidManifest.xml (94%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/assets/kotlin_logo.bmp (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/kotlin/BMPHeader.kt (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/kotlin/Disposable.kt (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/kotlin/Engine.kt (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/kotlin/JniBridge.kt (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/kotlin/Polyhedra.kt (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/kotlin/Renderer.kt (87%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/kotlin/Vectors.kt (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/kotlin/main.kt (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/res/mipmap-hdpi/konan_activity.png (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/res/mipmap-mdpi/konan_activity.png (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/res/mipmap-xhdpi/konan_activity.png (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/res/mipmap-xxhdpi/konan_activity.png (100%)
 rename samples/androidNativeActivity/src/{arm32Main => x86Main}/res/values/strings.xml (100%)

diff --git a/samples/androidNativeActivity/README.md b/samples/androidNativeActivity/README.md
index b6ab01e619c..8ac2551781c 100644
--- a/samples/androidNativeActivity/README.md
+++ b/samples/androidNativeActivity/README.md
@@ -12,7 +12,9 @@ We use JniBridge to call vibration service on the Java side for short tremble on
 To build use `ANDROID_HOME=<your path to android sdk> ../gradlew assemble`.
 
 Run `$ANDROID_HOME/platform-tools/adb install -r build/outputs/apk/debug/androidNativeActivity-debug.apk`
-to deploy the apk on the Android device or emulator (note that only ARM-based devices are currently supported).
+to deploy the apk on the Android device or emulator.
+
+Note that "Emulated Performance - Graphics" in AVD manager must be set to "Software - GLES 2.0".
 
 Note: If you are importing project to IDEA for the first time, you might need to put `local.properties` file
 with the following content:
diff --git a/samples/androidNativeActivity/build.gradle.kts b/samples/androidNativeActivity/build.gradle.kts
index c32dd854660..7ff9469655e 100644
--- a/samples/androidNativeActivity/build.gradle.kts
+++ b/samples/androidNativeActivity/build.gradle.kts
@@ -17,6 +17,8 @@ plugins {
 
 val appDir = buildDir.resolve("Polyhedron")
 val libsDir = appDir.resolve("libs")
+// Set to true to build only for the simulator.
+val simulatorOnly = true
 
 val androidPresets = mapOf(
     "arm32" to ("androidNativeArm32" to "$libsDir/armeabi-v7a"),
@@ -40,7 +42,7 @@ android {
 
     sourceSets {
         val main by getting {
-            setRoot("src/arm32Main")
+            setRoot("src/x86Main")
             jniLibs.srcDir(libsDir)
         }
     }
@@ -63,13 +65,15 @@ kotlin {
     }
 
     sourceSets {
-        val arm32Main by getting
-        val arm64Main by getting
         val x86Main by getting
-        val x64Main by getting
-        arm64Main.dependsOn(arm32Main)
-        x86Main.dependsOn(arm32Main)
-        x64Main.dependsOn(arm32Main)
+        if (!simulatorOnly) {
+          val x64Main by getting
+          val arm32Main by getting
+          val arm64Main by getting
+          arm32Main.dependsOn(x86Main)
+          arm64Main.dependsOn(x86Main)
+          x64Main.dependsOn(x86Main)
+       }
     }
 }
 
diff --git a/samples/androidNativeActivity/src/arm32Main/AndroidManifest.xml b/samples/androidNativeActivity/src/x86Main/AndroidManifest.xml
similarity index 94%
rename from samples/androidNativeActivity/src/arm32Main/AndroidManifest.xml
rename to samples/androidNativeActivity/src/x86Main/AndroidManifest.xml
index d369e33a24f..2b7d60ee29b 100644
--- a/samples/androidNativeActivity/src/arm32Main/AndroidManifest.xml
+++ b/samples/androidNativeActivity/src/x86Main/AndroidManifest.xml
@@ -6,6 +6,7 @@
           android:versionName="1.0">
 
   <uses-permission android:name="android.permission.VIBRATE" />
+  <uses-feature android:glEsVersion="0x00020000" android:required="true" />
 
   <!-- This .apk has no Java code itself, so set hasCode to false. -->
   <application
diff --git a/samples/androidNativeActivity/src/arm32Main/assets/kotlin_logo.bmp b/samples/androidNativeActivity/src/x86Main/assets/kotlin_logo.bmp
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/assets/kotlin_logo.bmp
rename to samples/androidNativeActivity/src/x86Main/assets/kotlin_logo.bmp
diff --git a/samples/androidNativeActivity/src/arm32Main/kotlin/BMPHeader.kt b/samples/androidNativeActivity/src/x86Main/kotlin/BMPHeader.kt
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/kotlin/BMPHeader.kt
rename to samples/androidNativeActivity/src/x86Main/kotlin/BMPHeader.kt
diff --git a/samples/androidNativeActivity/src/arm32Main/kotlin/Disposable.kt b/samples/androidNativeActivity/src/x86Main/kotlin/Disposable.kt
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/kotlin/Disposable.kt
rename to samples/androidNativeActivity/src/x86Main/kotlin/Disposable.kt
diff --git a/samples/androidNativeActivity/src/arm32Main/kotlin/Engine.kt b/samples/androidNativeActivity/src/x86Main/kotlin/Engine.kt
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/kotlin/Engine.kt
rename to samples/androidNativeActivity/src/x86Main/kotlin/Engine.kt
diff --git a/samples/androidNativeActivity/src/arm32Main/kotlin/JniBridge.kt b/samples/androidNativeActivity/src/x86Main/kotlin/JniBridge.kt
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/kotlin/JniBridge.kt
rename to samples/androidNativeActivity/src/x86Main/kotlin/JniBridge.kt
diff --git a/samples/androidNativeActivity/src/arm32Main/kotlin/Polyhedra.kt b/samples/androidNativeActivity/src/x86Main/kotlin/Polyhedra.kt
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/kotlin/Polyhedra.kt
rename to samples/androidNativeActivity/src/x86Main/kotlin/Polyhedra.kt
diff --git a/samples/androidNativeActivity/src/arm32Main/kotlin/Renderer.kt b/samples/androidNativeActivity/src/x86Main/kotlin/Renderer.kt
similarity index 87%
rename from samples/androidNativeActivity/src/arm32Main/kotlin/Renderer.kt
rename to samples/androidNativeActivity/src/x86Main/kotlin/Renderer.kt
index 70b0ee73c72..cbc485783bf 100644
--- a/samples/androidNativeActivity/src/arm32Main/kotlin/Renderer.kt
+++ b/samples/androidNativeActivity/src/x86Main/kotlin/Renderer.kt
@@ -9,42 +9,7 @@ import kotlinx.cinterop.*
 import platform.android.*
 import platform.egl.*
 import platform.posix.*
-import platform.gles3.*
-import platform.gles.GL_PERSPECTIVE_CORRECTION_HINT
-import platform.gles.GL_SMOOTH
-import platform.gles.GL_PROJECTION
-import platform.gles.glLoadIdentity
-import platform.gles.glFrustumf
-import platform.gles.glMatrixMode
-import platform.gles.GL_MODELVIEW
-import platform.gles.glTranslatef
-import platform.gles.glShadeModel
-import platform.gles.GL_LIGHT0
-import platform.gles.GL_POSITION
-import platform.gles.glMaterialfv
-import platform.gles.GL_DIFFUSE
-import platform.gles.GL_SHININESS
-import platform.gles.glPushMatrix
-import platform.gles.glRotatef
-import platform.gles.glMultMatrixf
-import platform.gles.GL_MODELVIEW_MATRIX
-import platform.gles.glPopMatrix
-import platform.gles.glTexEnvf
-import platform.gles.GL_TEXTURE_ENV
-import platform.gles.GL_TEXTURE_ENV_MODE
-import platform.gles.glLightfv
-import platform.gles.GL_LIGHTING
-import platform.gles.GL_SPECULAR
-import platform.gles.glMaterialf
-import platform.gles.glTexEnvfv
-import platform.gles.glEnableClientState
-import platform.gles.GL_VERTEX_ARRAY
-import platform.gles.GL_NORMAL_ARRAY
-import platform.gles.GL_TEXTURE_COORD_ARRAY
-import platform.gles.glVertexPointer
-import platform.gles.glTexCoordPointer
-import platform.gles.glNormalPointer
-import platform.gles.GL_TEXTURE_ENV_COLOR
+import platform.gles.*
 import sample.androidnative.bmpformat.BMPHeader
 
 class Renderer(val container: DisposableContainer,
@@ -147,18 +112,20 @@ class Renderer(val container: DisposableContainer,
 
             val ratio = width.value.toFloat() / height.value
             glMatrixMode(GL_PROJECTION)
+            checkErrors()
             glLoadIdentity()
             glFrustumf(-ratio, ratio, -1.0f, 1.0f, 1.0f, 10.0f)
 
             glMatrixMode(GL_MODELVIEW)
+            checkErrors()
             glTranslatef(0.0f, 0.0f, -2.0f)
             glLightfv(GL_LIGHT0, GL_POSITION, cValuesOf(1.25f, 1.25f, -2.0f, 0.0f))
             glEnable(GL_LIGHTING)
             glEnable(GL_LIGHT0)
             glEnable(GL_TEXTURE_2D)
-            glMaterialfv(GL_FRONT, GL_DIFFUSE, cValuesOf(0.0f, 1.0f, 1.0f, 1.0f))
-            glMaterialfv(GL_FRONT, GL_SPECULAR, cValuesOf(0.3f, 0.3f, 0.3f, 1.0f))
-            glMaterialf(GL_FRONT, GL_SHININESS, 30.0f)
+            glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, cValuesOf(0.0f, 1.0f, 1.0f, 1.0f))
+            glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, cValuesOf(0.3f, 0.3f, 0.3f, 1.0f))
+            glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 30.0f)
 
             loadTexture("kotlin_logo.bmp")
 
@@ -167,6 +134,12 @@ class Renderer(val container: DisposableContainer,
         }
     }
 
+    fun checkErrors() {
+        val error = glGetError()
+        if (error.toInt() != GL_NO_ERROR)
+            throw Error("OpenGL error 0x${error.toInt().toString(16)}")
+    }
+
     fun getState() = matrix to 16 * 4
 
     fun rotateBy(vector: Vector2) {
@@ -180,6 +153,7 @@ class Renderer(val container: DisposableContainer,
 
         glPushMatrix()
         glMatrixMode(GL_MODELVIEW)
+        checkErrors()
         glLoadIdentity()
         glRotatef(angle, x, y, 0.0f)
         glMultMatrixf(matrix)
@@ -191,6 +165,7 @@ class Renderer(val container: DisposableContainer,
     private fun loadTexture(assetName: String): Unit = memScoped {
         val asset = AAssetManager_open(nativeActivity.assetManager, assetName, AASSET_MODE_BUFFER.convert())
                 ?: throw Error("Error opening asset $assetName")
+        println("loading texture $assetName")
         try {
             val length = AAsset_getLength(asset)
             val buffer = allocArray<ByteVar>(length)
@@ -209,6 +184,7 @@ class Renderer(val container: DisposableContainer,
                     data[i] = data[i + 2]
                     data[i + 2] = t
                 }
+                println("loaded texture ${width}x${height}")
                 glBindTexture(GL_TEXTURE_2D, 1)
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)
@@ -234,6 +210,7 @@ class Renderer(val container: DisposableContainer,
 
         glPushMatrix()
         glMatrixMode(GL_MODELVIEW)
+        checkErrors()
 
         glMultMatrixf(matrix)
 
@@ -294,7 +271,7 @@ class Renderer(val container: DisposableContainer,
     }
 
     fun start() {
-        logInfo("Starting renderer..")
+        logInfo("Starting renderer.")
         if (initialized) {
             if (eglMakeCurrent(display, surface, surface, context) == 0u) {
                 throw Error("eglMakeCurrent() returned error ${eglGetError()}")
diff --git a/samples/androidNativeActivity/src/arm32Main/kotlin/Vectors.kt b/samples/androidNativeActivity/src/x86Main/kotlin/Vectors.kt
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/kotlin/Vectors.kt
rename to samples/androidNativeActivity/src/x86Main/kotlin/Vectors.kt
diff --git a/samples/androidNativeActivity/src/arm32Main/kotlin/main.kt b/samples/androidNativeActivity/src/x86Main/kotlin/main.kt
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/kotlin/main.kt
rename to samples/androidNativeActivity/src/x86Main/kotlin/main.kt
diff --git a/samples/androidNativeActivity/src/arm32Main/res/mipmap-hdpi/konan_activity.png b/samples/androidNativeActivity/src/x86Main/res/mipmap-hdpi/konan_activity.png
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/res/mipmap-hdpi/konan_activity.png
rename to samples/androidNativeActivity/src/x86Main/res/mipmap-hdpi/konan_activity.png
diff --git a/samples/androidNativeActivity/src/arm32Main/res/mipmap-mdpi/konan_activity.png b/samples/androidNativeActivity/src/x86Main/res/mipmap-mdpi/konan_activity.png
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/res/mipmap-mdpi/konan_activity.png
rename to samples/androidNativeActivity/src/x86Main/res/mipmap-mdpi/konan_activity.png
diff --git a/samples/androidNativeActivity/src/arm32Main/res/mipmap-xhdpi/konan_activity.png b/samples/androidNativeActivity/src/x86Main/res/mipmap-xhdpi/konan_activity.png
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/res/mipmap-xhdpi/konan_activity.png
rename to samples/androidNativeActivity/src/x86Main/res/mipmap-xhdpi/konan_activity.png
diff --git a/samples/androidNativeActivity/src/arm32Main/res/mipmap-xxhdpi/konan_activity.png b/samples/androidNativeActivity/src/x86Main/res/mipmap-xxhdpi/konan_activity.png
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/res/mipmap-xxhdpi/konan_activity.png
rename to samples/androidNativeActivity/src/x86Main/res/mipmap-xxhdpi/konan_activity.png
diff --git a/samples/androidNativeActivity/src/arm32Main/res/values/strings.xml b/samples/androidNativeActivity/src/x86Main/res/values/strings.xml
similarity index 100%
rename from samples/androidNativeActivity/src/arm32Main/res/values/strings.xml
rename to samples/androidNativeActivity/src/x86Main/res/values/strings.xml