diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 739de1f0..5dfbba5e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,6 +39,9 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
+ with:
+ submodules: true
+ fetch-depth: 0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
diff --git a/.gitmodules b/.gitmodules
index 37e5cd06..a8ec31b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "ferricia"]
path = ferricia
url = https://github.com/bitsusei/TerraModulus-Ferricia-Engine
+[submodule "vector-math"]
+ path = vector-math
+ url = https://github.com/bitsusei/kotlin-vector-math
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e254cd93..e3cab1e4 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 00000000..e40fc1cc
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 131e44d7..2e4da65a 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,7 @@
-
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index ba62ca49..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index ba9deec3..6e08a227 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -5,5 +5,6 @@
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 8541b9db..5a90eaf0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,21 +5,64 @@ plugins {
kotlin("jvm") version "2.3.21"
kotlin("plugin.serialization") version "2.1.20"
id("org.jetbrains.kotlinx.atomicfu") version "0.27.0"
+ id("net.terramodulus.plugins.cargo") apply false
+// id("fr.stardustenterprises.rust.wrapper") version "3.2.4" apply false
application
+ kotlin("kapt") version "2.3.21"
}
-allprojects {
- apply(plugin = "org.jetbrains.kotlin.jvm")
+version = "0.0.1"
- version = "0.0.1"
+repositories {
+ mavenCentral()
+}
+
+project(":ferricia") {
+ // Candidates: fr.stardustenterprises.rust.wrapper
+ apply(plugin = "net.terramodulus.plugins.cargo")
- repositories {
- mavenCentral()
+ if (providers.gradleProperty("release").isPresent) configure {
+ release = true // use `-Prelease=true`
+ }
+ configure {
+ outputFile = release.map {
+ projectDir.resolve("target/${if (it) "release" else "debug"}/${System.mapLibraryName("ferricia")}")
+ }
+ }
+ // somehow, .cargo extension is unusable
+ tasks.register("buildClient") {
+ args = listOf("-F", "client")
+ println(outputFile.get())
+ }
+ tasks.register("buildServer") {
+ args = listOf("-F", "server")
+ }
+ configurations {
+ create("client") {
+ isCanBeConsumed = true
+ isCanBeResolved = false
+ }
+ create("server") {
+ isCanBeConsumed = true
+ isCanBeResolved = false
+ }
+ }
+ artifacts {
+ add("client", tasks.named("buildClient"))
+ add("server", tasks.named("buildServer"))
}
}
configure(listOf(project(":kernel"), project(":internal"))) {
configure(listOf(project("common"), project("client"), project("server"))) {
+ apply(plugin = "org.jetbrains.kotlin.jvm")
+
+ version = rootProject.version
+
+ repositories {
+ mavenCentral()
+ }
+
sourceSets.main {
kotlin.srcDir("kotlin")
resources.srcDir("resources")
@@ -61,7 +104,26 @@ project(":kernel") {
}
}
+project(":kernel:client") {
+ dependencies {
+ implementation(project(":ferricia", "client"))
+ }
+}
+project(":kernel:server") {
+ dependencies {
+ implementation(project(":ferricia", "server"))
+ }
+}
+
+configure(listOf(project(":internal:common"), project(":kernel:common"))) {
+ dependencies {
+ api("com.cout970:kotlin-vector-math:0.1.0")
+ }
+}
+
project(":kernel:common") {
+ apply(plugin = "org.jetbrains.kotlin.kapt")
+
dependencies {
api("org.jetbrains:annotations:26.1.0")
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
@@ -77,7 +139,7 @@ project(":kernel:common") {
implementation("org.apache.logging.log4j:log4j-api:2.24.3")
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")
implementation(platform("org.apache.logging.log4j:log4j-bom:2.24.3"))
- annotationProcessor("org.apache.logging.log4j:log4j-core:2.24.3")
+ kapt("org.apache.logging.log4j:log4j-core:2.24.3")
runtimeOnly("com.lmax:disruptor:4.0.0")
api("io.github.oshai:kotlin-logging-jvm:7.0.3")
implementation("net.sf.jopt-simple:jopt-simple:5.0.4")
@@ -86,10 +148,12 @@ project(":kernel:common") {
project(":kernel:client").dependencies {
implementation("net.sf.jopt-simple:jopt-simple:5.0.4")
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0")
}
project(":kernel:server").dependencies {
implementation("net.sf.jopt-simple:jopt-simple:5.0.4")
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0")
}
project(":internal:common").dependencies {
@@ -112,28 +176,6 @@ configure(listOf(project(":kernel:server"), project(":kernel:client"))) {
}
}
-/** Build Ferricia Engine with Cargo */
-tasks.register("cargoBuildClient") {
- onlyIf {
- !gradle.taskGraph.hasTask(":kernel:server:jar")
- }
- workingDir = rootProject.file("ferricia")
- commandLine("cargo", "build")
- if (project.hasProperty("release")) args("--release") // use `-Prelease=true`
- args("-F", "client")
-}
-tasks.register("cargoBuildServer") {
- onlyIf {
- !gradle.taskGraph.hasTask(":kernel:client:jar")
- }
- workingDir = rootProject.file("ferricia")
- commandLine("cargo", "build")
- if (project.hasProperty("release")) args("--release") // use `-Prelease=true`
- args("-F", "server")
-}
-project(":kernel:client").tasks.named("jar") { dependsOn(tasks.named("cargoBuildClient")) }
-project(":kernel:server").tasks.named("jar") { dependsOn(tasks.named("cargoBuildServer")) }
-
tasks.register("buildClient") {
group = "build"
description = "Build client"
@@ -151,17 +193,13 @@ tasks.named("run") {
tasks.register("runClient") {
group = "application"
description = "Run client"
- dependsOn("cargoBuildClient")
dependsOn(":kernel:client:run")
}
-project(":kernel:client").tasks.named("run").get().mustRunAfter(tasks.named("cargoBuildClient"))
tasks.register("runServer") {
group = "application"
description = "Run server"
- dependsOn("cargoBuildServer")
dependsOn(":kernel:server:run")
}
-project(":kernel:server").tasks.named("run").get().mustRunAfter(tasks.named("cargoBuildServer"))
configure(listOf(project(":kernel:server"), project(":kernel:client"))) {
distributions {
@@ -170,15 +208,12 @@ configure(listOf(project(":kernel:server"), project(":kernel:client"))) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
into("lib") {
val dir = if (project.hasProperty("release")) "release" else "debug"
+ from("$rootDir/ferricia/target/$dir/${System.mapLibraryName("ferricia")}")
if (OperatingSystem.current().isWindows) from(
- "$rootDir/ferricia/target/$dir/ferricia.dll",
"$rootDir/ferricia/target/$dir/oded.dll",
"$rootDir/ferricia/target/$dir/OpenAL32.dll",
"$rootDir/ferricia/target/$dir/SDL3.dll",
- ) else { // suppose UNIX
- // other libs should be installed on user's end directly
- from("$rootDir/ferricia/target/$dir/libferricia.so")
- }
+ ) // for UNIX, other libs should have been installed on user's end directly
}
}
}
@@ -197,9 +232,18 @@ configure(listOf(project(":kernel:server"), project(":kernel:client"))) {
}
tasks.named("run") {
- jvmArgs("-Djava.library.path=${rootProject.file("ferricia/target/${
- if (project.hasProperty("release")) "release" else "debug"
- }").path}")
+ jvmArgs(
+ "-Djava.library.path=${
+ rootProject.file(
+ "ferricia/target/${
+ if (project.hasProperty("release")) "release" else "debug"
+ }"
+ ).path
+ }"
+ )
args("--screen-size", "800x500")
}
}
+dependencies {
+ testImplementation(kotlin("test"))
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 00000000..fb5da883
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+plugins {
+ `kotlin-dsl`
+}
+
+repositories {
+ mavenCentral()
+ gradlePluginPortal()
+}
+
+gradlePlugin {
+ plugins {
+ register("cargoPlugin") {
+ id = "net.terramodulus.plugins.cargo"
+ implementationClass = "CargoPlugin"
+ }
+ }
+}
diff --git a/buildSrc/src/main/kotlin/CargoExtension.kt b/buildSrc/src/main/kotlin/CargoExtension.kt
new file mode 100644
index 00000000..520ea2ae
--- /dev/null
+++ b/buildSrc/src/main/kotlin/CargoExtension.kt
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+
+interface CargoExtension {
+ val release: Property
+ val outputFile: RegularFileProperty
+}
diff --git a/buildSrc/src/main/kotlin/CargoPlugin.kt b/buildSrc/src/main/kotlin/CargoPlugin.kt
new file mode 100644
index 00000000..843b7d61
--- /dev/null
+++ b/buildSrc/src/main/kotlin/CargoPlugin.kt
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class CargoPlugin : Plugin {
+ override fun apply(target: Project) {
+ val extension = target.extensions.create("cargoConfig", CargoExtension::class.java)
+
+ extension.release.convention(false)
+
+ target.tasks.withType(CargoTask::class.java).configureEach {
+ release.convention(extension.release)
+ outputFile.convention(extension.outputFile)
+ inputs.dir(project.projectDir)
+ }
+ }
+}
diff --git a/buildSrc/src/main/kotlin/CargoTask.kt b/buildSrc/src/main/kotlin/CargoTask.kt
new file mode 100644
index 00000000..1ee19e2a
--- /dev/null
+++ b/buildSrc/src/main/kotlin/CargoTask.kt
@@ -0,0 +1,47 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import org.gradle.process.ExecOperations
+import javax.inject.Inject
+
+abstract class CargoTask @Inject constructor(private val execOperations: ExecOperations, objectFactory: ObjectFactory) : DefaultTask() {
+// @get:Input
+// abstract val environment: Property>
+
+ @get:Input
+ @get:Optional
+ abstract val release: Property
+
+ @get:Input
+ @get:Optional
+ val args: ListProperty = objectFactory.listProperty(String::class.java)
+
+ @get:OutputFile
+ abstract val outputFile: RegularFileProperty
+
+ init {
+ release.convention(false)
+ args.convention(args.empty())
+ }
+
+ @TaskAction
+ fun build() {
+ execOperations.exec {
+ executable = "cargo"
+ args = listOf("build") + this@CargoTask.args.get()
+ if (release.get()) args = args + "--release"
+ workingDir = project.projectDir
+ }
+ }
+}
diff --git a/ferricia b/ferricia
index 66bbf397..000d2e89 160000
--- a/ferricia
+++ b/ferricia
@@ -1 +1 @@
-Subproject commit 66bbf397fc38663b797a63f31493149602223434
+Subproject commit 000d2e89b38be73acd50ed7d3a20b679cff62afa
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b95..1b33c55b 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a793..aaaabb3c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b..23d15a93 100644
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9d21a218..db3a6ac2 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a487543e..e2221f71 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,3 +16,11 @@ rootProject.children.forEach {
it.projectDir = File(settingsDir, "src/${it.name}")
include("${it.name}:common", "${it.name}:client", "${it.name}:server")
}
+
+include("ferricia") // this is Rust
+
+includeBuild("vector-math") {
+ dependencySubstitution {
+ substitute(module("com.cout970:kotlin-vector-math")).using(project(":"))
+ }
+}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/AsdIntData.kt b/src/internal/client/kotlin/net/terramodulus/engine/AsdIntData.kt
new file mode 100644
index 00000000..401d7344
--- /dev/null
+++ b/src/internal/client/kotlin/net/terramodulus/engine/AsdIntData.kt
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+package net.terramodulus.engine
+
+/**
+ * ASD Intermediate Data
+ */
+class AsdIntData {
+}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/BaseAsdProcessor.kt b/src/internal/client/kotlin/net/terramodulus/engine/BaseAsdProcessor.kt
new file mode 100644
index 00000000..a63aabda
--- /dev/null
+++ b/src/internal/client/kotlin/net/terramodulus/engine/BaseAsdProcessor.kt
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+package net.terramodulus.engine
+
+import java.io.InputStream
+
+/**
+ * Since for most parts, there is no definite metadata of lengths for all data,
+ * it is necessary to provide at least processing fragmentation from implementation.
+ */
+interface BaseAsdProcessor {
+ /**
+ * @param data ByteArrayInputStream backed by direct byte buffer
+ */
+ fun process(data: InputStream)
+}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/Camera3D.kt b/src/internal/client/kotlin/net/terramodulus/engine/Camera3D.kt
index 343458f3..f5e500b4 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/Camera3D.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/Camera3D.kt
@@ -5,8 +5,8 @@
package net.terramodulus.engine
-import net.terramodulus.engine.ferricia.Gwr.drawGwrObj
-import net.terramodulus.engine.ferricia.Gwr.geoShaders
+import com.cout970.math.vec2.ImmVec2d
+import net.terramodulus.engine.ferricia.Gwr.getCameraSpace
import net.terramodulus.engine.ferricia.Gwr.newCamera
import net.terramodulus.engine.ferricia.Gwr.refreshCameraPos
import net.terramodulus.engine.ferricia.Gwr.setCameraZoomLevel
@@ -16,7 +16,9 @@ import kotlin.properties.Delegates
class Camera3D internal constructor(private val canvas: Canvas, pos: FloatArray) : Closeable {
internal val handle = newCamera(canvas.handle, pos)
- fun loadGeoShaders(vsh: String, fsh: String) = geoShaders(vsh, fsh)
+ fun loadGeoShaders(vsh: String, fsh: String) = canvas.load3DGeoShaders(vsh, fsh)
+
+ fun getSpace() = getCameraSpace(handle).let { ImmVec2d(it[0], it[1]) }
fun refreshPos(pos: FloatArray) = refreshCameraPos(handle, pos)
@@ -25,7 +27,7 @@ class Camera3D internal constructor(private val canvas: Canvas, pos: FloatArray)
}
fun renderGwrGeo(drawable: WorldObjDrawable, programHandle: ULong) =
- drawGwrObj(canvas.handle, handle, drawable.handle, programHandle)
+ canvas.drawGwrObj(this, drawable, programHandle)
override fun close() {
canvas.camera3D = null
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/Canvas.kt b/src/internal/client/kotlin/net/terramodulus/engine/Canvas.kt
index a838815b..03562054 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/Canvas.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/Canvas.kt
@@ -5,15 +5,25 @@
package net.terramodulus.engine
+import net.terramodulus.engine.ferricia.Gwr
+import net.terramodulus.engine.ferricia.Gwr.drawGwrObj
+import net.terramodulus.engine.ferricia.Gwr.newMeshGeomCube
+import net.terramodulus.engine.ferricia.Gwr.newMeshGeomSphere
import net.terramodulus.engine.ferricia.Mui
import net.terramodulus.engine.ferricia.Mui.clearCanvas
+import net.terramodulus.engine.ferricia.Mui.disableScissor
import net.terramodulus.engine.ferricia.Mui.drawGuiGeo
import net.terramodulus.engine.ferricia.Mui.drawGuiTex
import net.terramodulus.engine.ferricia.Mui.dropCanvasHandle
+import net.terramodulus.engine.ferricia.Mui.enableScissor
import net.terramodulus.engine.ferricia.Mui.geoShaders
import net.terramodulus.engine.ferricia.Mui.getGLVersion
import net.terramodulus.engine.ferricia.Mui.initCanvasHandle
import net.terramodulus.engine.ferricia.Mui.loadImageToCanvas
+import net.terramodulus.engine.ferricia.Mui.newSimpleLineGeom
+import net.terramodulus.engine.ferricia.Mui.newSimpleRectGeom
+import net.terramodulus.engine.ferricia.Mui.newSpriteMesh
+import net.terramodulus.engine.ferricia.Mui.newTxtProgram
import net.terramodulus.engine.ferricia.Mui.setCanvasClearColor
import net.terramodulus.engine.ferricia.Mui.texShaders
import java.io.Closeable
@@ -23,16 +33,17 @@ import java.io.Closeable
*
* This manages GL viewport in the SDL window and rendering in the viewport.
*/
+@OptIn(ExperimentalUnsignedTypes::class)
class Canvas internal constructor(private val windowHandle: ULong) : Closeable {
internal val handle = initCanvasHandle(windowHandle)
val glVersion = getGLVersion(windowHandle)
internal var camera3D: Camera3D? = null;
- fun clear() = clearCanvas()
+ fun clear() = clearCanvas(windowHandle)
- fun setClearColor(r: Float, g: Float, b: Float, a: Float) = setCanvasClearColor(r, g, b, a)
+ fun setClearColor(r: Float, g: Float, b: Float, a: Float) = setCanvasClearColor(windowHandle, r, g, b, a)
- fun resizeGLViewport() = if (camera3D == null) {
+ internal fun resizeGLViewport() = if (camera3D == null) {
Mui.resizeGLViewport(windowHandle, handle)
} else {
Mui.resizeGLViewportCamera(windowHandle, handle, camera3D!!.handle)
@@ -43,11 +54,33 @@ class Canvas internal constructor(private val windowHandle: ULong) : Closeable {
return camera3D!!
}
+ fun newGlyphManager(manager: FontManager) = manager.newGlyphManager(windowHandle)
+
fun loadImage(data: ByteArray) = loadImageToCanvas(handle, data)
- fun loadGeoShaders(vsh: String, fsh: String) = geoShaders(vsh, fsh)
+ fun loadGeoShaders(vsh: String, fsh: String) = geoShaders(windowHandle, vsh, fsh)
+
+ fun load3DGeoShaders(vsh: String, fsh: String) = Gwr.geoShaders(windowHandle, vsh, fsh)
+
+ fun loadTexShaders(vsh: String, fsh: String) = texShaders(windowHandle, vsh, fsh)
+
+ fun loadTxtShaders(vsh: String, fsh: String) = newTxtProgram(windowHandle, vsh, fsh)
+
+ fun newTextRenderer(geoProgramHandle: ULong, txtProgramHandle: ULong) =
+ TextRenderer(windowHandle, geoProgramHandle, txtProgramHandle)
+
+ internal fun newSimpleLineGeom(x0: Int, y0: Int, x1: Int, y1: Int, r: Int, g: Int, b: Int, a: Int) =
+ newSimpleLineGeom(windowHandle, intArrayOf(x0, y0, x1, y1, r, g, b, a))
- fun loadTexShaders(vsh: String, fsh: String) = texShaders(vsh, fsh)
+ internal fun newSimpleRectGeom(x0: Int, y0: Int, x1: Int, y1: Int, r: Int, g: Int, b: Int, a: Int) =
+ newSimpleRectGeom(windowHandle, intArrayOf(x0, y0, x1, y1, r, g, b, a))
+
+ internal fun newSpriteMesh(x0: Int, y0: Int, x1: Int, y1: Int) =
+ newSpriteMesh(windowHandle, intArrayOf(x0, y0, x1, y1))
+
+ internal fun newMeshGeomCube(width: Float) = newMeshGeomCube(windowHandle, width)
+
+ internal fun newMeshGeomSphere(radius: Float) = newMeshGeomSphere(windowHandle, radius)
fun renderGuiGeo(drawable: GeomDrawable, programHandle: ULong) =
drawGuiGeo(handle, drawable.handle, programHandle)
@@ -55,6 +88,13 @@ class Canvas internal constructor(private val windowHandle: ULong) : Closeable {
fun renderGuiTex(drawable: MeshDrawable, programHandle: ULong, textureHandle: UInt) =
drawGuiTex(handle, drawable.handle, programHandle, textureHandle)
+ internal fun drawGwrObj(camera3D: Camera3D, drawable: WorldObjDrawable, programHandle: ULong) =
+ drawGwrObj(windowHandle, handle, camera3D.handle, drawable.handle, programHandle)
+
+ fun enableScissor(x: Int, y: Int, w: UInt, h: UInt) = enableScissor(handle, intArrayOf(x, y, w.toInt(), h.toInt()))
+
+ fun disableScissor() = disableScissor(handle)
+
override fun close() {
dropCanvasHandle(handle)
}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/Containers.kt b/src/internal/client/kotlin/net/terramodulus/engine/Containers.kt
index 69913a49..c08aeab7 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/Containers.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/Containers.kt
@@ -5,10 +5,9 @@
package net.terramodulus.engine
-data class Rgba(val r: Int, val g: Int, val b: Int, val a: Int) {
- fun toArray() = intArrayOf(r, g, b, a)
-}
+import com.cout970.math.vec2.Vec2f
+import com.cout970.math.vec4.Vec4i
-data class Vec3F(val x: Float, val y: Float, val z: Float) {
- fun toArray() = floatArrayOf(x, y, z)
-}
+fun Vec4i.toArray() = intArrayOf(x, y, z, w)
+
+fun Vec2f.toArray() = floatArrayOf(x, y)
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/FontManager.kt b/src/internal/client/kotlin/net/terramodulus/engine/FontManager.kt
new file mode 100644
index 00000000..a51a5d3d
--- /dev/null
+++ b/src/internal/client/kotlin/net/terramodulus/engine/FontManager.kt
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+package net.terramodulus.engine
+
+import com.cout970.math.vec4.Vec4i
+import net.terramodulus.engine.ferricia.Mui.newFontManager
+
+class FontManager {
+ internal val handle = newFontManager()
+
+ internal fun newGlyphManager(windowHandle: ULong) = GlyphManager(handle, windowHandle)
+
+ fun newTextRenderingManager(fontSize: Float, lineHeight: Float, color: Vec4i) =
+ TextRenderingContext(handle, fontSize, lineHeight, color)
+}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/GeomDrawable.kt b/src/internal/client/kotlin/net/terramodulus/engine/GeomDrawable.kt
index 3d8ccd53..68e663bd 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/GeomDrawable.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/GeomDrawable.kt
@@ -11,8 +11,8 @@ import net.terramodulus.engine.ferricia.Mui.newSimpleRectGeom
sealed class GeomDrawable(handle: ULong) : Drawable(handle) {
}
-class SimpleLineGeom(x0: Int, y0: Int, x1: Int, y1: Int, r: Int, g: Int, b: Int, a: Int) :
- GeomDrawable(newSimpleLineGeom(intArrayOf(x0, y0, x1, y1, r, g, b, a)))
+class SimpleLineGeom(canvas: Canvas, x0: Int, y0: Int, x1: Int, y1: Int, r: Int, g: Int, b: Int, a: Int) :
+ GeomDrawable(canvas.newSimpleLineGeom(x0, y0, x1, y1, r, g, b, a))
-class SimpleRectGeom(x0: Int, y0: Int, x1: Int, y1: Int, r: Int, g: Int, b: Int, a: Int) :
- GeomDrawable(newSimpleRectGeom(intArrayOf(x0, y0, x1, y1, r, g, b, a)))
+class SimpleRectGeom(canvas: Canvas, x0: Int, y0: Int, x1: Int, y1: Int, r: Int, g: Int, b: Int, a: Int) :
+ GeomDrawable(canvas.newSimpleRectGeom(x0, y0, x1, y1, r, g, b, a))
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/GlyphManager.kt b/src/internal/client/kotlin/net/terramodulus/engine/GlyphManager.kt
new file mode 100644
index 00000000..76383f24
--- /dev/null
+++ b/src/internal/client/kotlin/net/terramodulus/engine/GlyphManager.kt
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+package net.terramodulus.engine
+
+import net.terramodulus.engine.ferricia.Mui.newGlyphManager
+
+class GlyphManager internal constructor(managerHandle: ULong, windowHandle: ULong) {
+ internal val handle = newGlyphManager(managerHandle, windowHandle)
+}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/MeshDrawable.kt b/src/internal/client/kotlin/net/terramodulus/engine/MeshDrawable.kt
index b9357795..836ba323 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/MeshDrawable.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/MeshDrawable.kt
@@ -10,6 +10,7 @@ import net.terramodulus.engine.ferricia.Mui.newSpriteMesh
sealed class MeshDrawable(handle: ULong) : Drawable(handle) {
}
-class SpriteMesh(x0: Int, y0: Int, x1: Int, y1: Int) : MeshDrawable(newSpriteMesh(intArrayOf(x0, y0, x1, y1))) {
+class SpriteMesh(canvas: Canvas, x0: Int, y0: Int, x1: Int, y1: Int) :
+ MeshDrawable(canvas.newSpriteMesh(x0, y0, x1, y1)) {
}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/ModelTransform.kt b/src/internal/client/kotlin/net/terramodulus/engine/ModelTransform.kt
index 556db221..3b9752c7 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/ModelTransform.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/ModelTransform.kt
@@ -5,29 +5,48 @@
package net.terramodulus.engine
-import net.terramodulus.engine.ferricia.Mui.modelFullScaling
-import net.terramodulus.engine.ferricia.Mui.modelSmartScaling
+import com.cout970.math.vec2.ImmVec2d
+import com.cout970.math.vec2.MutVec2d
+import com.cout970.math.vec2.Vec2d
+import net.terramodulus.engine.ferricia.Mui.modelGeneralTransform
+import net.terramodulus.engine.ferricia.Mui.updateGeneralTransform
+import java.io.Closeable
+import kotlin.properties.Delegates
@OptIn(ExperimentalUnsignedTypes::class)
-sealed class ModelTransform(handles: ULongArray) {
+sealed class ModelTransform(handles: ULongArray) : Closeable {
internal val handle: ULong = handles[0]
internal val wideHandle: ULong = handles[1]
+
+ override fun close() {
+ TODO("Not yet implemented")
+ }
}
@OptIn(ExperimentalUnsignedTypes::class)
-class SmartScaling private constructor(vararg args: Int) :
- ModelTransform(modelSmartScaling(args)) {
-
- companion object {
- fun none(w: Int, h: Int) = SmartScaling(w, h, 0)
-
- fun x(w: Int, h: Int, ww: Int, hh: Int) = SmartScaling(w, h, 1, ww, hh)
-
- fun y(w: Int, h: Int, ww: Int, hh: Int) = SmartScaling(w, h, 2, ww, hh)
+class GeneralTransform(sx: Double, sy: Double, angle: Double, px: Double, py: Double) :
+ ModelTransform(modelGeneralTransform(doubleArrayOf(sx, sy, angle, px, py))) {
+ constructor() : this(1.0, 1.0, 0.0, 0.0, 0.0)
+
+ var scale: Vec2d = ImmVec2d(sx, sy)
+ private set
+ var angle: Double = angle
+ private set
+ var pos: Vec2d = ImmVec2d(px, py)
+ private set
+
+ interface Op {
+ var scale: Vec2d
+ var angle: Double
+ var pos: Vec2d
+ }
- fun both(w: Int, h: Int, ww: Int, hh: Int) = SmartScaling(w, h, 3, ww, hh)
+ fun update(operation: Op.() -> Unit) {
+ operation(object : Op {
+ override var scale: Vec2d by this@GeneralTransform::scale
+ override var angle: Double by this@GeneralTransform::angle
+ override var pos: Vec2d by this@GeneralTransform::pos
+ })
+ updateGeneralTransform(handle, doubleArrayOf(scale.x, scale.y, angle, pos.x, pos.y))
}
}
-
-@OptIn(ExperimentalUnsignedTypes::class)
-class FullScaling(w: Int, h: Int) : ModelTransform(modelFullScaling(intArrayOf(w, h)))
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/TextRenderer.kt b/src/internal/client/kotlin/net/terramodulus/engine/TextRenderer.kt
new file mode 100644
index 00000000..be3e7ccb
--- /dev/null
+++ b/src/internal/client/kotlin/net/terramodulus/engine/TextRenderer.kt
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+package net.terramodulus.engine
+
+import com.cout970.math.vec2.Vec2f
+import net.terramodulus.engine.ferricia.Mui.newTextRenderer
+
+class TextRenderer internal constructor(windowHandle: ULong, geoProgramHandle: ULong, txtProgramHandle: ULong) {
+ private val handle = newTextRenderer(windowHandle, geoProgramHandle, txtProgramHandle)
+
+ fun renderText(
+ ctx: TextRenderingContext,
+ canvas: Canvas,
+ glyphManager: GlyphManager,
+ fontManager: FontManager,
+ pos: Vec2f,
+ ) = ctx.render(canvas.handle, glyphManager.handle, handle, fontManager.handle, pos)
+}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/TextRenderingContext.kt b/src/internal/client/kotlin/net/terramodulus/engine/TextRenderingContext.kt
new file mode 100644
index 00000000..91f34652
--- /dev/null
+++ b/src/internal/client/kotlin/net/terramodulus/engine/TextRenderingContext.kt
@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+package net.terramodulus.engine
+
+import com.cout970.math.vec2.Vec2f
+import com.cout970.math.vec4.Vec4i
+import net.terramodulus.engine.ferricia.Mui.fetchTextRenderingContextSize
+import net.terramodulus.engine.ferricia.Mui.newTextRenderingContext
+import net.terramodulus.engine.ferricia.Mui.renderText
+import net.terramodulus.engine.ferricia.Mui.setTextRenderingContextColor
+import net.terramodulus.engine.ferricia.Mui.setTextRenderingContextMetrics
+import net.terramodulus.engine.ferricia.Mui.setTextRenderingContextSize
+import net.terramodulus.engine.ferricia.Mui.setTextRenderingContextText
+
+class TextRenderingContext internal constructor(
+ private val managerHandle: ULong,
+ fontSize: Float,
+ lineHeight: Float,
+ color: Vec4i,
+) {
+ private val handle = newTextRenderingContext(managerHandle, floatArrayOf(fontSize, lineHeight), color.toArray())
+
+ fun setColor(color: Vec4i) = setTextRenderingContextColor(handle, color.toArray())
+
+ fun setMetrics(fontSize: Float, lineHeight: Float,) =
+ setTextRenderingContextMetrics(handle, floatArrayOf(fontSize, lineHeight))
+
+ fun setSize(width: Float, height: Float) = setTextRenderingContextSize(handle, floatArrayOf(width, height))
+
+ fun fetchSize() = fetchTextRenderingContextSize(handle, managerHandle)
+
+ fun setText(text: String) = setTextRenderingContextText(handle, text)
+
+ internal fun render(
+ canvasHandle: ULong,
+ glyphMgrHandle: ULong,
+ rendererHandle: ULong,
+ fontMgrHandle: ULong,
+ pos: Vec2f,
+ ) = renderText(canvasHandle, glyphMgrHandle, rendererHandle, fontMgrHandle, handle, pos.toArray())
+}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/Window.kt b/src/internal/client/kotlin/net/terramodulus/engine/Window.kt
index ef3c5e54..cfffb58f 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/Window.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/Window.kt
@@ -5,8 +5,10 @@
package net.terramodulus.engine
+import com.cout970.math.vec2.ImmVec2f
import net.terramodulus.engine.ferricia.Mui.dropSdlHandle
import net.terramodulus.engine.ferricia.Mui.dropWindowHandle
+import net.terramodulus.engine.ferricia.Mui.getMousePos
import net.terramodulus.engine.ferricia.Mui.initSdlHandle
import net.terramodulus.engine.ferricia.Mui.initWindowHandle
import net.terramodulus.engine.ferricia.Mui.resizeGLViewport
@@ -18,17 +20,38 @@ import java.io.Closeable
/**
* Manages the SDL window instance and the underlying GL context.
*/
-class Window : Closeable {
+class Window(
+ width: UInt,
+ height: UInt,
+) : Closeable {
+ var width = width
+ private set
+ var height = height
+ private set
private val sdlHandle = initSdlHandle()
- private val windowHandle = initWindowHandle(sdlHandle)
+ private val windowHandle = initWindowHandle(sdlHandle) // TODO pass dimensions
val canvas = Canvas(windowHandle)
+ private val listeners = HashSet<(UInt, UInt) -> Unit>()
+
+ fun addListener(listener: (UInt, UInt) -> Unit) = listeners.add(listener)
+ fun removeListener(listener: (UInt, UInt) -> Unit) = listeners.remove(listener)
+
+ fun sizeChanged(width: UInt, height: UInt) {
+ this.width = width
+ this.height = height
+ canvas.resizeGLViewport()
+ listeners.forEach { it(width, height) }
+ }
+
fun show() = showWindow(windowHandle)
fun swap() = swapWindow(windowHandle)
fun pollEvents() = sdlPoll(sdlHandle)
+ fun getMousePos() = getMousePos(sdlHandle).let { ImmVec2f(it[0], height.toFloat() - it[1]) }
+
override fun close() {
dropWindowHandle(windowHandle)
dropSdlHandle(sdlHandle)
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/WorldObjDrawable.kt b/src/internal/client/kotlin/net/terramodulus/engine/WorldObjDrawable.kt
index 55fe2423..0e29ea6f 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/WorldObjDrawable.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/WorldObjDrawable.kt
@@ -5,38 +5,47 @@
package net.terramodulus.engine
-import net.terramodulus.engine.ferricia.Gwr.newMeshGeomCube
-import net.terramodulus.engine.ferricia.Gwr.newMeshGeomSphere
+import com.cout970.math.quaternion.Quatd
+import com.cout970.math.vec3.Vec3d
+import com.cout970.math.vec4.Vec4i
+import net.terramodulus.engine.ferricia.Gwr.newDrawableWorldObj
import net.terramodulus.engine.ferricia.Gwr.updateWorldObjModel
-sealed class WorldObjDrawable(internal val handle: ULong, private var pos: Vec3D, private var scale: Vec3D, private var rot: Quat) {
+class WorldObjDrawable(geom: WorldObjGeom, rgba: Vec4i, private var pos: Vec3d, private var scale: Vec3d, private var rot: Quatd) {
+ internal val handle = newDrawableWorldObj(geom.wideHandle, rgba.toArray())
fun updateModel(px: Double, py: Double, pz: Double, sx: Double, sy: Double, sz: Double, w: Double, i: Double, j: Double, k: Double) =
updateWorldObjModel(handle, doubleArrayOf(px, py, pz, w, i, j, k, sx, sy, sz))
- fun updateModel(pos: Vec3D, scale: Vec3D, rot: Quat) =
- updateModel(pos.x, pos.y, pos.z, scale.x, scale.y, scale.z, rot.w, rot.i, rot.j, rot.k)
+ fun updateModel(pos: Vec3d, scale: Vec3d, rot: Quatd) =
+ updateModel(pos.x, pos.y, pos.z, scale.x, scale.y, scale.z, rot.w, rot.x, rot.y, rot.z)
init {
updateModel(pos, scale, rot)
}
- fun setPos(value: Vec3D) {
+ fun setPos(value: Vec3d) {
pos = value
updateModel(pos, scale, rot)
}
- fun setScale(value: Vec3D) {
+ fun setScale(value: Vec3d) {
scale = value
updateModel(pos, scale, rot)
}
- fun setRot(value: Quat) {
+ fun setRot(value: Quatd) {
rot = value
updateModel(pos, scale, rot)
}
}
-class SimpleMesh3dGeomCube(width: Float, rgba: Rgba, pos: Vec3D, scale: Vec3D, rot: Quat) :
- WorldObjDrawable(newMeshGeomCube(width, rgba.toArray()), pos, scale, rot)
+@OptIn(ExperimentalUnsignedTypes::class)
+sealed class WorldObjGeom(handles: ULongArray) {
+ protected val handle = handles[0]
+ internal val wideHandle = handles[1]
+}
+
+@OptIn(ExperimentalUnsignedTypes::class)
+class SimpleMesh3dGeomCube(canvas: Canvas, width: Float) : WorldObjGeom(canvas.newMeshGeomCube(width))
-class SimpleMesh3dGeomSphere(radius: Float, rgba: Rgba, pos: Vec3D, scale: Vec3D, rot: Quat) :
- WorldObjDrawable(newMeshGeomSphere(radius, rgba.toArray()), pos, scale, rot)
+@OptIn(ExperimentalUnsignedTypes::class)
+class SimpleMesh3dGeomSphere(canvas: Canvas, radius: Float) : WorldObjGeom(canvas.newMeshGeomSphere(radius))
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/ferricia/Gwr.kt b/src/internal/client/kotlin/net/terramodulus/engine/ferricia/Gwr.kt
index dc7c8d36..c3f55316 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/ferricia/Gwr.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/ferricia/Gwr.kt
@@ -5,14 +5,16 @@
package net.terramodulus.engine.ferricia
+@OptIn(ExperimentalUnsignedTypes::class)
internal object Gwr {
/**
+ * @param windowHandle window handle pointer
* @param vsh source code of vector shader
* @param fsh source code of fragment shader
* @return GWR Geo Shader Program handle pointer
*/
@JvmName("geoShaders")
- external fun geoShaders(vsh: String, fsh: String): ULong
+ external fun geoShaders(windowHandle: ULong, vsh: String, fsh: String): ULong
/**
* @param canvasHandle Canvas handle pointer
@@ -22,6 +24,13 @@ internal object Gwr {
@JvmName("newCamera")
external fun newCamera(canvasHandle: ULong, data: FloatArray): ULong
+ /**
+ * @param cameraHandle Camera3D handle pointer
+ * @return `[x, z]` space dimensions
+ */
+ @JvmName("getCameraSpace")
+ external fun getCameraSpace(cameraHandle: ULong): DoubleArray
+
/**
* @param cameraHandle Camera3D handle pointer
* @param data `[x, y, z]`
@@ -37,20 +46,28 @@ internal object Gwr {
external fun setCameraZoomLevel(cameraHandle: ULong, data: Float)
/**
+ * @param windowHandle window handle pointer
* @param width cube's width, in `(0,2]`
- * @param data `[r, g, b, a]`
- * @return DrawableWorldObj handle pointer
+ * @return SimpleMesh3dGeom handle pointer and Render3dPrimitive (wide) handle pointer
*/
@JvmName("newMeshGeomCube")
- external fun newMeshGeomCube(width: Float, data: IntArray): ULong
+ external fun newMeshGeomCube(windowHandle: ULong, width: Float): ULongArray
/**
+ * @param windowHandle window handle pointer
* @param width cube's radius, in `(0,1]`
+ * @return SimpleMesh3dGeom handle pointer and Render3dPrimitive (wide) handle pointer
+ */
+ @JvmName("newMeshGeomSphere")
+ external fun newMeshGeomSphere(windowHandle: ULong, width: Float): ULongArray
+
+ /**
+ * @param handle Render3dPrimitive (wide) handle pointer
* @param data `[r, g, b, a]`
* @return DrawableWorldObj handle pointer
*/
- @JvmName("newMeshGeomSphere")
- external fun newMeshGeomSphere(width: Float, data: IntArray): ULong
+ @JvmName("newDrawableWorldObj")
+ external fun newDrawableWorldObj(handle: ULong, data: IntArray): ULong
/**
* @param objHandle DrawableWorldObj handle pointer
@@ -60,11 +77,12 @@ internal object Gwr {
external fun updateWorldObjModel(objHandle: ULong, data: DoubleArray)
/**
+ * @param windowHandle window handle pointer
* @param canvasHandle Canvas handle pointer
* @param cameraHandle Camera3D handle pointer
* @param objHandle DrawableWorldObj handle pointer
* @param programHandle GWR Shader Program handle pointer
*/
@JvmName("drawGwrObj")
- external fun drawGwrObj(canvasHandle: ULong, cameraHandle: ULong, objHandle: ULong, programHandle: ULong)
+ external fun drawGwrObj(windowHandle: ULong, canvasHandle: ULong, cameraHandle: ULong, objHandle: ULong, programHandle: ULong)
}
diff --git a/src/internal/client/kotlin/net/terramodulus/engine/ferricia/Mui.kt b/src/internal/client/kotlin/net/terramodulus/engine/ferricia/Mui.kt
index 6ffa4fa0..ab5ce5ad 100644
--- a/src/internal/client/kotlin/net/terramodulus/engine/ferricia/Mui.kt
+++ b/src/internal/client/kotlin/net/terramodulus/engine/ferricia/Mui.kt
@@ -7,6 +7,7 @@ package net.terramodulus.engine.ferricia
import net.terramodulus.engine.MuiEvent
+@OptIn(ExperimentalUnsignedTypes::class)
internal object Mui {
/**
* @return SDL handle pointer
@@ -39,6 +40,13 @@ internal object Mui {
@JvmName("getGLVersion")
external fun getGLVersion(windowHandle: ULong): String
+ /**
+ * @param sdlHandle SDL handle pointer
+ * @return `[x, y]` in window coordinates
+ */
+ @JvmName("getMousePos")
+ external fun getMousePos(sdlHandle: ULong): FloatArray
+
/**
* @param sdlHandle SDL handle pointer
* @return the list of all MUI events in this frame
@@ -91,48 +99,59 @@ internal object Mui {
@JvmName("loadImageToCanvas")
external fun loadImageToCanvas(canvasHandle: ULong, data: ByteArray): UInt
+ /**
+ * @param windowHandle window handle pointer
+ */
@JvmName("clearCanvas")
- external fun clearCanvas()
+ external fun clearCanvas(windowHandle: ULong)
+ /**
+ * @param windowHandle window handle pointer
+ */
@JvmName("setCanvasClearColor")
- external fun setCanvasClearColor(r: Float, g: Float, b: Float, a: Float)
+ external fun setCanvasClearColor(windowHandle: ULong, r: Float, g: Float, b: Float, a: Float)
/**
+ * @param windowHandle window handle pointer
* @param vsh source code of vector shader
* @param fsh source code of fragment shader
* @return Geo Shader Program handle pointer
*/
@JvmName("geoShaders")
- external fun geoShaders(vsh: String, fsh: String): ULong
+ external fun geoShaders(windowHandle: ULong, vsh: String, fsh: String): ULong
/**
+ * @param windowHandle window handle pointer
* @param vsh source code of vector shader
* @param fsh source code of fragment shader
* @return Tex Shader Program handle pointer
*/
@JvmName("texShaders")
- external fun texShaders(vsh: String, fsh: String): ULong
+ external fun texShaders(windowHandle: ULong, vsh: String, fsh: String): ULong
/**
+ * @param windowHandle window handle pointer
* @param data `[x0, y0, x1, y1, r, g, b, a]`
* @return SimpleLineGeom as DrawableSet handle pointer
*/
@JvmName("newSimpleLineGeom")
- external fun newSimpleLineGeom(data: IntArray): ULong
+ external fun newSimpleLineGeom(windowHandle: ULong, data: IntArray): ULong
/**
+ * @param windowHandle window handle pointer
* @param data `[x0, y0, x1, y1, r, g, b, a]`
* @return SimpleRectGeom as DrawableSet handle pointer
*/
@JvmName("newSimpleRectGeom")
- external fun newSimpleRectGeom(data: IntArray): ULong
+ external fun newSimpleRectGeom(windowHandle: ULong, data: IntArray): ULong
/**
+ * @param windowHandle window handle pointer
* @param data `[x0, y0, x1, y1]`
* @return SpriteMesh as DrawableSet handle pointer
*/
@JvmName("newSpriteMesh")
- external fun newSpriteMesh(data: IntArray): ULong
+ external fun newSpriteMesh(windowHandle: ULong, data: IntArray): ULong
/**
* @param handle DrawableSet handle pointer
@@ -142,29 +161,22 @@ internal object Mui {
external fun setGeomPos(handle: ULong, data: FloatArray)
/**
- * @param data `[w, h, param, w, h]`
- * @return SmartScaling handle pointers
+ * @param data `[sx, sy, angle, px, py]`; scaling, rotation, position
+ * @return GeneralTransform handle pointer and PrimModelTransform (wide) handle pointer
*/
- @JvmName("modelSmartScaling")
- external fun modelSmartScaling(data: IntArray): ULongArray
+ @JvmName("modelGeneralTransform")
+ external fun modelGeneralTransform(data: DoubleArray): ULongArray
/**
- * @param data `[w, h]`
- * @return FullScaling handle pointers
+ * @param handle GeneralTransform thin pointer
+ * @param data `[sx, sy, angle, px, py]`; scaling, rotation, position
*/
- @JvmName("modelFullScaling")
- external fun modelFullScaling(data: IntArray): ULongArray
-
- /**
- * @param data `[x, y]`
- * @return SimpleTranslation handle pointers
- */
- @JvmName("modelSimpleTranslation")
- external fun modelSimpleTranslation(data: FloatArray): ULongArray
+ @JvmName("updateGeneralTransform")
+ external fun updateGeneralTransform(handle: ULong, data: DoubleArray)
/**
* @param data alpha
- * @return AlphaFilter handle pointers
+ * @return AlphaFilter handle pointer and PrimColorFilter (wide) handle pointer
*/
@JvmName("filterAlphaFilter")
external fun filterAlphaFilter(data: Float): ULongArray
@@ -219,4 +231,112 @@ internal object Mui {
*/
@JvmName("drawGuiTex")
external fun drawGuiTex(canvasHandle: ULong, drawableHandle: ULong, programHandle: ULong, textureHandle: UInt)
+
+ /**
+ * @return FontManager handle pointer
+ */
+ @JvmName("newFontManager")
+ external fun newFontManager(): ULong
+
+ /**
+ * @param managerHandle FontManager handle pointer
+ * @param windowHandle Window handle pointer
+ * @return GlyphManager handle pointer
+ */
+ @JvmName("newGlyphManager")
+ external fun newGlyphManager(managerHandle: ULong, windowHandle: ULong): ULong
+
+ /**
+ * @param windowHandle Window handle pointer
+ * @param vsh Window handle pointer
+ * @param fsh Window handle pointer
+ * @return TxtProgram handle pointer
+ */
+ @JvmName("newTxtProgram")
+ external fun newTxtProgram(windowHandle: ULong, vsh: String, fsh: String): ULong
+
+ /**
+ * @param windowHandle Window handle pointer
+ * @param geoProgramHandle GeoProgram handle pointer
+ * @param txtProgramHandle TxtProgram handle pointer
+ * @return TextRenderer handle pointer
+ */
+ @JvmName("newTextRenderer")
+ external fun newTextRenderer(windowHandle: ULong, geoProgramHandle: ULong, txtProgramHandle: ULong): ULong
+
+ /**
+ * @param managerHandle FontManager handle pointer
+ * @param data1 Font size and line height in pixels
+ * @param data2 `[r, g, b, a]` in [0,255]
+ * @return TextRenderingContext handle pointer
+ */
+ @JvmName("newTextRenderingContext")
+ external fun newTextRenderingContext(managerHandle: ULong, data1: FloatArray, data2: IntArray): ULong
+
+ /**
+ * @param ctxHandle TextRenderingContext handle pointer
+ * @param data `[r, g, b, a]` in [0,255]
+ */
+ @JvmName("setTextRenderingContextColor")
+ external fun setTextRenderingContextColor(ctxHandle: ULong, data: IntArray)
+
+ /**
+ * @param ctxHandle TextRenderingContext handle pointer
+ * @param data Font size and line height in pixels
+ */
+ @JvmName("setTextRenderingContextMetrics")
+ external fun setTextRenderingContextMetrics(ctxHandle: ULong, data: FloatArray)
+
+ /**
+ * @param ctxHandle TextRenderingContext handle pointer
+ * @param data Width and height in pixels
+ */
+ @JvmName("setTextRenderingContextSize")
+ external fun setTextRenderingContextSize(ctxHandle: ULong, data: FloatArray)
+
+ /**
+ * @param ctxHandle TextRenderingContext handle pointer
+ * @param text Contents of entire text widget
+ */
+ @JvmName("setTextRenderingContextText")
+ external fun setTextRenderingContextText(ctxHandle: ULong, text: String)
+
+ /**
+ * @param ctxHandle TextRenderingContext handle pointer
+ * @param fmHandle FontManager handle pointer
+ * @return `[w, h]` text context size/dimensions
+ */
+ @JvmName("fetchTextRenderingContextSize")
+ external fun fetchTextRenderingContextSize(ctxHandle: ULong, fmHandle: ULong): FloatArray
+
+ /**
+ * @param canvasHandle Canvas handle pointer
+ * @param glyphMgrHandle GlyphManager handle pointer
+ * @param rendererHandle TextRenderer handle pointer
+ * @param fontMgrHandle FontManager handle pointer
+ * @param ctxHandle TextRenderingContext handle pointer
+ * @param data `[x, y]` Position
+ */
+ @JvmName("renderText")
+ external fun renderText(
+ canvasHandle: ULong,
+ glyphMgrHandle: ULong,
+ rendererHandle: ULong,
+ fontMgrHandle: ULong,
+ ctxHandle: ULong,
+ data: FloatArray,
+ )
+
+ /**
+ * @param canvasHandle Canvas handle pointer
+ * @param data `[x, y, w, h]` scissor box in window coordinates
+ */
+ @JvmName("enableScissor")
+ external fun enableScissor(canvasHandle: ULong, data: IntArray)
+
+ /**
+ * @param canvasHandle Canvas handle pointer
+ */
+ @JvmName("disableScissor")
+ external fun disableScissor(canvasHandle: ULong)
}
diff --git a/src/internal/common/kotlin/net/terramodulus/engine/Containers.kt b/src/internal/common/kotlin/net/terramodulus/engine/Containers.kt
deleted file mode 100644
index d15aea07..00000000
--- a/src/internal/common/kotlin/net/terramodulus/engine/Containers.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.engine
-
-data class Quat(val w: Double, val i: Double, val j: Double, val k: Double) {
- fun toArray() = doubleArrayOf(w, i, j, k)
-}
-
-data class Vec3D(val x: Double, val y: Double, val z: Double) {
- companion object {
- val ZERO = Vec3D(0.0, 0.0, 0.0)
-
- /**
- * @param array array containing 3 double values
- */
- fun fromArray(array: DoubleArray) = Vec3D(array[0], array[1], array[2])
- }
-
- fun toArray() = doubleArrayOf(x, y, z)
-}
diff --git a/src/internal/common/kotlin/net/terramodulus/engine/PhyBody.kt b/src/internal/common/kotlin/net/terramodulus/engine/PhyBody.kt
index b2cca8ff..1e626f3d 100644
--- a/src/internal/common/kotlin/net/terramodulus/engine/PhyBody.kt
+++ b/src/internal/common/kotlin/net/terramodulus/engine/PhyBody.kt
@@ -5,6 +5,9 @@
package net.terramodulus.engine
+import com.cout970.math.vec3.Vec3d
+import net.terramodulus.engine.common.ImmVec3dFromArray
+import net.terramodulus.engine.common.toArray
import net.terramodulus.engine.ferricia.Physics.addPhyBodyForce
import net.terramodulus.engine.ferricia.Physics.addPhyBodyGeom
import net.terramodulus.engine.ferricia.Physics.getPhyBodyLinearVel
@@ -22,19 +25,25 @@ class PhyBody internal constructor(worldHandle: ULong, mass: Mass) {
class SphereTotal(mass: Double, radius: Double) : Mass(newMassSphereTotal(mass, radius))
}
- var pos
- get() = Vec3D.fromArray(getPhyBodyPos(handle))
+ var pos: Vec3d
+ get() = ImmVec3dFromArray(getPhyBodyPos(handle))
set(value) = setPhyBodyPos(handle, value.toArray())
- var linearVel
- get() = Vec3D.fromArray(getPhyBodyLinearVel(handle))
+ var linearVel: Vec3d
+ get() = ImmVec3dFromArray(getPhyBodyLinearVel(handle))
set(value) = setPhyBodyLinearVel(handle, value.toArray())
var gravityMode: Boolean by Delegates.observable(true) { _, _, newValue ->
setPhyBodyGravityMode(handle, newValue)
}
- fun addGeom(geom: PhyGeom) = addPhyBodyGeom(handle, geom.handle)
+ private val _geoms = mutableSetOf()
+ val geoms: Set get() = _geoms
- fun addForce(force: Vec3D) = addPhyBodyForce(handle, force.toArray())
+ fun addGeom(geom: PhyGeom) {
+ addPhyBodyGeom(handle, geom.handle)
+ _geoms.add(geom)
+ }
+
+ fun addForce(force: Vec3d) = addPhyBodyForce(handle, force.toArray())
}
diff --git a/src/internal/common/kotlin/net/terramodulus/engine/PhyWorld.kt b/src/internal/common/kotlin/net/terramodulus/engine/PhyWorld.kt
index b985ab0a..ef74ddbe 100644
--- a/src/internal/common/kotlin/net/terramodulus/engine/PhyWorld.kt
+++ b/src/internal/common/kotlin/net/terramodulus/engine/PhyWorld.kt
@@ -5,6 +5,9 @@
package net.terramodulus.engine
+import com.cout970.math.vec3.Vec3d
+import net.terramodulus.engine.common.ZeroImmVec3d
+import net.terramodulus.engine.common.toArray
import net.terramodulus.engine.ferricia.Physics.newPhyCollisionManager
import net.terramodulus.engine.ferricia.Physics.newPhyWorld
import net.terramodulus.engine.ferricia.Physics.omitPhyCollisionManagerSpace
@@ -18,7 +21,7 @@ class PhyWorld internal constructor(envHandle: ULong) {
private val handle = newPhyWorld(envHandle)
private val cmHandle = newPhyCollisionManager()
- var gravity: Vec3D by Delegates.observable(Vec3D.ZERO) { _, _, newValue ->
+ var gravity: Vec3d by Delegates.observable(ZeroImmVec3d) { _, _, newValue ->
setPhyWorldGravity(handle, newValue.toArray())
}
diff --git a/src/internal/common/kotlin/net/terramodulus/engine/common/Containers.kt b/src/internal/common/kotlin/net/terramodulus/engine/common/Containers.kt
new file mode 100644
index 00000000..e1a9a08e
--- /dev/null
+++ b/src/internal/common/kotlin/net/terramodulus/engine/common/Containers.kt
@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
+ * SPDX-License-Identifier: LGPL-3.0-only
+ */
+
+package net.terramodulus.engine.common
+
+import com.cout970.math.vec3.ImmVec3d
+import com.cout970.math.vec3.ImmVec3f
+import com.cout970.math.vec3.Vec3d
+
+/**
+ * @throws ArrayIndexOutOfBoundsException if [array]'s size < 3
+ */
+fun ImmVec3dFromArray(array: DoubleArray) = ImmVec3d(array[0], array[1], array[2])
+
+fun Vec3d.toArray() = doubleArrayOf(x, y, z)
+
+val ZeroImmVec3d = ImmVec3d(0.0)
+val ZeroImmVec3f = ImmVec3f(0F)
diff --git a/src/kernel/client/kotlin/net/terramodulus/core/Main.kt b/src/kernel/client/kotlin/net/terramodulus/core/Main.kt
index f27c43ad..44747f35 100644
--- a/src/kernel/client/kotlin/net/terramodulus/core/Main.kt
+++ b/src/kernel/client/kotlin/net/terramodulus/core/Main.kt
@@ -15,7 +15,6 @@ import net.terramodulus.common.core.ApplicationArgumentParsingError
import net.terramodulus.common.core.ApplicationInitializationFault
import net.terramodulus.common.core.run
import net.terramodulus.common.core.setupInit
-import net.terramodulus.mui.GuiManager
import net.terramodulus.util.exception.CodeLogicFault
import net.terramodulus.util.exception.triggerGlobalCrash
import java.awt.Dimension
diff --git a/src/kernel/client/kotlin/net/terramodulus/core/TerraModulus.kt b/src/kernel/client/kotlin/net/terramodulus/core/TerraModulus.kt
index 29846b28..53cfb892 100644
--- a/src/kernel/client/kotlin/net/terramodulus/core/TerraModulus.kt
+++ b/src/kernel/client/kotlin/net/terramodulus/core/TerraModulus.kt
@@ -6,23 +6,34 @@
package net.terramodulus.core
import net.terramodulus.common.core.AbstractTerraModulus
-import net.terramodulus.mui.GuiManager
+import net.terramodulus.mui.MuiManager
+import net.terramodulus.mui.gui.GuiManager
import net.terramodulus.void.World
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.TimeSource
class TerraModulus internal constructor() : AbstractTerraModulus() {
- private val guiManager = GuiManager(this)
+ private val muiManager = MuiManager(this)
internal var world: World? = null
- override var tps: Int
- get() = TODO("Not yet implemented")
- set(value) {}
+ var tps = 0
+ private set
override fun run() {
- guiManager.showWindow()
+ muiManager.showWindow()
+ val timeSource = TimeSource.Monotonic
+ var lastTick = timeSource.markNow()
+ var ticks = 0
while (true) {
- guiManager.updateCanvas()
-// guiManager.updateScreens()
- Thread.sleep(1)
+ muiManager.update()
+ ticks++
+ val now = timeSource.markNow()
+ if (now - lastTick >= 1.seconds) {
+ lastTick = now
+ tps = ticks
+ ticks = 0
+ }
+ Thread.sleep(0)
}
}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/GuiManager.kt b/src/kernel/client/kotlin/net/terramodulus/mui/MuiManager.kt
similarity index 77%
rename from src/kernel/client/kotlin/net/terramodulus/mui/GuiManager.kt
rename to src/kernel/client/kotlin/net/terramodulus/mui/MuiManager.kt
index 60ab391b..5c25276a 100644
--- a/src/kernel/client/kotlin/net/terramodulus/mui/GuiManager.kt
+++ b/src/kernel/client/kotlin/net/terramodulus/mui/MuiManager.kt
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
* SPDX-License-Identifier: LGPL-3.0-only
*/
@@ -8,38 +8,37 @@ package net.terramodulus.mui
import net.terramodulus.core.TerraModulus
import net.terramodulus.engine.MuiEvent
import net.terramodulus.engine.Window
-import net.terramodulus.mui.gfx.RenderSystem
-import net.terramodulus.mui.gms.ScreenManager
-import net.terramodulus.mui.input.InputSystem
+import net.terramodulus.mui.aui.AuiManager
+import net.terramodulus.mui.gui.GuiManager
+import net.terramodulus.mui.hui.HuiManager
+import net.terramodulus.mui.kui.InputSystem
+import net.terramodulus.mui.kui.KeyboardInputHandler
+import net.terramodulus.mui.kui.KuiManager
+import net.terramodulus.mui.kui.MouseInputHandler
+import net.terramodulus.mui.uid.UidManager
import net.terramodulus.util.logging.logger
import java.io.Closeable
private val logger = logger {}
+private const val WIDTH = 800u
+private const val HEIGHT = 480u
-/**
- * Graphical User Interface (GUI) Manager
- */
-internal class GuiManager internal constructor(core: TerraModulus) : Closeable {
- private val window = Window()
- val renderSystem = RenderSystem(core, window.canvas)
- val inputSystem = InputSystem()
- val screenManager = ScreenManager(renderSystem.handle)
+internal class MuiManager internal constructor(core: TerraModulus) : Closeable {
+ private val window = Window(WIDTH, HEIGHT) // SDL Window
+ internal val uidManager = UidManager()
+ internal val auiManager = AuiManager()
+ internal val huiManager = HuiManager()
+ internal val kuiManager = KuiManager(uidManager)
+ internal val guiManager = GuiManager(window, core)
internal fun showWindow() = window.show()
-// /**
-// * Screen updating, targeting as the same as *maximum FPS*,
-// * but the numbers of ticks are not supposed to be compensated when missed,
-// * so it is up to the callers to compensate missed activities.
-// */
-// internal fun updateScreens() {}
-
/**
- * Canvas updating, per frame, maximally the *maximum FPS*.
+ * SDL events updating, per frame, maximally the *maximum FPS*.
* This includes input ticking and canvas rendering.
*/
- internal fun updateCanvas() {
- val keyEvents = ArrayList()
+ internal fun update() {
+ val inputEvents = ArrayList()
window.pollEvents().forEach { event ->
when (event) {
is MuiEvent.DisplayAdded -> {
@@ -125,11 +124,11 @@ internal class GuiManager internal constructor(core: TerraModulus) : Closeable {
}
is MuiEvent.KeyboardKeyDown -> {
logger.debug { "Keyboard (id: ${event.keyboardId}) key `${event.key}` down." }
- keyEvents.add(InputSystem.KeyEvent.Down(InputSystem.KeyId(event.key)))
+ inputEvents.add(InputSystem.InputEvent.Keyboard(KeyboardInputHandler.KeyEvent.Down(KeyboardInputHandler.KeyId(event.key))))
}
is MuiEvent.KeyboardKeyUp -> {
logger.debug { "Keyboard (id: ${event.keyboardId}) key `${event.key}` up." }
- keyEvents.add(InputSystem.KeyEvent.Up(InputSystem.KeyId(event.key)))
+ inputEvents.add(InputSystem.InputEvent.Keyboard(KeyboardInputHandler.KeyEvent.Up(KeyboardInputHandler.KeyId(event.key))))
}
MuiEvent.KeyboardRemoved -> {
logger.debug { "Keyboard removed." }
@@ -142,12 +141,19 @@ internal class GuiManager internal constructor(core: TerraModulus) : Closeable {
}
is MuiEvent.MouseButtonDown -> {
logger.debug { "Mouse (id: ${event.mouseId}) key `${event.key}` down." }
+ inputEvents.add(InputSystem.InputEvent.Mouse(MouseInputHandler.Event.Button.Down(MouseInputHandler.ButtonId(
+ event.key.toUInt()
+ ))))
}
is MuiEvent.MouseButtonUp -> {
logger.debug { "Mouse (id: ${event.mouseId}) key `${event.key}` up." }
+ inputEvents.add(InputSystem.InputEvent.Mouse(MouseInputHandler.Event.Button.Up(MouseInputHandler.ButtonId(
+ event.key.toUInt()
+ ))))
}
is MuiEvent.MouseMotion -> {
- logger.debug { "Mouse (id: ${event.mouseId}) motion (${event.x}, ${event.y})." }
+ // y is inverted as coordinates in y are inversed from window coordinates to rendering coordinates
+ inputEvents.add(InputSystem.InputEvent.Mouse(MouseInputHandler.Event.Movement(event.x, -event.y)))
}
MuiEvent.MouseRemoved -> {
logger.debug { "Mouse removed." }
@@ -226,7 +232,7 @@ internal class GuiManager internal constructor(core: TerraModulus) : Closeable {
}
is MuiEvent.WindowPixelSizeChanged -> {
logger.debug { "Window pixel size changed to ${event.width}x${event.height}." }
- window.canvas.resizeGLViewport()
+ window.sizeChanged(event.width, event.height)
logger.debug { "Window viewport resized." }
}
is MuiEvent.WindowResized -> {
@@ -240,14 +246,13 @@ internal class GuiManager internal constructor(core: TerraModulus) : Closeable {
}
}
}
- inputSystem.update(keyEvents)
- screenManager.update(renderSystem, inputSystem)
- window.canvas.clear()
- screenManager.render(renderSystem)
- window.swap()
+ guiManager.inputStatesHandle.update(inputEvents.asSequence(), window.getMousePos())
+ kuiManager.inputSystem.update(inputEvents.asSequence())
+ guiManager.updateScreens(this)
+ guiManager.updateCanvas()
}
override fun close() {
- window.close()
+ TODO("Not yet implemented")
}
}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/audio/AudioSystem.kt b/src/kernel/client/kotlin/net/terramodulus/mui/aui/AudioSystem.kt
similarity index 82%
rename from src/kernel/client/kotlin/net/terramodulus/mui/audio/AudioSystem.kt
rename to src/kernel/client/kotlin/net/terramodulus/mui/aui/AudioSystem.kt
index 3f8bc02b..26f330fa 100644
--- a/src/kernel/client/kotlin/net/terramodulus/mui/audio/AudioSystem.kt
+++ b/src/kernel/client/kotlin/net/terramodulus/mui/aui/AudioSystem.kt
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: LGPL-3.0-only
*/
-package net.terramodulus.mui.audio
+package net.terramodulus.mui.aui
class AudioSystem internal constructor() {
}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/AuiManager.kt b/src/kernel/client/kotlin/net/terramodulus/mui/aui/AuiManager.kt
similarity index 57%
rename from src/kernel/client/kotlin/net/terramodulus/mui/AuiManager.kt
rename to src/kernel/client/kotlin/net/terramodulus/mui/aui/AuiManager.kt
index 7d58bc1f..32ab8450 100644
--- a/src/kernel/client/kotlin/net/terramodulus/mui/AuiManager.kt
+++ b/src/kernel/client/kotlin/net/terramodulus/mui/aui/AuiManager.kt
@@ -1,11 +1,9 @@
/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
+ * SPDX-FileCopyrightText: 2026 TerraModulus Team and Contributors
* SPDX-License-Identifier: LGPL-3.0-only
*/
-package net.terramodulus.mui
-
-import net.terramodulus.mui.audio.AudioSystem
+package net.terramodulus.mui.aui
/**
* Audio User Interface (AUI) Manager
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ColorFilter.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ColorFilter.kt
deleted file mode 100644
index d3a3ed42..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ColorFilter.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gfx
-
-typealias ColorFilter = net.terramodulus.engine.ColorFilter
-
-typealias AlphaFilter = net.terramodulus.engine.AlphaFilter
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/GuiSprite.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gfx/GuiSprite.kt
deleted file mode 100644
index d7d7a944..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/GuiSprite.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gfx
-
-import net.terramodulus.engine.SpriteMesh
-
-class GuiSprite(private val rect: RectangleI, private val texture: UInt) {
- private val mesh = SpriteMesh(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height)
-
- fun add(model: ModelTransform) = mesh.add(model)
-
- fun add(filter: ColorFilter) = mesh.add(filter)
-
- fun render(renderSystem: RenderSystem) = renderSystem.renderGuiTex(mesh, texture)
-}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ManagedRect.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ManagedRect.kt
deleted file mode 100644
index 2362b7ae..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ManagedRect.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gfx
-
-import kotlin.properties.Delegates.observable
-
-class ManagedRect(rect: RectangleF) {
- var rect: RectangleF by observable(rect) { _, _, newValue -> observers.forEach { it(newValue) } }
-
- private val observers = LinkedHashSet<(RectangleF) -> Unit>()
-
- fun observe(observer: (RectangleF) -> Unit) {
- observers.add(observer)
- }
-
- fun unobserve(observer: (RectangleF) -> Unit) {
- observers.remove(observer)
- }
-}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ModelTransform.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ModelTransform.kt
deleted file mode 100644
index 8dcdb20c..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/ModelTransform.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gfx
-
-typealias ModelTransform = net.terramodulus.engine.ModelTransform
-
-typealias SmartScaling = net.terramodulus.engine.SmartScaling
-
-typealias FullScaling = net.terramodulus.engine.FullScaling
-
-fun FullScaling(rect: Dimension2I) = FullScaling(rect.width, rect.height)
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/Rectangle.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gfx/Rectangle.kt
deleted file mode 100644
index ecfeca3f..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/Rectangle.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gfx
-
-/**
- * Rectangle in a coordinate system with (0, 0) on the bottom left.
- * The anchor of the rectangle is the bottom-left corner.
- */
-data class RectangleI(
- val x: Int,
- val y: Int,
- val width: Int,
- val height: Int
-) {
- companion object {
- fun withPoints(x0: Int, y0: Int, x1: Int, y1: Int): RectangleI {
- val minX: Int;
- val maxX: Int;
- if (x0 < x1) {
- minX = x0;
- maxX = x1;
- } else {
- maxX = x0;
- minX = x1;
- }
- val minY: Int;
- val maxY: Int;
- if (y0 < y1) {
- minY = y0;
- maxY = y1;
- } else {
- maxY = y0;
- minY = y1;
- }
- return RectangleI(minX, minY, maxX - minX, maxY - minY)
- }
- }
-
- val size get() = Dimension2I(width, height)
-
- fun anchor(pos: Anchor5) = when (pos) {
- Anchor5.TopLeft -> Vector2I(x, y + width)
- Anchor5.TopRight -> Vector2I(x + width, y + height)
- Anchor5.BottomLeft -> Vector2I(x, y)
- Anchor5.BottomRight -> Vector2I(x + width, y)
- Anchor5.Center -> Vector2I(x + width / 2, y + height / 2)
- }
-
- fun translateBy(pos: Vector2I) = RectangleI(x + pos.x, y + pos.y, width, height)
-
- fun translateBy(x: Int, y: Int) = RectangleI(this.x + x, this.y + y, width, height)
-
- fun translateByY(y: Int) = RectangleI(x, this.y + y, width, height)
-
- fun translateByX(x: Int) = RectangleI(this.x + x, y, width, height)
-
- fun translateToY(y: Int) = RectangleI(x, y, width, height)
-
- fun translateToX(x: Int) = RectangleI(x, y, width, height)
-
- fun translateTo(pos: Vector2I) = RectangleI(pos.x, pos.y, width, height)
-
- fun translateTo(x: Int, y: Int) = RectangleI(x, y, width, height)
-
- fun toFloat() = RectangleF(x.toFloat(), y.toFloat(), width.toFloat(), height.toFloat())
-}
-
-/**
- * Rectangle in a coordinate system with (0, 0) on the bottom left.
- * The anchor of the rectangle is the bottom-left corner.
- */
-data class RectangleF(
- val x: Float,
- val y: Float,
- val width: Float,
- val height: Float
-) {
- companion object {
- fun withPoints(x0: Float, y0: Float, x1: Float, y1: Float): RectangleF {
- val minX: Float;
- val maxX: Float;
- if (x0 < x1) {
- minX = x0;
- maxX = x1;
- } else {
- maxX = x0;
- minX = x1;
- }
- val minY: Float;
- val maxY: Float;
- if (y0 < y1) {
- minY = y0;
- maxY = y1;
- } else {
- maxY = y0;
- minY = y1;
- }
- return RectangleF(minX, maxX, minY, maxY)
- }
- }
-
- val size get() = Dimension2F(width, height)
-
- fun anchor(pos: Anchor5) = when (pos) {
- Anchor5.TopLeft -> Vector2F(x, y + width)
- Anchor5.TopRight -> Vector2F(x + width, y + height)
- Anchor5.BottomLeft -> Vector2F(x, y)
- Anchor5.BottomRight -> Vector2F(x + width, y)
- Anchor5.Center -> Vector2F(x + width / 2, y + height / 2)
- }
-
- fun translateBy(pos: Vector2F) = RectangleF(x + pos.x, y + pos.y, width, height)
-
- fun translateBy(x: Float, y: Float) = RectangleF(this.x + x, this.y + y, width, height)
-
- fun translateByY(y: Float) = RectangleF(x, this.y + y, width, height)
-
- fun translateByX(x: Float) = RectangleF(this.x + x, y, width, height)
-
- fun translateToY(y: Float) = RectangleF(x, y, width, height)
-
- fun translateToX(x: Float) = RectangleF(x, y, width, height)
-
- fun translateTo(pos: Vector2F) = RectangleF(pos.x, pos.y, width, height)
-
- fun translateTo(x: Float, y: Float) = RectangleF(x, y, width, height)
-}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/RenderSystem.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gfx/RenderSystem.kt
deleted file mode 100644
index 0e86fb93..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/RenderSystem.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gfx
-
-import net.terramodulus.core.TerraModulus
-import net.terramodulus.core.getResourceAsBytes
-import net.terramodulus.core.getResourceAsString
-import net.terramodulus.engine.Canvas
-import net.terramodulus.engine.GeomDrawable
-import net.terramodulus.engine.MeshDrawable
-import net.terramodulus.mui.gms.impl.GameplayScreen
-
-class RenderSystem internal constructor(private val core: TerraModulus, private val canvas: Canvas) {
- val handle: Handle = HandleImpl()
- private val texShaders = canvas.loadTexShaders(
- getResourceAsString("/gms_tex.vsh"),
- getResourceAsString("/gms_tex.fsh")
- )
- private val geoShaders = canvas.loadGeoShaders(
- getResourceAsString("/gms_geo.vsh"),
- getResourceAsString("/gms_geo.fsh")
- )
- val targetFps = 1000;
-
- sealed interface Handle {
- fun loadTexture(path: String): UInt
-
- fun setBackgroundColor(red: Float, green: Float, blue: Float, alpha: Float)
- }
-
- private inner class HandleImpl : Handle {
- override fun loadTexture(path: String) = canvas.loadImage(getResourceAsBytes(path))
-
- override fun setBackgroundColor(red: Float, green: Float, blue: Float, alpha: Float) {
- canvas.setClearColor(red, green, blue, alpha)
- }
- }
-
- internal fun newGameplayScreen(pos: Vector3F) =
- { it: Handle -> GameplayScreen(core, canvas.createCamera(floatArrayOf(pos.x, pos.y, pos.z)), it) }
-
- internal fun renderGuiTex(drawable: MeshDrawable, texture: UInt) = canvas.renderGuiTex(drawable, texShaders, texture)
-
- internal fun renderGuiGeo(drawable: GeomDrawable) = canvas.renderGuiGeo(drawable, geoShaders)
-
- internal fun render() {
-
- }
-}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/Vector.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gfx/Vector.kt
deleted file mode 100644
index a92d68db..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gfx/Vector.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gfx
-
-data class Vector2I(val x: Int, val y: Int) {
- companion object {
- val ZERO = Vector2I(0, 0)
- }
-
- operator fun plus(other: Vector2I) = Vector2I(x + other.x, y + other.y)
-}
-
-data class Vector2D(val x: Double, val y: Double) {
- companion object {
- val ZERO = Vector2D(.0, .0)
- }
-
- operator fun plus(other: Vector2D) = Vector2D(x + other.x, y + other.y)
-}
-
-data class Vector2F(val x: Float, val y: Float) {
- companion object {
- val ZERO = Vector2F(0F, 0F)
- }
-
- operator fun plus(other: Vector2F) = Vector2F(x + other.x, y + other.y)
-}
-
-data class Vector3I(val x: Int, val y: Int, val z: Int) {
- companion object {
- val ZERO = Vector3I(0, 0, 0)
- }
-
- operator fun plus(other: Vector3I) = Vector3I(x + other.x, y + other.y, z + other.z)
-}
-
-data class Vector3D(val x: Double, val y: Double, val z: Double) {
- companion object {
- val ZERO = Vector3D(.0, .0, .0)
- }
-
- operator fun plus(other: Vector3D) = Vector3D(x + other.x, y + other.y, z + other.z)
-
- operator fun times(factor: Int) = Vector3D(x * factor, y * factor, z * factor)
- operator fun times(factor: Float) = Vector3D(x * factor, y * factor, z * factor)
- operator fun times(factor: Double) = Vector3D(x * factor, y * factor, z * factor)
-}
-
-data class Vector3F(val x: Float, val y: Float, val z: Float) {
- companion object {
- val ZERO = Vector3F(0F, 0F, 0F)
- }
-
- operator fun plus(other: Vector3F) = Vector3F(x + other.x, y + other.y, z + other.z)
-}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gms/AbstractPanel.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gms/AbstractPanel.kt
deleted file mode 100644
index 810e7259..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gms/AbstractPanel.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gms
-
-abstract class AbstractPanel : Component(), Container {
-}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gms/Container.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gms/Container.kt
deleted file mode 100644
index de7f2fba..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gms/Container.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gms
-
-import net.terramodulus.mui.gfx.ManagedRect
-
-sealed interface Container {
- val rect: ManagedRect
-}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gms/Menu.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gms/Menu.kt
deleted file mode 100644
index ada1df80..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gms/Menu.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gms
-
-import net.terramodulus.mui.gms.event.MenuEvent
-import java.util.ArrayDeque
-
-abstract class Menu : Container {
- private val listeners = HashMap, LinkedHashSet<(MenuEvent) -> Unit>>()
- private val components = LinkedHashSet()
- private val componentQueue = ArrayDeque()
- val handle: Handle = HandleImpl()
-
- private sealed interface ComponentOperation {
- class Add(val component: () -> Component) : ComponentOperation
-
- class Remove(val component: Component) : ComponentOperation
- }
-
- /**
- * It is strongly suggested only using this function during initialization.
- */
- protected fun addComponent(component: Component) {
- components.add(component)
- }
-
- /**
- * It is strongly suggested only using this function during initialization.
- */
- protected fun removeComponent(component: Component) {
- components.remove(component)
- }
-
- fun addListener(e: Class, l: (T) -> Unit) {
- @Suppress("UNCHECKED_CAST")
- listeners.computeIfAbsent(e) { LinkedHashSet() }.add(l as (MenuEvent) -> Unit)
- }
-
- fun removeListener(e: Class, l: (T) -> Unit) {
- listeners[e]?.remove(l)
- }
-
- internal fun dispatchEvent(event: MenuEvent) {
- listeners[event.javaClass]?.forEach { it(event) }
- }
-
- sealed interface Handle {
- fun addComponent(component: () -> Component)
-
- fun removeComponent(component: Component)
- }
-
- private inner class HandleImpl : Handle {
- override fun addComponent(component: () -> Component) {
- componentQueue.add(ComponentOperation.Add(component))
- }
-
- override fun removeComponent(component: Component) {
- componentQueue.add(ComponentOperation.Remove(component))
- }
- }
-
- abstract fun render()
-}
diff --git a/src/kernel/client/kotlin/net/terramodulus/mui/gms/Screen.kt b/src/kernel/client/kotlin/net/terramodulus/mui/gms/Screen.kt
deleted file mode 100644
index 60715ce5..00000000
--- a/src/kernel/client/kotlin/net/terramodulus/mui/gms/Screen.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 TerraModulus Team and Contributors
- * SPDX-License-Identifier: LGPL-3.0-only
- */
-
-package net.terramodulus.mui.gms
-
-import net.terramodulus.mui.gfx.ManagedRect
-import net.terramodulus.mui.gfx.RenderSystem
-import net.terramodulus.mui.gms.event.ScreenEvent
-import net.terramodulus.mui.input.InputSystem
-import java.util.ArrayDeque
-
-abstract class Screen : Container {
- private val listeners = HashMap, LinkedHashSet<(ScreenEvent) -> Unit>>()
- private val menus = LinkedHashSet