Skip to content

armgit / andee

Public Imported from GitHub
0

Andee lives on your phone or Mac and uses any app like you do—no integrations, no root, any model; memory and passwords never leave your device | Andee 住进你的手机或 Mac,像你一样操作任何 App——无需集成、无需 Root、支持任意模型,记忆和密码绝不离开设备。

refactor(ball): the emotion ball's renderer moves to :core

booboosuiaaab776549ab
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ExpressionsUi.kt b/app/src/main/java/net/kuafuai/andee/ui/ExpressionsUi.kt
index 85b9058..cfa4ec5 100644
--- a/app/src/main/java/net/kuafuai/andee/ui/ExpressionsUi.kt
+++ b/app/src/main/java/net/kuafuai/andee/ui/ExpressionsUi.kt
@@ -1,5 +1,6 @@
package net.kuafuai.andee.ui
+import net.kuafuai.andee.ui.ball.label
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.Color
@@ -135,7 +136,7 @@ class ExpressionsUi(
card.addView(heading(lctx.getString(R.string.expr_section_look)))
card.addView(chipRow {
for (look in BallLooks.ALL) {
- val chip = chip(lctx.getString(look.labelRes)) { pickLook(look.name) }
+ val chip = chip(look.label(lctx)) { pickLook(look.name) }
lookChips.add(chip)
addView(chip, chipParams())
}
@@ -230,7 +231,7 @@ class ExpressionsUi(
for ((m, chip) in moodChips) light(chip, m == pickedMood)
caption?.text = lctx.getString(
R.string.expr_caption,
- lctx.getString(look.labelRes),
+ look.label(lctx),
lctx.getString(labelOf(pickedMood)),
)
}
diff --git a/app/src/main/java/net/kuafuai/andee/ui/FloatingWindowUi.kt b/app/src/main/java/net/kuafuai/andee/ui/FloatingWindowUi.kt
index c1759f5..d8e7deb 100644
--- a/app/src/main/java/net/kuafuai/andee/ui/FloatingWindowUi.kt
+++ b/app/src/main/java/net/kuafuai/andee/ui/FloatingWindowUi.kt
@@ -1,5 +1,6 @@
package net.kuafuai.andee.ui
+import net.kuafuai.andee.ui.ball.label
import android.animation.ValueAnimator
import android.annotation.SuppressLint
import android.content.Context
@@ -1061,7 +1062,7 @@ class FloatingWindowUi(
val next = BallLooks.step(delta)
VoiceConfig.save(context, mapOf("ball" to next.name))
ball?.trigger(Action.POP)
- setSubtitle(AppLocale.str(context, next.labelRes), SubtitleKind.FINAL)
+ setSubtitle(next.label(context), SubtitleKind.FINAL)
}
/**
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/AndroidGl.kt b/app/src/main/java/net/kuafuai/andee/ui/ball/AndroidGl.kt
new file mode 100644
index 0000000..7ab7086
--- /dev/null
+++ b/app/src/main/java/net/kuafuai/andee/ui/ball/AndroidGl.kt
@@ -0,0 +1,45 @@
+package net.kuafuai.andee.ui.ball
+
+import android.opengl.GLES20 as A
+import net.kuafuai.andee.ui.ball.gl.GlBackend
+import java.nio.Buffer
+
+/** The shared ball renderer's GL calls, on Android's own GLES 2.0. */
+object AndroidGl : GlBackend {
+ override fun glAttachShader(program: Int, shader: Int) = A.glAttachShader(program, shader)
+ override fun glBindBuffer(target: Int, buffer: Int) = A.glBindBuffer(target, buffer)
+ override fun glBlendFunc(s: Int, d: Int) = A.glBlendFunc(s, d)
+ override fun glBufferData(target: Int, size: Int, data: Buffer?, usage: Int) = A.glBufferData(target, size, data, usage)
+ override fun glBufferSubData(target: Int, offset: Int, size: Int, data: Buffer) = A.glBufferSubData(target, offset, size, data)
+ override fun glClear(mask: Int) = A.glClear(mask)
+ override fun glClearColor(r: Float, g: Float, b: Float, a: Float) = A.glClearColor(r, g, b, a)
+ override fun glCompileShader(shader: Int) = A.glCompileShader(shader)
+ override fun glCreateProgram(): Int = A.glCreateProgram()
+ override fun glCreateShader(type: Int): Int = A.glCreateShader(type)
+ override fun glDeleteProgram(program: Int) = A.glDeleteProgram(program)
+ override fun glDeleteShader(shader: Int) = A.glDeleteShader(shader)
+ override fun glDepthMask(flag: Boolean) = A.glDepthMask(flag)
+ override fun glDisable(cap: Int) = A.glDisable(cap)
+ override fun glDrawArrays(mode: Int, first: Int, count: Int) = A.glDrawArrays(mode, first, count)
+ override fun glDrawElements(mode: Int, count: Int, type: Int, offset: Int) = A.glDrawElements(mode, count, type, offset)
+ override fun glEnable(cap: Int) = A.glEnable(cap)
+ override fun glEnableVertexAttribArray(index: Int) = A.glEnableVertexAttribArray(index)
+ override fun glGenBuffers(n: Int, out: IntArray, offset: Int) = A.glGenBuffers(n, out, offset)
+ override fun glGetAttribLocation(program: Int, name: String): Int = A.glGetAttribLocation(program, name)
+ override fun glGetProgramInfoLog(program: Int): String = A.glGetProgramInfoLog(program)
+ override fun glGetProgramiv(program: Int, pname: Int, out: IntArray, offset: Int) = A.glGetProgramiv(program, pname, out, offset)
+ override fun glGetShaderInfoLog(shader: Int): String = A.glGetShaderInfoLog(shader)
+ override fun glGetShaderiv(shader: Int, pname: Int, out: IntArray, offset: Int) = A.glGetShaderiv(shader, pname, out, offset)
+ override fun glGetUniformLocation(program: Int, name: String): Int = A.glGetUniformLocation(program, name)
+ override fun glLinkProgram(program: Int) = A.glLinkProgram(program)
+ override fun glScissor(x: Int, y: Int, w: Int, h: Int) = A.glScissor(x, y, w, h)
+ override fun glShaderSource(shader: Int, src: String) = A.glShaderSource(shader, src)
+ override fun glUniform1f(loc: Int, v: Float) = A.glUniform1f(loc, v)
+ override fun glUniform3fv(loc: Int, count: Int, v: FloatArray, offset: Int) = A.glUniform3fv(loc, count, v, offset)
+ override fun glUniformMatrix4fv(loc: Int, count: Int, transpose: Boolean, v: FloatArray, offset: Int) =
+ A.glUniformMatrix4fv(loc, count, transpose, v, offset)
+ override fun glUseProgram(program: Int) = A.glUseProgram(program)
+ override fun glVertexAttribPointer(index: Int, size: Int, type: Int, normalized: Boolean, stride: Int, offset: Int) =
+ A.glVertexAttribPointer(index, size, type, normalized, stride, offset)
+ override fun glViewport(x: Int, y: Int, w: Int, h: Int) = A.glViewport(x, y, w, h)
+}
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/BallLookLabel.kt b/app/src/main/java/net/kuafuai/andee/ui/ball/BallLookLabel.kt
new file mode 100644
index 0000000..71be6f3
--- /dev/null
+++ b/app/src/main/java/net/kuafuai/andee/ui/ball/BallLookLabel.kt
@@ -0,0 +1,12 @@
+package net.kuafuai.andee.ui.ball
+
+/** The look's name in the interface language. Lives here because the look's own data is shared with the desktop. */
+fun net.kuafuai.andee.ui.ball.BallLook.label(ctx: android.content.Context): String = when (name) {
+ "andee" -> net.kuafuai.andee.i18n.AppLocale.str(ctx, net.kuafuai.andee.R.string.ball_look_andee)
+ "cream" -> net.kuafuai.andee.i18n.AppLocale.str(ctx, net.kuafuai.andee.R.string.ball_look_cream)
+ "bajie" -> net.kuafuai.andee.i18n.AppLocale.str(ctx, net.kuafuai.andee.R.string.ball_look_bajie)
+ "rabbit" -> net.kuafuai.andee.i18n.AppLocale.str(ctx, net.kuafuai.andee.R.string.ball_look_rabbit)
+ "bear" -> net.kuafuai.andee.i18n.AppLocale.str(ctx, net.kuafuai.andee.R.string.ball_look_bear)
+ "imp" -> net.kuafuai.andee.i18n.AppLocale.str(ctx, net.kuafuai.andee.R.string.ball_look_imp)
+ else -> name
+}
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/EmotionBallTextureView.kt b/app/src/main/java/net/kuafuai/andee/ui/ball/EmotionBallTextureView.kt
index b1ca940..7e38339 100644
--- a/app/src/main/java/net/kuafuai/andee/ui/ball/EmotionBallTextureView.kt
+++ b/app/src/main/java/net/kuafuai/andee/ui/ball/EmotionBallTextureView.kt
@@ -114,8 +114,9 @@ class EmotionBallTextureView @JvmOverloads constructor(
glHandler = h
h.post {
initEGL(surface)
- renderer.onSurfaceCreated(null, null)
- renderer.onSurfaceChanged(null, width, height)
+ net.kuafuai.andee.ui.ball.gl.GLES20.backend = AndroidGl
+ renderer.onSurfaceCreated()
+ renderer.onSurfaceChanged(width, height)
running = true
scheduleFrame(h)
}
@@ -123,7 +124,7 @@ class EmotionBallTextureView @JvmOverloads constructor(
override fun onSurfaceTextureSizeChanged(surface: SurfaceTexture, width: Int, height: Int) {
glHandler?.post {
- renderer.onSurfaceChanged(null, width, height)
+ renderer.onSurfaceChanged(width, height)
}
}
@@ -148,7 +149,7 @@ class EmotionBallTextureView @JvmOverloads constructor(
if (!running) return@post
val d = eglDisplay ?: return@post
val s = eglSurface ?: return@post
- renderer.onDrawFrame(null)
+ renderer.onDrawFrame()
EGL14.eglSwapBuffers(d, s)
h.postDelayed({ scheduleFrame(h) }, 16) // ~60 fps
}
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/BallLook.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/BallLook.kt
similarity index 99%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/BallLook.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/BallLook.kt
index f14ecd3..f049a9d 100644
--- a/app/src/main/java/net/kuafuai/andee/ui/ball/BallLook.kt
+++ b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/BallLook.kt
@@ -1,6 +1,5 @@
package net.kuafuai.andee.ui.ball
-import net.kuafuai.andee.R
/**
* Everything that makes one ball a different *character* from another.
@@ -204,12 +203,6 @@ class BallLook(
// built for it, so [BallLooks.ALL] is what the renderer iterates at surface
// creation rather than one look.
- /**
- * Name shown to the user when they swipe to this look. A resource, not a
- * string: the settings card taught us that a surface which can be read in
- * two languages must not carry finished sentences.
- */
- val labelRes: Int,
/**
* Horizontal squash on the pupil, 1 = round.
@@ -995,7 +988,6 @@ val BAJIE = BallLook(
rimDark = true,
rimGain = 1.00f,
rimPow = 5.6f,
- labelRes = R.string.ball_look_bajie,
// The muzzle, lower and bigger than the first build's: a pig's face is a
// nose with a head attached. Nostrils big enough to read at thumbnail
@@ -1164,7 +1156,6 @@ val ANDEE = BallLook(
rimDark = false,
rimGain = 0.80f,
rimPow = 4.4f,
- labelRes = R.string.ball_look_andee,
// See the class note: fitted to the picture's horn, then raised twice on request
// — the second time (0.477 → 0.53, tilt 50 → 38, bend −80 → −62, a longer horn)
@@ -1247,7 +1238,6 @@ val CREAM = BallLook(
rimDark = true,
rimGain = 1.00f,
rimPow = 5.6f,
- labelRes = R.string.ball_look_cream,
// ---- Ears ----
//
@@ -1508,7 +1498,6 @@ val IMP = BallLook(
rimDark = false,
rimGain = 0.85f,
rimPow = 3.6f,
- labelRes = R.string.ball_look_imp,
// A vertical slit. The single cheapest change of species on the whole face.
pupilAspect = 0.42f,
@@ -1875,7 +1864,6 @@ val RABBIT = BallLook(
rimDark = true,
rimGain = 1.00f,
rimPow = 5.6f,
- labelRes = R.string.ball_look_rabbit,
// Barely lowered — enough to flatten the top of the eye, and no more. The
// ceiling here is 1 − 0.8 × 0.092 / (0.168 + 0.026) = 0.621 (see [eyeCut]),
@@ -2186,7 +2174,6 @@ val BEAR = BallLook(
rimDark = false,
rimGain = 0.92f,
rimPow = 5.0f,
- labelRes = R.string.ball_look_bear,
// ---- Muzzle ----
//
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/EmotionBallRenderer.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/EmotionBallRenderer.kt
similarity index 99%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/EmotionBallRenderer.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/EmotionBallRenderer.kt
index c4d6fd1..955d7c1 100644
--- a/app/src/main/java/net/kuafuai/andee/ui/ball/EmotionBallRenderer.kt
+++ b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/EmotionBallRenderer.kt
@@ -1,8 +1,7 @@
package net.kuafuai.andee.ui.ball
-import android.opengl.GLES20
-import android.opengl.GLSurfaceView
-import android.opengl.Matrix
+import net.kuafuai.andee.ui.ball.gl.GLES20
+import net.kuafuai.andee.ui.ball.gl.Matrix
import net.kuafuai.andee.ui.ball.gl.Capsule
import net.kuafuai.andee.ui.ball.gl.Ear
import net.kuafuai.andee.ui.ball.gl.Eye
@@ -14,8 +13,6 @@ import net.kuafuai.andee.ui.ball.gl.Puff
import net.kuafuai.andee.ui.ball.gl.Shader
import net.kuafuai.andee.ui.ball.gl.Torus
import net.kuafuai.andee.ui.ball.gl.UvSphere
-import javax.microedition.khronos.egl.EGLConfig
-import javax.microedition.khronos.opengles.GL10
import kotlin.math.PI
import kotlin.math.abs
import kotlin.math.acos
@@ -56,7 +53,7 @@ import kotlin.math.tan
* The core and ring passes below are built but not drawn; each is one line in
* [onDrawFrame] away from coming back.
*/
-class EmotionBallRenderer : GLSurfaceView.Renderer {
+class EmotionBallRenderer {
// Public knobs (safe to write from UI thread)
@Volatile
@@ -428,7 +425,7 @@ class EmotionBallRenderer : GLSurfaceView.Renderer {
private val start = System.nanoTime()
private var last = start
- override fun onSurfaceCreated(gl: GL10?, config: EGLConfig?) {
+ fun onSurfaceCreated() {
GLES20.glClearColor(0f, 0f, 0f, 0f)
GLES20.glEnable(GLES20.GL_DEPTH_TEST)
GLES20.glEnable(GLES20.GL_BLEND)
@@ -478,7 +475,7 @@ class EmotionBallRenderer : GLSurfaceView.Renderer {
Matrix.setLookAtM(view, 0, 0f, 0f, CAM_Z, 0f, 0f, 0f, 0f, 1f, 0f)
}
- override fun onSurfaceChanged(gl: GL10?, width: Int, height: Int) {
+ fun onSurfaceChanged(width: Int, height: Int) {
GLES20.glViewport(0, 0, width, height)
vw = width
vh = height
@@ -488,7 +485,7 @@ class EmotionBallRenderer : GLSurfaceView.Renderer {
pointFactor = height / (2f * tan(fovRad / 2f))
}
- override fun onDrawFrame(gl: GL10?) {
+ fun onDrawFrame() {
val nowNs = System.nanoTime()
val dt = min(0.1f, (nowNs - last) / 1e9f)
last = nowNs
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/EmotionState.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/EmotionState.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/EmotionState.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/EmotionState.kt
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Capsule.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Capsule.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/Capsule.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Capsule.kt
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Ear.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Ear.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/Ear.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Ear.kt
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Eye.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Eye.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/Eye.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Eye.kt
diff --git a/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/GlBackend.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/GlBackend.kt
new file mode 100644
index 0000000..8b97243
--- /dev/null
+++ b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/GlBackend.kt
@@ -0,0 +1,116 @@
+package net.kuafuai.andee.ui.ball.gl
+
+import java.nio.Buffer
+
+/**
+ * The OpenGL calls the ball uses, behind one interface so the renderer runs on
+ * Android's GLES 2.0 and on the Mac's desktop OpenGL alike. Signatures mirror
+ * `android.opengl.GLES20`; [GLES20] below is a drop-in with the same names, so
+ * the renderer's code reads exactly as it did.
+ */
+interface GlBackend {
+ fun glAttachShader(program: Int, shader: Int)
+ fun glBindBuffer(target: Int, buffer: Int)
+ fun glBlendFunc(s: Int, d: Int)
+ fun glBufferData(target: Int, size: Int, data: Buffer?, usage: Int)
+ fun glBufferSubData(target: Int, offset: Int, size: Int, data: Buffer)
+ fun glClear(mask: Int)
+ fun glClearColor(r: Float, g: Float, b: Float, a: Float)
+ fun glCompileShader(shader: Int)
+ fun glCreateProgram(): Int
+ fun glCreateShader(type: Int): Int
+ fun glDeleteProgram(program: Int)
+ fun glDeleteShader(shader: Int)
+ fun glDepthMask(flag: Boolean)
+ fun glDisable(cap: Int)
+ fun glDrawArrays(mode: Int, first: Int, count: Int)
+ fun glDrawElements(mode: Int, count: Int, type: Int, offset: Int)
+ fun glEnable(cap: Int)
+ fun glEnableVertexAttribArray(index: Int)
+ fun glGenBuffers(n: Int, out: IntArray, offset: Int)
+ fun glGetAttribLocation(program: Int, name: String): Int
+ fun glGetProgramInfoLog(program: Int): String
+ fun glGetProgramiv(program: Int, pname: Int, out: IntArray, offset: Int)
+ fun glGetShaderInfoLog(shader: Int): String
+ fun glGetShaderiv(shader: Int, pname: Int, out: IntArray, offset: Int)
+ fun glGetUniformLocation(program: Int, name: String): Int
+ fun glLinkProgram(program: Int)
+ fun glScissor(x: Int, y: Int, w: Int, h: Int)
+ fun glShaderSource(shader: Int, src: String)
+ fun glUniform1f(loc: Int, v: Float)
+ fun glUniform3fv(loc: Int, count: Int, v: FloatArray, offset: Int)
+ fun glUniformMatrix4fv(loc: Int, count: Int, transpose: Boolean, v: FloatArray, offset: Int)
+ fun glUseProgram(program: Int)
+ fun glVertexAttribPointer(index: Int, size: Int, type: Int, normalized: Boolean, stride: Int, offset: Int)
+ fun glViewport(x: Int, y: Int, w: Int, h: Int)
+
+ /**
+ * A shader written in GLSL ES 1.00, rewritten for this platform's GLSL if
+ * it needs to be (desktop GLSL 1.20 has no `precision` statements).
+ */
+ fun adaptShader(src: String, fragment: Boolean): String = src
+}
+
+/**
+ * Same names and constants as `android.opengl.GLES20`, forwarding to whichever
+ * [GlBackend] the platform installed before the first frame.
+ */
+object GLES20 {
+ @Volatile lateinit var backend: GlBackend
+
+ const val GL_ARRAY_BUFFER = 0x8892
+ const val GL_ELEMENT_ARRAY_BUFFER = 0x8893
+ const val GL_STATIC_DRAW = 0x88E4
+ const val GL_DYNAMIC_DRAW = 0x88E8
+ const val GL_BLEND = 0x0BE2
+ const val GL_DEPTH_TEST = 0x0B71
+ const val GL_SCISSOR_TEST = 0x0C11
+ const val GL_COLOR_BUFFER_BIT = 0x4000
+ const val GL_DEPTH_BUFFER_BIT = 0x0100
+ const val GL_COMPILE_STATUS = 0x8B81
+ const val GL_LINK_STATUS = 0x8B82
+ const val GL_VERTEX_SHADER = 0x8B31
+ const val GL_FRAGMENT_SHADER = 0x8B30
+ const val GL_FLOAT = 0x1406
+ const val GL_UNSIGNED_SHORT = 0x1403
+ const val GL_TRIANGLES = 0x0004
+ const val GL_POINTS = 0x0000
+ const val GL_ONE = 1
+ const val GL_SRC_ALPHA = 0x0302
+ const val GL_ONE_MINUS_SRC_ALPHA = 0x0303
+
+ fun glAttachShader(p: Int, s: Int) = backend.glAttachShader(p, s)
+ fun glBindBuffer(t: Int, b: Int) = backend.glBindBuffer(t, b)
+ fun glBlendFunc(s: Int, d: Int) = backend.glBlendFunc(s, d)
+ fun glBufferData(t: Int, size: Int, data: Buffer?, usage: Int) = backend.glBufferData(t, size, data, usage)
+ fun glBufferSubData(t: Int, off: Int, size: Int, data: Buffer) = backend.glBufferSubData(t, off, size, data)
+ fun glClear(m: Int) = backend.glClear(m)
+ fun glClearColor(r: Float, g: Float, b: Float, a: Float) = backend.glClearColor(r, g, b, a)
+ fun glCompileShader(s: Int) = backend.glCompileShader(s)
+ fun glCreateProgram(): Int = backend.glCreateProgram()
+ fun glCreateShader(t: Int): Int = backend.glCreateShader(t)
+ fun glDeleteProgram(p: Int) = backend.glDeleteProgram(p)
+ fun glDeleteShader(s: Int) = backend.glDeleteShader(s)
+ fun glDepthMask(f: Boolean) = backend.glDepthMask(f)
+ fun glDisable(c: Int) = backend.glDisable(c)
+ fun glDrawArrays(m: Int, f: Int, c: Int) = backend.glDrawArrays(m, f, c)
+ fun glDrawElements(m: Int, c: Int, t: Int, o: Int) = backend.glDrawElements(m, c, t, o)
+ fun glEnable(c: Int) = backend.glEnable(c)
+ fun glEnableVertexAttribArray(i: Int) = backend.glEnableVertexAttribArray(i)
+ fun glGenBuffers(n: Int, out: IntArray, off: Int) = backend.glGenBuffers(n, out, off)
+ fun glGetAttribLocation(p: Int, n: String): Int = backend.glGetAttribLocation(p, n)
+ fun glGetProgramInfoLog(p: Int): String = backend.glGetProgramInfoLog(p)
+ fun glGetProgramiv(p: Int, n: Int, out: IntArray, off: Int) = backend.glGetProgramiv(p, n, out, off)
+ fun glGetShaderInfoLog(s: Int): String = backend.glGetShaderInfoLog(s)
+ fun glGetShaderiv(s: Int, n: Int, out: IntArray, off: Int) = backend.glGetShaderiv(s, n, out, off)
+ fun glGetUniformLocation(p: Int, n: String): Int = backend.glGetUniformLocation(p, n)
+ fun glLinkProgram(p: Int) = backend.glLinkProgram(p)
+ fun glScissor(x: Int, y: Int, w: Int, h: Int) = backend.glScissor(x, y, w, h)
+ fun glShaderSource(s: Int, src: String) = backend.glShaderSource(s, src)
+ fun glUniform1f(l: Int, v: Float) = backend.glUniform1f(l, v)
+ fun glUniform3fv(l: Int, c: Int, v: FloatArray, off: Int) = backend.glUniform3fv(l, c, v, off)
+ fun glUniformMatrix4fv(l: Int, c: Int, t: Boolean, v: FloatArray, off: Int) = backend.glUniformMatrix4fv(l, c, t, v, off)
+ fun glUseProgram(p: Int) = backend.glUseProgram(p)
+ fun glVertexAttribPointer(i: Int, s: Int, t: Int, n: Boolean, st: Int, off: Int) = backend.glVertexAttribPointer(i, s, t, n, st, off)
+ fun glViewport(x: Int, y: Int, w: Int, h: Int) = backend.glViewport(x, y, w, h)
+}
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Horn.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Horn.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/Horn.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Horn.kt
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/IcoSphere.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/IcoSphere.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/IcoSphere.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/IcoSphere.kt
diff --git a/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Matrix.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Matrix.kt
new file mode 100644
index 0000000..c6d0852
--- /dev/null
+++ b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Matrix.kt
@@ -0,0 +1,101 @@
+package net.kuafuai.andee.ui.ball.gl
+
+import kotlin.math.PI
+import kotlin.math.cos
+import kotlin.math.sin
+import kotlin.math.sqrt
+import kotlin.math.tan
+
+/**
+ * The seven `android.opengl.Matrix` operations the ball uses, with identical
+ * semantics: 4x4 matrices as column-major FloatArrays, angles in degrees,
+ * `rotateM`/`translateM`/`scaleM` post-multiply in place.
+ */
+object Matrix {
+
+ fun setIdentityM(m: FloatArray, off: Int) {
+ for (i in 0 until 16) m[off + i] = 0f
+ m[off] = 1f; m[off + 5] = 1f; m[off + 10] = 1f; m[off + 15] = 1f
+ }
+
+ /** r = a × b. Safe when r aliases a or b. */
+ fun multiplyMM(r: FloatArray, ro: Int, a: FloatArray, ao: Int, b: FloatArray, bo: Int) {
+ val t = FloatArray(16)
+ for (col in 0 until 4) for (row in 0 until 4) {
+ var s = 0f
+ for (k in 0 until 4) s += a[ao + k * 4 + row] * b[bo + col * 4 + k]
+ t[col * 4 + row] = s
+ }
+ System.arraycopy(t, 0, r, ro, 16)
+ }
+
+ fun translateM(m: FloatArray, off: Int, x: Float, y: Float, z: Float) {
+ for (i in 0 until 4) {
+ m[off + 12 + i] += m[off + i] * x + m[off + 4 + i] * y + m[off + 8 + i] * z
+ }
+ }
+
+ fun scaleM(m: FloatArray, off: Int, x: Float, y: Float, z: Float) {
+ for (i in 0 until 4) {
+ m[off + i] *= x; m[off + 4 + i] *= y; m[off + 8 + i] *= z
+ }
+ }
+
+ fun rotateM(m: FloatArray, off: Int, a: Float, x: Float, y: Float, z: Float) {
+ val r = FloatArray(16)
+ setRotateM(r, a, x, y, z)
+ val t = FloatArray(16)
+ multiplyMM(t, 0, m, off, r, 0)
+ System.arraycopy(t, 0, m, off, 16)
+ }
+
+ private fun setRotateM(rm: FloatArray, a: Float, x0: Float, y0: Float, z0: Float) {
+ setIdentityM(rm, 0)
+ val rad = a * (PI / 180.0).toFloat()
+ val s = sin(rad); val c = cos(rad)
+ var x = x0; var y = y0; var z = z0
+ if (x == 1f && y == 0f && z == 0f) {
+ rm[5] = c; rm[10] = c; rm[6] = s; rm[9] = -s
+ } else if (x == 0f && y == 1f && z == 0f) {
+ rm[0] = c; rm[10] = c; rm[8] = s; rm[2] = -s
+ } else if (x == 0f && y == 0f && z == 1f) {
+ rm[0] = c; rm[5] = c; rm[1] = s; rm[4] = -s
+ } else {
+ val len = sqrt(x * x + y * y + z * z)
+ if (len != 1f) { x /= len; y /= len; z /= len }
+ val nc = 1f - c
+ val xy = x * y; val yz = y * z; val zx = z * x
+ val xs = x * s; val ys = y * s; val zs = z * s
+ rm[0] = x * x * nc + c; rm[4] = xy * nc - zs; rm[8] = zx * nc + ys
+ rm[1] = xy * nc + zs; rm[5] = y * y * nc + c; rm[9] = yz * nc - xs
+ rm[2] = zx * nc - ys; rm[6] = yz * nc + xs; rm[10] = z * z * nc + c
+ }
+ }
+
+ fun perspectiveM(m: FloatArray, off: Int, fovy: Float, aspect: Float, zNear: Float, zFar: Float) {
+ val f = 1.0f / tan(fovy * (PI / 360.0)).toFloat()
+ val rangeReciprocal = 1.0f / (zNear - zFar)
+ m[off] = f / aspect; m[off + 1] = 0f; m[off + 2] = 0f; m[off + 3] = 0f
+ m[off + 4] = 0f; m[off + 5] = f; m[off + 6] = 0f; m[off + 7] = 0f
+ m[off + 8] = 0f; m[off + 9] = 0f; m[off + 10] = (zFar + zNear) * rangeReciprocal; m[off + 11] = -1f
+ m[off + 12] = 0f; m[off + 13] = 0f; m[off + 14] = 2f * zFar * zNear * rangeReciprocal; m[off + 15] = 0f
+ }
+
+ fun setLookAtM(
+ rm: FloatArray, off: Int, ex: Float, ey: Float, ez: Float, cx: Float, cy: Float, cz: Float,
+ ux: Float, uy: Float, uz: Float,
+ ) {
+ var fx = cx - ex; var fy = cy - ey; var fz = cz - ez
+ val rlf = 1f / sqrt(fx * fx + fy * fy + fz * fz)
+ fx *= rlf; fy *= rlf; fz *= rlf
+ var sx = fy * uz - fz * uy; var sy = fz * ux - fx * uz; var sz = fx * uy - fy * ux
+ val rls = 1f / sqrt(sx * sx + sy * sy + sz * sz)
+ sx *= rls; sy *= rls; sz *= rls
+ val ux2 = sy * fz - sz * fy; val uy2 = sz * fx - sx * fz; val uz2 = sx * fy - sy * fx
+ rm[off] = sx; rm[off + 1] = ux2; rm[off + 2] = -fx; rm[off + 3] = 0f
+ rm[off + 4] = sy; rm[off + 5] = uy2; rm[off + 6] = -fy; rm[off + 7] = 0f
+ rm[off + 8] = sz; rm[off + 9] = uz2; rm[off + 10] = -fz; rm[off + 11] = 0f
+ rm[off + 12] = 0f; rm[off + 13] = 0f; rm[off + 14] = 0f; rm[off + 15] = 1f
+ translateM(rm, off, -ex, -ey, -ez)
+ }
+}
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Mesh.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Mesh.kt
similarity index 99%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/Mesh.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Mesh.kt
index 9e5a59a..350167d 100644
--- a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Mesh.kt
+++ b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Mesh.kt
@@ -1,6 +1,5 @@
package net.kuafuai.andee.ui.ball.gl
-import android.opengl.GLES20
import java.nio.ByteBuffer
import java.nio.ByteOrder
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/PointsBuffer.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/PointsBuffer.kt
similarity index 98%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/PointsBuffer.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/PointsBuffer.kt
index 776117c..4f39628 100644
--- a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/PointsBuffer.kt
+++ b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/PointsBuffer.kt
@@ -1,6 +1,5 @@
package net.kuafuai.andee.ui.ball.gl
-import android.opengl.GLES20
import java.nio.ByteBuffer
import java.nio.ByteOrder
import java.nio.FloatBuffer
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Puff.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Puff.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/Puff.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Puff.kt
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Shader.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Shader.kt
similarity index 93%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/Shader.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Shader.kt
index a9ff740..c686347 100644
--- a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Shader.kt
+++ b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Shader.kt
@@ -1,6 +1,5 @@
package net.kuafuai.andee.ui.ball.gl
-import android.opengl.GLES20
/**
* Compiles + links a vertex/fragment shader pair. Caches attribute and
@@ -40,7 +39,7 @@ class Shader(vertSrc: String, fragSrc: String) {
companion object {
private fun compile(type: Int, src: String): Int {
val id = GLES20.glCreateShader(type)
- GLES20.glShaderSource(id, src)
+ GLES20.glShaderSource(id, GLES20.backend.adaptShader(src, fragment = type == GLES20.GL_FRAGMENT_SHADER))
GLES20.glCompileShader(id)
val status = IntArray(1)
GLES20.glGetShaderiv(id, GLES20.GL_COMPILE_STATUS, status, 0)
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/Torus.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Torus.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/Torus.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/Torus.kt
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/gl/UvSphere.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/UvSphere.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/gl/UvSphere.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/gl/UvSphere.kt
diff --git a/core/src/test/kotlin/net/kuafuai/andee/ui/ball/gl/MatrixTest.kt b/core/src/test/kotlin/net/kuafuai/andee/ui/ball/gl/MatrixTest.kt
new file mode 100644
index 0000000..b39fad1
--- /dev/null
+++ b/core/src/test/kotlin/net/kuafuai/andee/ui/ball/gl/MatrixTest.kt
@@ -0,0 +1,78 @@
+package net.kuafuai.andee.ui.ball.gl
+
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * The ball's matrices used to come from android.opengl.Matrix; a mistake in
+ * this copy shows up only as a ball drawn in the wrong place, so the
+ * conventions are pinned here: column-major, degrees, post-multiplication.
+ */
+class MatrixTest {
+
+ private val eps = 1e-5f
+
+ private fun identity() = FloatArray(16).also { Matrix.setIdentityM(it, 0) }
+
+ private fun apply(m: FloatArray, x: Float, y: Float, z: Float): FloatArray {
+ val v = floatArrayOf(x, y, z, 1f)
+ return FloatArray(4) { r -> (0 until 4).sumOf { k -> (m[k * 4 + r] * v[k]).toDouble() }.toFloat() }
+ }
+
+ @Test
+ fun `rotation about z turns x into y`() {
+ val m = identity()
+ Matrix.rotateM(m, 0, 90f, 0f, 0f, 1f)
+ assertArrayEquals(floatArrayOf(0f, 1f, 0f, 1f), apply(m, 1f, 0f, 0f), eps)
+ }
+
+ @Test
+ fun `an arbitrary axis agrees with the special-cased one`() {
+ val a = identity(); Matrix.rotateM(a, 0, 37f, 0f, 1f, 0f)
+ val b = identity(); Matrix.rotateM(b, 0, 37f, 0f, 2f, 0f)
+ assertArrayEquals(a, b, eps)
+ val c = identity(); Matrix.rotateM(c, 0, 37f, 1f, 1f, 0f)
+ val p = apply(c, 1f, 1f, 0f)
+ assertArrayEquals("the axis itself does not move", floatArrayOf(1f, 1f, 0f, 1f), p, eps)
+ }
+
+ @Test
+ fun `translate then scale post-multiplies, as Android does`() {
+ val m = identity()
+ Matrix.translateM(m, 0, 1f, 2f, 3f)
+ Matrix.scaleM(m, 0, 2f, 2f, 2f)
+ // m = T * S, so a point is scaled first and then moved.
+ assertArrayEquals(floatArrayOf(3f, 4f, 5f, 1f), apply(m, 1f, 1f, 1f), eps)
+ }
+
+ @Test
+ fun `multiply composes right to left and tolerates aliasing`() {
+ val t = identity(); Matrix.translateM(t, 0, 5f, 0f, 0f)
+ val r = identity(); Matrix.rotateM(r, 0, 90f, 0f, 0f, 1f)
+ val out = FloatArray(16)
+ Matrix.multiplyMM(out, 0, t, 0, r, 0)
+ assertArrayEquals(floatArrayOf(5f, 1f, 0f, 1f), apply(out, 1f, 0f, 0f), eps)
+ Matrix.multiplyMM(t, 0, t, 0, r, 0)
+ assertArrayEquals(out, t, eps)
+ }
+
+ @Test
+ fun `perspective matches the GL formula`() {
+ val m = FloatArray(16)
+ Matrix.perspectiveM(m, 0, 90f, 2f, 1f, 10f)
+ assertEquals(0.5f, m[0], eps)
+ assertEquals(1f, m[5], eps)
+ assertEquals(-11f / 9f, m[10], eps)
+ assertEquals(-1f, m[11], eps)
+ assertEquals(-20f / 9f, m[14], eps)
+ }
+
+ @Test
+ fun `look-at puts the eye at the origin looking down minus z`() {
+ val m = FloatArray(16)
+ Matrix.setLookAtM(m, 0, 0f, 0f, 5f, 0f, 0f, 0f, 0f, 1f, 0f)
+ assertArrayEquals(floatArrayOf(0f, 0f, 0f, 1f), apply(m, 0f, 0f, 5f), eps)
+ assertArrayEquals(floatArrayOf(0f, 0f, -5f, 1f), apply(m, 0f, 0f, 0f), eps)
+ }
+}