From bb93aa45c0dc41899049f1c409729585d9463245 Mon Sep 17 00:00:00 2001 From: Robert Konrad Date: Sun, 23 Feb 2025 21:12:34 +0100 Subject: [PATCH] Start re-organizing the Android backend --- .../kinc/backend/Android.h => includes/android.h} | 0 .../{sources/kinc/backend => includes}/video.h | 0 .../kinc/backend/VrInterface.h => includes/vr.h} | 0 .../kinc/backend => includes}/windowdata.h | 0 .../{kinc/KincActivity.kt => kore/KoreActivity.kt} | 12 ++++++------ .../KincMoviePlayer.kt => kore/KoreMoviePlayer.kt} | 14 +++++++------- .../KoreMovieTexture.kt} | 4 ++-- .../{Android => }/android_native_app_glue.c | 0 .../{Android => }/android_native_app_glue.h | 0 .../sources/{kinc/backend => }/androidunit.c | 0 .../sources/{kinc/backend/audio.c.h => audio.c} | 0 .../{kinc/backend/display.c.h => display.c} | 0 .../sources/{kinc/backend/system.c.h => system.c} | 0 .../sources/{kinc/backend/video.c.h => video.c} | 0 .../sources/{kinc/backend/VrInterface.cpp => vr.c} | 0 .../sources/{kinc/backend/window.c.h => window.c} | 0 16 files changed, 15 insertions(+), 15 deletions(-) rename backends/system/android/{sources/kinc/backend/Android.h => includes/android.h} (100%) rename backends/system/android/{sources/kinc/backend => includes}/video.h (100%) rename backends/system/android/{sources/kinc/backend/VrInterface.h => includes/vr.h} (100%) rename backends/system/android/{sources/kinc/backend => includes}/windowdata.h (100%) rename backends/system/android/java-sources/tech/{kinc/KincActivity.kt => kore/KoreActivity.kt} (94%) rename backends/system/android/java-sources/tech/{kinc/KincMoviePlayer.kt => kore/KoreMoviePlayer.kt} (68%) rename backends/system/android/java-sources/tech/{kinc/KincMovieTexture.kt => kore/KoreMovieTexture.kt} (94%) rename backends/system/android/sources/{Android => }/android_native_app_glue.c (100%) rename backends/system/android/sources/{Android => }/android_native_app_glue.h (100%) rename backends/system/android/sources/{kinc/backend => }/androidunit.c (100%) rename backends/system/android/sources/{kinc/backend/audio.c.h => audio.c} (100%) rename backends/system/android/sources/{kinc/backend/display.c.h => display.c} (100%) rename backends/system/android/sources/{kinc/backend/system.c.h => system.c} (100%) rename backends/system/android/sources/{kinc/backend/video.c.h => video.c} (100%) rename backends/system/android/sources/{kinc/backend/VrInterface.cpp => vr.c} (100%) rename backends/system/android/sources/{kinc/backend/window.c.h => window.c} (100%) diff --git a/backends/system/android/sources/kinc/backend/Android.h b/backends/system/android/includes/android.h similarity index 100% rename from backends/system/android/sources/kinc/backend/Android.h rename to backends/system/android/includes/android.h diff --git a/backends/system/android/sources/kinc/backend/video.h b/backends/system/android/includes/video.h similarity index 100% rename from backends/system/android/sources/kinc/backend/video.h rename to backends/system/android/includes/video.h diff --git a/backends/system/android/sources/kinc/backend/VrInterface.h b/backends/system/android/includes/vr.h similarity index 100% rename from backends/system/android/sources/kinc/backend/VrInterface.h rename to backends/system/android/includes/vr.h diff --git a/backends/system/android/sources/kinc/backend/windowdata.h b/backends/system/android/includes/windowdata.h similarity index 100% rename from backends/system/android/sources/kinc/backend/windowdata.h rename to backends/system/android/includes/windowdata.h diff --git a/backends/system/android/java-sources/tech/kinc/KincActivity.kt b/backends/system/android/java-sources/tech/kore/KoreActivity.kt similarity index 94% rename from backends/system/android/java-sources/tech/kinc/KincActivity.kt rename to backends/system/android/java-sources/tech/kore/KoreActivity.kt index 1660b5930..9786b5358 100644 --- a/backends/system/android/java-sources/tech/kinc/KincActivity.kt +++ b/backends/system/android/java-sources/tech/kore/KoreActivity.kt @@ -1,4 +1,4 @@ -package tech.kinc +package tech.kore import android.app.NativeActivity import android.content.Context @@ -18,9 +18,9 @@ import android.view.WindowManager import android.view.inputmethod.InputMethodManager import kotlin.system.exitProcess -class KincActivity: NativeActivity(), KeyEvent.Callback { +class KoreActivity: NativeActivity(), KeyEvent.Callback { companion object { - var instance: KincActivity? = null + var instance: KoreActivity? = null @JvmStatic fun showKeyboard() { @@ -107,7 +107,7 @@ class KincActivity: NativeActivity(), KeyEvent.Callback { } } - class MyHandler(private val kincActivity: KincActivity) : Handler() { + class MyHandler(private val kincActivity: KoreActivity) : Handler() { override fun handleMessage(msg: Message) { kincActivity.hideSystemUI() } @@ -157,9 +157,9 @@ class KincActivity: NativeActivity(), KeyEvent.Callback { } override fun onKeyMultiple(keyCode: Int, count: Int, event: KeyEvent): Boolean { - this.nativeKincKeyPress(event.characters) + this.nativeKoreKeyPress(event.characters) return false } - private external fun nativeKincKeyPress(chars: String) + private external fun nativeKoreKeyPress(chars: String) } diff --git a/backends/system/android/java-sources/tech/kinc/KincMoviePlayer.kt b/backends/system/android/java-sources/tech/kore/KoreMoviePlayer.kt similarity index 68% rename from backends/system/android/java-sources/tech/kinc/KincMoviePlayer.kt rename to backends/system/android/java-sources/tech/kore/KoreMoviePlayer.kt index 724f52b51..c73d4c727 100644 --- a/backends/system/android/java-sources/tech/kinc/KincMoviePlayer.kt +++ b/backends/system/android/java-sources/tech/kore/KoreMoviePlayer.kt @@ -1,16 +1,16 @@ -package tech.kinc +package tech.kore import java.util.ArrayList import android.view.Surface -class KincMoviePlayer(var path: String) { +class KoreMoviePlayer(var path: String) { companion object { - var players = ArrayList() + var players = ArrayList() @JvmStatic fun updateAll() { - for (player in KincMoviePlayer.players) { + for (player in KoreMoviePlayer.players) { player!!.update() } } @@ -20,7 +20,7 @@ class KincMoviePlayer(var path: String) { } } - private var movieTexture: KincMovieTexture? = null + private var movieTexture: KoreMovieTexture? = null var id: Int = players.size init { @@ -28,13 +28,13 @@ class KincMoviePlayer(var path: String) { } fun init() { - movieTexture = KincMovieTexture() + movieTexture = KoreMovieTexture() val surface = Surface(movieTexture!!.surfaceTexture) nativeCreate(path, surface, id) surface.release() } - fun getMovieTexture(): KincMovieTexture? { + fun getMovieTexture(): KoreMovieTexture? { return movieTexture } diff --git a/backends/system/android/java-sources/tech/kinc/KincMovieTexture.kt b/backends/system/android/java-sources/tech/kore/KoreMovieTexture.kt similarity index 94% rename from backends/system/android/java-sources/tech/kinc/KincMovieTexture.kt rename to backends/system/android/java-sources/tech/kore/KoreMovieTexture.kt index ed058b8f8..b881d035a 100644 --- a/backends/system/android/java-sources/tech/kinc/KincMovieTexture.kt +++ b/backends/system/android/java-sources/tech/kore/KoreMovieTexture.kt @@ -1,10 +1,10 @@ -package tech.kinc +package tech.kore import android.graphics.SurfaceTexture import android.graphics.SurfaceTexture.OnFrameAvailableListener import android.opengl.GLES20 -class KincMovieTexture: OnFrameAvailableListener { +class KoreMovieTexture: OnFrameAvailableListener { private val GL_TEXTURE_EXTERNAL_OES: Int = 0x8D65 var textureId: Int = 0 diff --git a/backends/system/android/sources/Android/android_native_app_glue.c b/backends/system/android/sources/android_native_app_glue.c similarity index 100% rename from backends/system/android/sources/Android/android_native_app_glue.c rename to backends/system/android/sources/android_native_app_glue.c diff --git a/backends/system/android/sources/Android/android_native_app_glue.h b/backends/system/android/sources/android_native_app_glue.h similarity index 100% rename from backends/system/android/sources/Android/android_native_app_glue.h rename to backends/system/android/sources/android_native_app_glue.h diff --git a/backends/system/android/sources/kinc/backend/androidunit.c b/backends/system/android/sources/androidunit.c similarity index 100% rename from backends/system/android/sources/kinc/backend/androidunit.c rename to backends/system/android/sources/androidunit.c diff --git a/backends/system/android/sources/kinc/backend/audio.c.h b/backends/system/android/sources/audio.c similarity index 100% rename from backends/system/android/sources/kinc/backend/audio.c.h rename to backends/system/android/sources/audio.c diff --git a/backends/system/android/sources/kinc/backend/display.c.h b/backends/system/android/sources/display.c similarity index 100% rename from backends/system/android/sources/kinc/backend/display.c.h rename to backends/system/android/sources/display.c diff --git a/backends/system/android/sources/kinc/backend/system.c.h b/backends/system/android/sources/system.c similarity index 100% rename from backends/system/android/sources/kinc/backend/system.c.h rename to backends/system/android/sources/system.c diff --git a/backends/system/android/sources/kinc/backend/video.c.h b/backends/system/android/sources/video.c similarity index 100% rename from backends/system/android/sources/kinc/backend/video.c.h rename to backends/system/android/sources/video.c diff --git a/backends/system/android/sources/kinc/backend/VrInterface.cpp b/backends/system/android/sources/vr.c similarity index 100% rename from backends/system/android/sources/kinc/backend/VrInterface.cpp rename to backends/system/android/sources/vr.c diff --git a/backends/system/android/sources/kinc/backend/window.c.h b/backends/system/android/sources/window.c similarity index 100% rename from backends/system/android/sources/kinc/backend/window.c.h rename to backends/system/android/sources/window.c