DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge kommons math into kstarbound

Browse Source
This commit is contained in:
DBotThePony 2024-04-19 14:32:58 +07:00
parent df329f7087
commit 50a3fa6865
Signed by: DBot
GPG Key ID: DCC23B5715498507
182 changed files with 7216 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
build.gradle.kts
View File

@ -8,20 +8,27 @@ plugins {
application
}
group = "ru.dbotthepony"
group = "ru.dbotthepony.kstarbound"
version = "0.1-SNAPSHOT"
val lwjglVersion: String by project
val lwjglNatives: String by project
val kotlinVersion: String by project
val kotlinCoroutinesVersion: String by project
val nettyVersion: String by project
val caffeineVersion: String by project
val fastutilVersion: String by project
val gsonVersion: String by project
val log4jVersion: String by project
val guavaVersion: String by project
val junitVersion: String by project
repositories {
mavenCentral()
maven {
url = uri("https://maven.dbotthepony.ru/")
}
mavenCentral()
}
application {
@ -45,17 +52,17 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion")
implementation("org.apache.logging.log4j:log4j-api:2.17.1")
implementation("org.apache.logging.log4j:log4j-core:2.17.1")
implementation("org.apache.logging.log4j:log4j-api:$log4jVersion")
implementation("org.apache.logging.log4j:log4j-core:$log4jVersion")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
implementation("com.google.code.gson:gson:2.8.9")
implementation("com.google.code.gson:gson:$gsonVersion")
implementation("it.unimi.dsi:fastutil:8.5.6")
implementation("it.unimi.dsi:fastutil:$fastutilVersion")
implementation("com.google.guava:guava:33.0.0-jre")
implementation("com.google.guava:guava:$guavaVersion")
implementation(platform("org.lwjgl:lwjgl-bom:$lwjglVersion"))
@ -79,13 +86,11 @@ dependencies {
implementation("ru.dbotthepony.kommons:kommons:[$kommonsVersion,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-gson:[$kommonsVersion,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-guava:[$kommonsVersion,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-linear-algebra:[$kommonsVersion,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-gson-linear-algebra:[$kommonsVersion,)") { setTransitive(false) }
implementation("com.github.ben-manes.caffeine:caffeine:3.1.5")
implementation("com.github.ben-manes.caffeine:caffeine:$caffeineVersion")
implementation(project(":luna"))
implementation("io.netty:netty-transport:4.1.105.Final")
implementation("io.netty:netty-transport:$nettyVersion")
}
jmh {

10
gradle.properties
View File

@ -3,8 +3,16 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
kotlinVersion=1.9.10
kotlinCoroutinesVersion=1.8.0
kommonsVersion=2.14.0
kommonsVersion=2.15.0
ffiVersion=2.2.13
lwjglVersion=3.3.0
lwjglNatives=natives-windows
nettyVersion=4.1.105.Final
caffeineVersion=3.1.5
fastutilVersion=8.5.6
gsonVersion=2.8.9
log4jVersion=2.17.1
guavaVersion=33.0.0-jre
junitVersion=5.8.2

6
luna/build.gradle.kts
View File

@ -2,13 +2,15 @@ plugins {
id("java")
}
group = "org.classdump.luna"
version = "0.4.2"
group = "ru.dbotthepony.kstarbound"
version = "0.4.4"
repositories {
mavenCentral()
}
java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
dependencies {
testImplementation(platform("org.junit:junit-bom:5.9.1"))
testImplementation("org.junit.jupiter:junit-jupiter")

2
src/main/java/ru/dbotthepony/kstarbound/client/freetype/struct/FT_Vector.java
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.client.freetype.struct;
import com.sun.jna.Structure;
import ru.dbotthepony.kommons.vector.Vector2i;
import ru.dbotthepony.kstarbound.math.vector.Vector2i;
@Structure.FieldOrder({"x", "y"})
public class FT_Vector extends Structure {

24
src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
View File

@ -11,23 +11,13 @@ import org.apache.logging.log4j.LogManager
import org.classdump.luna.compiler.CompilerChunkLoader
import org.classdump.luna.compiler.CompilerSettings
import org.classdump.luna.load.ChunkFactory
import ru.dbotthepony.kommons.gson.AABBTypeAdapter
import ru.dbotthepony.kommons.gson.AABBiTypeAdapter
import ru.dbotthepony.kstarbound.math.AABBTypeAdapter
import ru.dbotthepony.kommons.gson.EitherTypeAdapter
import ru.dbotthepony.kommons.gson.KOptionalTypeAdapter
import ru.dbotthepony.kommons.gson.NothingAdapter
import ru.dbotthepony.kommons.gson.Vector2dTypeAdapter
import ru.dbotthepony.kommons.gson.Vector2fTypeAdapter
import ru.dbotthepony.kommons.gson.Vector2iTypeAdapter
import ru.dbotthepony.kommons.gson.Vector3dTypeAdapter
import ru.dbotthepony.kommons.gson.Vector3fTypeAdapter
import ru.dbotthepony.kommons.gson.Vector3iTypeAdapter
import ru.dbotthepony.kommons.gson.Vector4dTypeAdapter
import ru.dbotthepony.kommons.gson.Vector4fTypeAdapter
import ru.dbotthepony.kommons.gson.Vector4iTypeAdapter
import ru.dbotthepony.kommons.gson.get
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.collect.WeightedList
import ru.dbotthepony.kstarbound.defs.*
import ru.dbotthepony.kstarbound.defs.image.Image
@ -63,6 +53,16 @@ import ru.dbotthepony.kstarbound.json.JsonAdapterTypeFactory
import ru.dbotthepony.kstarbound.json.JsonPatch
import ru.dbotthepony.kstarbound.json.JsonPath
import ru.dbotthepony.kstarbound.json.NativeLegacy
import ru.dbotthepony.kstarbound.math.AABBiTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector2dTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector2fTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector2iTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector3dTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector3fTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector3iTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector4dTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector4fTypeAdapter
import ru.dbotthepony.kstarbound.math.Vector4iTypeAdapter
import ru.dbotthepony.kstarbound.util.BlockableEventLoop
import ru.dbotthepony.kstarbound.util.ExecutorWithScheduler
import ru.dbotthepony.kstarbound.util.Directives

12
src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
View File

@ -20,12 +20,12 @@ import org.lwjgl.system.MemoryUtil.memAddressSafe
import ru.dbotthepony.kommons.collect.forValidRefs
import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kommons.matrix.Matrix3fStack
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2f
import ru.dbotthepony.kommons.vector.Vector4f
import ru.dbotthepony.kstarbound.math.matrix.Matrix3f
import ru.dbotthepony.kstarbound.math.matrix.Matrix3fStack
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector4f
import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNIT
import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNITf
import ru.dbotthepony.kstarbound.Starbound

10
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLShaderProgram.kt
View File

@ -8,11 +8,11 @@ import org.lwjgl.opengl.GL45.*
import ru.dbotthepony.kommons.util.IStruct2f
import ru.dbotthepony.kommons.util.IStruct3f
import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kommons.matrix.Matrix4f
import ru.dbotthepony.kommons.vector.Vector2f
import ru.dbotthepony.kommons.vector.Vector3f
import ru.dbotthepony.kommons.vector.Vector4f
import ru.dbotthepony.kstarbound.math.matrix.Matrix3f
import ru.dbotthepony.kstarbound.math.matrix.Matrix4f
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector3f
import ru.dbotthepony.kstarbound.math.vector.Vector4f
import ru.dbotthepony.kstarbound.client.StarboundClient
import ru.dbotthepony.kstarbound.client.gl.GLObject
import ru.dbotthepony.kstarbound.client.gl.checkForGLError

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt
View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.client.gl.shader
import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kstarbound.math.matrix.Matrix3f
import ru.dbotthepony.kstarbound.client.StarboundClient
import ru.dbotthepony.kstarbound.client.gl.vertex.GeometryType
import ru.dbotthepony.kstarbound.client.gl.vertex.StreamVertexBuilder

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/UberShader.kt
View File

@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL20.GL_FRAGMENT_SHADER
import org.lwjgl.opengl.GL20.GL_VERTEX_SHADER
import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kstarbound.math.matrix.Matrix3f
import ru.dbotthepony.kstarbound.client.StarboundClient
import ru.dbotthepony.kstarbound.client.gl.GLTexture2D
import ru.dbotthepony.kstarbound.client.gl.vertex.StreamVertexBuilder

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/vertex/VertexBuilder.kt
View File

@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL45.GL_UNSIGNED_BYTE
import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.util.IStruct2f
import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kstarbound.math.matrix.Matrix3f
import ru.dbotthepony.kstarbound.client.gl.BufferObject
import java.nio.ByteBuffer
import java.nio.ByteOrder

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/render/Camera.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.client.render
import org.lwjgl.glfw.GLFW.*
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.client.StarboundClient
class Camera(val client: StarboundClient) {

8
src/main/kotlin/ru/dbotthepony/kstarbound/client/render/Font.kt
View File

@ -8,10 +8,10 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
import org.lwjgl.opengl.GL45.*
import org.lwjgl.system.MemoryUtil
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kommons.vector.Vector4f
import ru.dbotthepony.kstarbound.math.matrix.Matrix3f
import ru.dbotthepony.kstarbound.math.AABBi
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector4f
import ru.dbotthepony.kstarbound.client.StarboundClient
import ru.dbotthepony.kstarbound.client.freetype.LoadFlag
import ru.dbotthepony.kstarbound.client.gl.*

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/render/TileRenderer.kt
View File

@ -6,7 +6,7 @@ import com.github.benmanes.caffeine.cache.Scheduler
import org.apache.logging.log4j.LogManager
import org.lwjgl.opengl.GL45.*
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNITf
import ru.dbotthepony.kstarbound.Registries
import ru.dbotthepony.kstarbound.Starbound

6
src/main/kotlin/ru/dbotthepony/kstarbound/client/world/ClientWorld.kt
View File

@ -7,9 +7,9 @@ import it.unimi.dsi.fastutil.longs.LongArraySet
import it.unimi.dsi.fastutil.objects.ReferenceArraySet
import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.vector.Vector2f
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.client.StarboundClient
import ru.dbotthepony.kstarbound.client.render.ConfiguredMesh

7
src/main/kotlin/ru/dbotthepony/kstarbound/defs/Damage.kt
View File

@ -11,12 +11,8 @@ import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kommons.io.readCollection
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeCollection
import ru.dbotthepony.kommons.io.writeDouble
import ru.dbotthepony.kommons.io.writeStruct2d
import ru.dbotthepony.kommons.io.writeStruct2f
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.io.readDouble
import ru.dbotthepony.kstarbound.io.readInternedString
import ru.dbotthepony.kstarbound.io.readMVariant2
@ -30,7 +26,6 @@ import ru.dbotthepony.kstarbound.io.writeStruct2d
import ru.dbotthepony.kstarbound.json.builder.FactoryAdapter
import ru.dbotthepony.kstarbound.json.builder.IStringSerializable
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.json.getAdapter
import ru.dbotthepony.kstarbound.math.Line2d
import ru.dbotthepony.kstarbound.network.syncher.legacyCodec
import ru.dbotthepony.kstarbound.network.syncher.nativeCodec

11
src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt
View File

@ -2,7 +2,6 @@ package ru.dbotthepony.kstarbound.defs
import com.google.common.collect.ImmutableList
import com.google.gson.Gson
import com.google.gson.JsonObject
import com.google.gson.TypeAdapter
import com.google.gson.annotations.JsonAdapter
import com.google.gson.reflect.TypeToken
@ -11,9 +10,9 @@ import com.google.gson.stream.JsonWriter
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kommons.vector.Vector2f
import ru.dbotthepony.kommons.vector.Vector3f
import ru.dbotthepony.kstarbound.math.matrix.Matrix3f
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector3f
import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNITf
import ru.dbotthepony.kstarbound.client.StarboundClient
import ru.dbotthepony.kstarbound.client.gl.vertex.GeometryType
@ -22,8 +21,8 @@ import ru.dbotthepony.kstarbound.defs.image.SpriteReference
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kommons.gson.contains
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.math.Line2d

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/InteractRequest.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.io.readVector2d
import ru.dbotthepony.kstarbound.io.writeStruct2d
import java.io.DataInputStream

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFunction.kt
View File

@ -11,13 +11,13 @@ import com.google.gson.reflect.TypeToken
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kommons.gson.Vector2dTypeAdapter
import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kommons.math.linearInterpolation
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.json.builder.EnumAdapter
import ru.dbotthepony.kstarbound.math.Vector2dTypeAdapter
enum class JsonFunctionInterpolation {
LINEAR {

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/PhysicsForceRegion.kt
View File

@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kommons.io.readCollection
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeCollection
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.io.readDouble
import ru.dbotthepony.kstarbound.io.readInternedString
import ru.dbotthepony.kstarbound.io.readNullableDouble

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt
View File

@ -7,13 +7,13 @@ import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kommons.io.StreamCodec
import ru.dbotthepony.kommons.io.readUUID
import ru.dbotthepony.kommons.io.readVector2d
import ru.dbotthepony.kommons.io.readVector2f
import ru.dbotthepony.kstarbound.math.vector.readVector2d
import ru.dbotthepony.kstarbound.math.vector.readVector2f
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeStruct2d
import ru.dbotthepony.kommons.io.writeStruct2f
import ru.dbotthepony.kommons.io.writeUUID
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.io.readInternedString
import ru.dbotthepony.kstarbound.json.builder.IStringSerializable
import ru.dbotthepony.kstarbound.network.syncher.legacyCodec

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/WorldServerConfig.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
class WorldServerConfig(
val playerStartRegionMaximumTries: Int = 1,

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/HumanoidData.kt
View File

@ -1,12 +1,12 @@
package ru.dbotthepony.kstarbound.defs.actor
import ru.dbotthepony.kommons.io.readVector2d
import ru.dbotthepony.kommons.io.readVector2f
import ru.dbotthepony.kstarbound.math.vector.readVector2d
import ru.dbotthepony.kstarbound.math.vector.readVector2f
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeStruct2d
import ru.dbotthepony.kommons.io.writeStruct2f
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.io.readColor
import ru.dbotthepony.kstarbound.io.readInternedString
import ru.dbotthepony.kstarbound.io.writeColor

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/Personality.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.actor
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
// this is because personality data structure is used inconsistently across original source code

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/MatterManipulatorConfig.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
@JsonFactory

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerConfig.kt
View File

@ -5,8 +5,8 @@ import com.google.common.collect.ImmutableMap
import com.google.common.collect.ImmutableSet
import com.google.gson.JsonObject
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.defs.ActorMovementParameters
import ru.dbotthepony.kstarbound.defs.AssetReference

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/SplashConfig.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.actor.player
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
@JsonFactory

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt
View File

@ -3,10 +3,10 @@ package ru.dbotthepony.kstarbound.defs.animation
import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.defs.AssetPath
import ru.dbotthepony.kstarbound.defs.image.SpriteReference

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/Particle.kt
View File

@ -8,7 +8,7 @@ import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.AssetPath
import ru.dbotthepony.kstarbound.fromJson

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/ParticleConfig.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.animation
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.defs.AssetPath
import ru.dbotthepony.kstarbound.json.builder.IStringSerializable
import ru.dbotthepony.kstarbound.json.builder.JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/DungeonBrush.kt
View File

@ -10,7 +10,7 @@ import com.google.gson.annotations.JsonAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.item.ItemDescriptor

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/DungeonDefinition.kt
View File

@ -11,8 +11,8 @@ import kotlinx.coroutines.async
import kotlinx.coroutines.future.asCompletableFuture
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.tile.NO_DUNGEON_ID
import ru.dbotthepony.kstarbound.json.builder.JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/DungeonDirection.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.dungeon
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.json.builder.IStringSerializable
enum class DungeonDirection(override val jsonName: String, val positionAdjustment: Vector2i) : IStringSerializable {

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/DungeonPart.kt
View File

@ -10,9 +10,9 @@ import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import kotlinx.coroutines.future.await
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kstarbound.math.AABBi
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.defs.image.Image
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.json.stream

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/DungeonTile.kt
View File

@ -10,7 +10,7 @@ import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kommons.gson.contains
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector4i
import ru.dbotthepony.kstarbound.math.vector.Vector4i
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.tile.NO_DUNGEON_ID
import ru.dbotthepony.kstarbound.json.builder.JsonFactory

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/DungeonWorld.kt
View File

@ -5,9 +5,9 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectFunction
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap
import kotlinx.coroutines.future.await
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.AABBi
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.defs.item.ItemDescriptor
import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/ImagePartReader.kt
View File

@ -9,7 +9,7 @@ import org.lwjgl.system.MemoryUtil
import ru.dbotthepony.kommons.arrays.Object2DArray
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.image.Image
import java.lang.ref.Reference

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/PartReader.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.dungeon
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
abstract class PartReader(val part: DungeonPart) : TileMap() {
abstract val size: Vector2i

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/TiledMap.kt
View File

@ -13,7 +13,7 @@ import ru.dbotthepony.kommons.gson.contains
import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.json.jsonArrayOf

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/dungeon/TiledPartReader.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.dungeon
import com.google.common.collect.ImmutableList
import com.google.gson.JsonSyntaxException
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.util.AssetPathStack
import java.util.stream.Stream

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt
View File

@ -24,8 +24,8 @@ import org.lwjgl.stb.STBIReadCallbackI
import org.lwjgl.stb.STBISkipCallback
import org.lwjgl.stb.STBImage
import org.lwjgl.system.MemoryUtil
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kommons.vector.Vector4i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector4i
import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNIT
import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNITi
import ru.dbotthepony.kstarbound.Starbound

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDropConfig.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.item
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.defs.MovementParameters
data class ItemDropConfig(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt
View File

@ -19,7 +19,7 @@ import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kommons.gson.get
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.collect.WeightedList
import ru.dbotthepony.kstarbound.item.ItemStack

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/Anchor.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.`object`
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.defs.tile.TileDefinition
import ru.dbotthepony.kstarbound.world.World

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt
View File

@ -24,12 +24,12 @@ import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kstarbound.json.listAdapter
import ru.dbotthepony.kstarbound.json.stream
import ru.dbotthepony.kstarbound.math.PeriodicFunction
import ru.dbotthepony.kstarbound.util.PeriodicFunction
import ru.dbotthepony.kommons.gson.contains
import ru.dbotthepony.kommons.gson.get
import ru.dbotthepony.kommons.gson.getArray
import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.AssetReference
import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition

10
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectOrientation.kt
View File

@ -13,11 +13,11 @@ import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.gson.clear
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2f
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kstarbound.math.AABBi
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNITf
import ru.dbotthepony.kstarbound.client.render.RenderLayer
import ru.dbotthepony.kstarbound.defs.Drawable

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestParameter.kt
View File

@ -13,13 +13,13 @@ import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kommons.gson.value
import ru.dbotthepony.kommons.io.readCollection
import ru.dbotthepony.kommons.io.readVector2d
import ru.dbotthepony.kommons.io.readVector2f
import ru.dbotthepony.kstarbound.math.vector.readVector2d
import ru.dbotthepony.kstarbound.math.vector.readVector2f
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeCollection
import ru.dbotthepony.kommons.io.writeStruct2d
import ru.dbotthepony.kommons.io.writeStruct2f
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.actor.Gender
import ru.dbotthepony.kstarbound.defs.item.ItemDescriptor

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestTemplate.kt
View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.quest
import com.google.common.collect.ImmutableSet
import com.google.gson.JsonObject
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.defs.AssetPath
import ru.dbotthepony.kstarbound.json.builder.JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderTemplate.kt
View File

@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.defs.image.Image
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.util.WriteOnce

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/AsteroidWorldsConfig.kt
View File

@ -4,8 +4,8 @@ import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap
import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.util.random.AbstractPerlinNoise

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/AsteroidsWorldParameters.kt
View File

@ -4,9 +4,9 @@ import com.google.gson.JsonObject
import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.AABBi
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Globals
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.io.readColor

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/BiomePlaceables.kt
View File

@ -16,7 +16,7 @@ import ru.dbotthepony.kommons.collect.filterNotNull
import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kommons.gson.stream
import ru.dbotthepony.kommons.gson.value
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Registries
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.Starbound

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/BiomePlaceablesDefinition.kt
View File

@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSet
import com.google.gson.JsonElement
import com.google.gson.JsonObject
import ru.dbotthepony.kommons.collect.filterNotNull
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.collect.WeightedList
import ru.dbotthepony.kstarbound.defs.AssetReference

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/CelestialBaseInformation.kt
View File

@ -1,8 +1,8 @@
package ru.dbotthepony.kstarbound.defs.world
import ru.dbotthepony.kommons.io.readVector2i
import ru.dbotthepony.kstarbound.math.vector.readVector2i
import ru.dbotthepony.kommons.io.writeStruct2i
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import java.io.DataInputStream
import java.io.DataOutputStream

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/CelestialConfig.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.world
import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap
import com.google.gson.JsonObject
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.defs.PerlinNoiseParameters
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.util.random.AbstractPerlinNoise

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/CelestialOrbitRegion.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.world
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.collect.WeightedList
import ru.dbotthepony.kstarbound.json.builder.JsonFactory

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/DungeonWorldsConfig.kt
View File

@ -3,8 +3,8 @@ package ru.dbotthepony.kstarbound.defs.world
import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.collect.WeightedList
import ru.dbotthepony.kstarbound.defs.AssetPath

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/FloatingDungeonWorldParameters.kt
View File

@ -4,7 +4,7 @@ import com.google.gson.JsonObject
import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Globals
import ru.dbotthepony.kstarbound.Registries
import ru.dbotthepony.kstarbound.Registry

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/Parallax.kt
View File

@ -5,7 +5,7 @@ import ru.dbotthepony.kommons.collect.filterNotNull
import ru.dbotthepony.kommons.gson.get
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.defs.image.Image
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.util.Directives

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/Sky.kt
View File

@ -7,8 +7,8 @@ import ru.dbotthepony.kommons.gson.contains
import ru.dbotthepony.kommons.gson.get
import ru.dbotthepony.kommons.io.StreamCodec
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Globals
import ru.dbotthepony.kstarbound.Registries
import ru.dbotthepony.kstarbound.Starbound

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/SystemWorldConfig.kt
View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.world
import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.collect.WeightedList
import ru.dbotthepony.kstarbound.json.builder.JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/SystemWorldObjectConfig.kt
View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.world
import com.google.common.collect.ImmutableMap
import com.google.gson.JsonObject
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.defs.WarpAction
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.util.random.nextRange

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/TerrestrialWorldParameters.kt
View File

@ -17,8 +17,8 @@ import ru.dbotthepony.kommons.io.readCollection
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeCollection
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Globals
import ru.dbotthepony.kstarbound.Registries
import ru.dbotthepony.kstarbound.Registry

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/Utils.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.world
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.defs.PerlinNoiseParameters
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.util.random.AbstractPerlinNoise

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/VisitableWorldParameters.kt
View File

@ -17,14 +17,14 @@ import ru.dbotthepony.kommons.gson.value
import ru.dbotthepony.kommons.io.readByteArray
import ru.dbotthepony.kommons.io.readCollection
import ru.dbotthepony.kommons.io.readVarInt
import ru.dbotthepony.kommons.io.readVector2i
import ru.dbotthepony.kstarbound.math.vector.readVector2i
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeByteArray
import ru.dbotthepony.kommons.io.writeCollection
import ru.dbotthepony.kommons.io.writeStruct2i
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.collect.WeightedList
import ru.dbotthepony.kstarbound.fromJson

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/WorldLayout.kt
View File

@ -16,9 +16,9 @@ import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kommons.gson.value
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.AABBi
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Globals
import ru.dbotthepony.kstarbound.Registries
import ru.dbotthepony.kstarbound.Registry

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/WorldStructure.kt
View File

@ -5,10 +5,10 @@ import com.google.common.collect.ImmutableMap
import com.google.gson.JsonElement
import com.google.gson.JsonNull
import com.google.gson.JsonObject
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kstarbound.math.AABBi
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.world.Direction

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/WorldTemplate.kt
View File

@ -3,10 +3,10 @@ package ru.dbotthepony.kstarbound.defs.world
import com.github.benmanes.caffeine.cache.Caffeine
import com.google.gson.JsonObject
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kstarbound.math.AABBi
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Globals
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.Starbound

10
src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt
View File

@ -8,8 +8,8 @@ import ru.dbotthepony.kommons.io.readDouble
import ru.dbotthepony.kommons.io.readFloat
import ru.dbotthepony.kommons.io.readLong
import ru.dbotthepony.kommons.io.readSignedVarInt
import ru.dbotthepony.kommons.io.readVector2d
import ru.dbotthepony.kommons.io.readVector2f
import ru.dbotthepony.kstarbound.math.vector.readVector2d
import ru.dbotthepony.kstarbound.math.vector.readVector2f
import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeDouble
import ru.dbotthepony.kommons.io.writeFloat
@ -18,11 +18,11 @@ import ru.dbotthepony.kommons.io.writeSignedVarInt
import ru.dbotthepony.kommons.io.writeStruct2d
import ru.dbotthepony.kommons.io.writeStruct2f
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.world.ChunkPos
import java.io.DataInput

2
src/main/kotlin/ru/dbotthepony/kstarbound/item/ItemStack.kt
View File

@ -26,7 +26,7 @@ import ru.dbotthepony.kommons.io.writeBinaryString
import ru.dbotthepony.kommons.io.writeVarLong
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.Either
import ru.dbotthepony.kommons.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.Globals
import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.Starbound

8
src/main/kotlin/ru/dbotthepony/kstarbound/lua/Conversions.kt
View File

@ -15,14 +15,14 @@ import org.classdump.luna.runtime.AbstractFunction3
import org.classdump.luna.runtime.ExecutionContext
import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.util.IStruct3i
import ru.dbotthepony.kommons.util.IStruct4i
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2f
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter
import ru.dbotthepony.kstarbound.world.physics.Poly

2
src/main/kotlin/ru/dbotthepony/kstarbound/lua/StateMachine.kt
View File

@ -7,7 +7,7 @@ import org.classdump.luna.runtime.ExecutionContext
import org.classdump.luna.runtime.Resumable
import org.classdump.luna.runtime.UnresolvedControlThrowable
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import java.util.function.Supplier
class StateMachine : Resumable {

2
src/main/kotlin/ru/dbotthepony/kstarbound/lua/bindings/AnimatorBindings.kt
View File

@ -4,7 +4,7 @@ import org.classdump.luna.ByteString
import org.classdump.luna.Table
import ru.dbotthepony.kommons.collect.map
import ru.dbotthepony.kommons.collect.toList
import ru.dbotthepony.kommons.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.lua.LuaEnvironment
import ru.dbotthepony.kstarbound.lua.from
import ru.dbotthepony.kstarbound.lua.get

2
src/main/kotlin/ru/dbotthepony/kstarbound/lua/bindings/EntityBindings.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.lua.bindings
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.lua.LuaEnvironment
import ru.dbotthepony.kstarbound.lua.from
import ru.dbotthepony.kstarbound.lua.get

3
src/main/kotlin/ru/dbotthepony/kstarbound/lua/bindings/UtilityBindings.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.lua.bindings
import org.apache.logging.log4j.LogManager
import org.classdump.luna.ByteString
import org.classdump.luna.Table
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.PerlinNoiseParameters
import ru.dbotthepony.kstarbound.lua.LuaEnvironment
@ -29,7 +29,6 @@ import ru.dbotthepony.kstarbound.util.random.staticRandomLong
import ru.dbotthepony.kstarbound.util.toStarboundString
import java.util.*
import java.util.random.RandomGenerator
import kotlin.math.sign
private val LOGGER = LogManager.getLogger()

2
src/main/kotlin/ru/dbotthepony/kstarbound/lua/bindings/WorldBindings.kt
View File

@ -5,7 +5,7 @@ import org.classdump.luna.Table
import org.classdump.luna.runtime.ExecutionContext
import ru.dbotthepony.kommons.collect.map
import ru.dbotthepony.kommons.collect.toList
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.lua.LuaEnvironment
import ru.dbotthepony.kstarbound.lua.from
import ru.dbotthepony.kstarbound.lua.get

258
src/main/kotlin/ru/dbotthepony/kstarbound/math/AABB.kt
View File

@ -1,43 +1,239 @@
@file:Suppress("unused", "LiftReturnOrAssignment", "MemberVisibilityCanBePrivate")
package ru.dbotthepony.kstarbound.math
import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.util.AABBi
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.world.ChunkPos
import ru.dbotthepony.kommons.math.intersectRectangles
import ru.dbotthepony.kommons.math.rectangleContainsRectangle
import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import kotlin.math.absoluteValue
fun AABB.encasingIntAABB(): AABBi {
return AABBi(
Vector2i(roundByAbsoluteValue(mins.x), roundByAbsoluteValue(mins.y)),
Vector2i(roundByAbsoluteValue(maxs.x), roundByAbsoluteValue(maxs.y)),
)
}
private class Iterator<T>(private val aabb: AABBi, private val factory: (x: Int, y: Int) -> T) : kotlin.collections.Iterator<T> {
private var x = aabb.mins.x
private var y = aabb.mins.y
private var next = true
override fun hasNext(): Boolean {
return next
/**
* Axis Aligned Bounding Box, represented by two points, [mins] as lowermost corner of BB,
* and [maxs] as uppermost corner of BB
*/
data class AABB(val mins: Vector2d, val maxs: Vector2d) {
init {
require(mins.x <= maxs.x) { "mins.x ${mins.x} is more than maxs.x ${maxs.x}" }
require(mins.y <= maxs.y) { "mins.y ${mins.y} is more than maxs.y ${maxs.y}" }
}
override fun next(): T {
if (!next)
throw IllegalStateException()
operator fun plus(other: AABB) = AABB(mins + other.mins, maxs + other.maxs)
operator fun minus(other: AABB) = AABB(mins - other.mins, maxs - other.maxs)
operator fun times(other: AABB) = AABB(mins * other.mins, maxs * other.maxs)
operator fun div(other: AABB) = AABB(mins / other.mins, maxs / other.maxs)
val obj = factory.invoke(x++, y)
operator fun plus(other: Vector2d) = AABB(mins + other, maxs + other)
operator fun minus(other: Vector2d) = AABB(mins - other, maxs - other)
operator fun times(other: Vector2d) = AABB(mins * other, maxs * other)
operator fun div(other: Vector2d) = AABB(mins / other, maxs / other)
if (x > aabb.maxs.x) {
x = aabb.mins.x
operator fun times(other: Double) = AABB(mins * other, maxs * other)
operator fun div(other: Double) = AABB(mins / other, maxs / other)
if (++y > aabb.maxs.y) {
next = false
}
val xSpan get() = maxs.x - mins.x
val ySpan get() = maxs.y - mins.y
val centre get() = (mins + maxs) * 0.5
val A get() = mins
val B get() = Vector2d(mins.x, maxs.y)
val C get() = maxs
val D get() = Vector2d(maxs.x, mins.y)
val bottomLeft get() = A
val topLeft get() = B
val topRight get() = C
val bottomRight get() = D
val width get() = maxs.x - mins.x
val height get() = maxs.y - mins.y
val extents get() = Vector2d(width * 0.5, height * 0.5)
val diameter get() = mins.distance(maxs)
val radius get() = diameter / 2.0
val perimeter get() = (xSpan + ySpan) * 2.0
fun isInside(point: IStruct2d): Boolean {
return point.component1() in mins.x .. maxs.x && point.component2() in mins.y .. maxs.y
}
fun isInside(x: Double, y: Double): Boolean {
return x in mins.x .. maxs.x && y in mins.y .. maxs.y
}
operator fun contains(point: IStruct2d) = isInside(point)
/**
* Checks whenever is this AABB intersect with [other]
*
* This method consider they intersect even if only one of axis are equal
*/
fun intersect(other: AABB): Boolean {
return intersectRectangles(mins, maxs, other.mins, other.maxs)
}
/**
* Returns whenever [other] is contained (encased) inside this AABB
*/
operator fun contains(other: AABB): Boolean {
return rectangleContainsRectangle(mins, maxs, other.mins, other.maxs)
}
/**
* Checks whenever is this AABB intersect with [other]
*
* This method DOES NOT consider they intersect if only one of axis are equal
*/
fun intersectWeak(other: AABB): Boolean {
if (maxs.x == other.mins.x || mins.x == other.maxs.x || maxs.y == other.mins.y || mins.y == other.maxs.y)
return false
return intersectRectangles(mins, maxs, other.mins, other.maxs)
}
fun intersectionDepth(other: AABB): Vector2d {
val xDepth: Double
val yDepth: Double
val thisCentre = centre
val otherCentre = other.centre
if (thisCentre.x > otherCentre.x) {
// считаем, что мы вошли справа
xDepth = mins.x - other.maxs.x
} else {
// считаем, что мы вошли слева
xDepth = maxs.x - other.mins.x
}
return obj
if (thisCentre.y > otherCentre.y) {
// считаем, что мы вошли сверху
yDepth = mins.y - other.maxs.y
} else {
// считаем, что мы вошли снизу
yDepth = maxs.x - other.mins.x
}
return Vector2d(xDepth, yDepth)
}
fun distance(other: AABB): Double {
val intersectX: Boolean
val intersectY: Boolean
if (ySpan <= other.ySpan)
intersectY = mins.y in other.mins.y .. other.maxs.y || maxs.y in other.mins.y .. other.maxs.y
else
intersectY = other.mins.y in mins.y .. maxs.y || other.maxs.y in mins.y .. maxs.y
if (xSpan <= other.xSpan)
intersectX = mins.x in other.mins.x .. other.maxs.x || maxs.x in other.mins.x .. other.maxs.x
else
intersectX = other.mins.x in mins.x .. maxs.x || other.maxs.x in mins.x .. maxs.x
if (intersectY && intersectX) {
return 0.0
}
if (intersectX) {
return (mins.y - other.maxs.y).absoluteValue.coerceAtMost((maxs.y - other.mins.y).absoluteValue)
} else {
return (mins.x - other.maxs.x).absoluteValue.coerceAtMost((maxs.x - other.mins.x).absoluteValue)
}
}
fun pushOutFrom(other: AABB): Vector2d {
if (!intersect(other))
return Vector2d.ZERO
val depth = intersectionDepth(other)
if (depth.x.absoluteValue < depth.y.absoluteValue) {
return Vector2d(x = depth.x)
} else {
return Vector2d(y = depth.y)
}
}
/**
* Returns AABB which contains both AABBs
*/
fun combine(other: AABB): AABB {
if (contains(other)) return this
val minX = mins.x.coerceAtMost(other.mins.x)
val minY = mins.y.coerceAtMost(other.mins.y)
val maxX = maxs.x.coerceAtLeast(other.maxs.x)
val maxY = maxs.y.coerceAtLeast(other.maxs.y)
return AABB(Vector2d(minX, minY), Vector2d(maxX, maxY))
}
/**
* Returns AABB which contains this AABB and specified point
*/
fun expand(x: Double, y: Double): AABB {
if (isInside(x, y))
return this
return AABB(
mins.coerceAtMost(x, y),
maxs.coerceAtLeast(x, y)
)
}
fun expand(value: IStruct2d) = expand(value.component1(), value.component2())
fun padded(value: IStruct2d) = expand(value.component1(), value.component2())
fun padded(x: Double, y: Double) = expand(x, y)
/**
* Returns AABB which edges are expanded by [x] and [y] along their normals
*/
fun enlarge(x: Double, y: Double): AABB {
if (x == 0.0 && y == 0.0) return this
return AABB(
Vector2d(mins.x - x, mins.y - y),
Vector2d(maxs.x + x, maxs.y + y),
)
}
fun encasingIntAABB(): AABBi {
return AABBi(
Vector2i(roundByAbsoluteValue(mins.x), roundByAbsoluteValue(mins.y)),
Vector2i(roundByAbsoluteValue(maxs.x), roundByAbsoluteValue(maxs.y)),
)
}
companion object {
/**
* Rectangle with given [width] and [height]
*/
fun rectangle(pos: IStruct2d, width: Double, height: Double = width): AABB {
val (x, y) = pos
return AABB(
Vector2d(x - width / 2.0, y - height / 2.0),
Vector2d(x + width / 2.0, y + height / 2.0),
)
}
/**
* Rectangle with given [width] * 2 and [height] * 2
*/
fun withSide(pos: IStruct2d, width: Double, height: Double = width): AABB {
val (x, y) = pos
return AABB(
Vector2d(x - width, y - height),
Vector2d(x + width, y + height),
)
}
@JvmField val ZERO = AABB(Vector2d.ZERO, Vector2d.ZERO)
}
}
val AABBi.vectors: kotlin.collections.Iterator<Vector2i> get() = Iterator(this, ::Vector2i)
val AABBi.chunkPositions: kotlin.collections.Iterator<ChunkPos> get() = Iterator(this, ::ChunkPos)

38
src/main/kotlin/ru/dbotthepony/kstarbound/math/AABBTypeAdapter.kt Normal file
View File

@ -0,0 +1,38 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector2d
object AABBTypeAdapter : TypeAdapter<AABB>() {
override fun write(out: JsonWriter, value: AABB) {
`out`.beginArray()
`out`.value(value.mins.x)
`out`.value(value.mins.y)
`out`.value(value.maxs.x)
`out`.value(value.maxs.y)
`out`.endArray()
}
override fun read(`in`: JsonReader): AABB {
`in`.beginArray()
val minX = `in`.nextDouble()
val minY = `in`.nextDouble()
val maxX = `in`.nextDouble()
val maxY = `in`.nextDouble()
`in`.endArray()
val xMins = minX.coerceAtMost(maxX)
val xMaxs = maxX.coerceAtLeast(minX)
val yMins = minY.coerceAtMost(maxY)
val yMaxs = maxX.coerceAtLeast(minY)
return AABB(
Vector2d(xMins, yMins),
Vector2d(xMaxs, yMaxs),
)
}
}

147
src/main/kotlin/ru/dbotthepony/kstarbound/math/AABBi.kt Normal file
View File

@ -0,0 +1,147 @@
package ru.dbotthepony.kstarbound.math
import ru.dbotthepony.kommons.math.intersectRectangles
import ru.dbotthepony.kommons.math.rectangleContainsRectangle
import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kstarbound.math.vector.Vector2i
data class AABBi(val mins: Vector2i, val maxs: Vector2i) {
init {
require(mins.x <= maxs.x) { "mins.x ${mins.x} is more than maxs.x ${maxs.x}" }
require(mins.y <= maxs.y) { "mins.y ${mins.y} is more than maxs.y ${maxs.y}" }
}
operator fun plus(other: AABBi) = AABBi(mins + other.mins, maxs + other.maxs)
operator fun minus(other: AABBi) = AABBi(mins - other.mins, maxs - other.maxs)
operator fun times(other: AABBi) = AABBi(mins * other.mins, maxs * other.maxs)
operator fun div(other: AABBi) = AABBi(mins / other.mins, maxs / other.maxs)
operator fun plus(other: Vector2i) = AABBi(mins + other, maxs + other)
operator fun minus(other: Vector2i) = AABBi(mins - other, maxs - other)
operator fun times(other: Vector2i) = AABBi(mins * other, maxs * other)
operator fun div(other: Vector2i) = AABBi(mins / other, maxs / other)
operator fun times(other: Int) = AABBi(mins * other, maxs * other)
operator fun div(other: Int) = AABBi(mins / other, maxs / other)
val xSpan get() = maxs.x - mins.x
val ySpan get() = maxs.y - mins.y
val centre get() = (mins.toDoubleVector() + maxs.toDoubleVector()) * 0.5
val A get() = mins
val B get() = Vector2i(mins.x, maxs.y)
val C get() = maxs
val D get() = Vector2i(maxs.x, mins.y)
val bottomLeft get() = A
val topLeft get() = B
val topRight get() = C
val bottomRight get() = D
val width get() = (maxs.x - mins.x) / 2
val height get() = (maxs.y - mins.y) / 2
val diameter get() = mins.distance(maxs)
val radius get() = diameter / 2.0
val perimeter get() = (xSpan + ySpan) * 2
fun isInside(point: IStruct2i): Boolean {
return point.component1() in mins.x .. maxs.x && point.component2() in mins.y .. maxs.y
}
fun isInside(x: Int, y: Int): Boolean {
return x in mins.x .. maxs.x && y in mins.y .. maxs.y
}
operator fun contains(point: IStruct2i) = isInside(point)
/**
* Checks whenever is this AABBi intersect with [other]
*
* This method consider they intersect even if only one of axis are equal
*/
fun intersect(other: AABBi): Boolean {
return intersectRectangles(mins, maxs, other.mins, other.maxs)
}
/**
* Returns whenever [other] is contained (encased) inside this AABBi
*/
operator fun contains(other: AABBi): Boolean {
return rectangleContainsRectangle(mins, maxs, other.mins, other.maxs)
}
/**
* Checks whenever is this AABB intersect with [other]
*
* This method DOES NOT consider they intersect if only one of axis are equal
*/
fun intersectWeak(other: AABBi): Boolean {
if (maxs.x == other.mins.x || mins.x == other.maxs.x || maxs.y == other.mins.y || mins.y == other.maxs.y)
return false
return intersectRectangles(mins, maxs, other.mins, other.maxs)
}
fun toDoubleAABB() = AABB(mins.toDoubleVector(), maxs.toDoubleVector())
/**
* Returns AABB which contains this AABB and specified point
*/
fun expand(x: Int, y: Int): AABBi {
if (isInside(x, y))
return this
return AABBi(
mins.coerceAtMost(x, y),
maxs.coerceAtLeast(x, y)
)
}
fun padded(x: Int, y: Int) = expand(x, y)
fun padded(value: IStruct2i) = expand(value.component1(), value.component2())
fun expand(value: IStruct2i) = expand(value.component1(), value.component2())
/**
* Returns AABB which contains both AABBs
*/
fun combine(other: AABBi): AABBi {
if (contains(other)) return this
val minX = mins.x.coerceAtMost(other.mins.x)
val minY = mins.y.coerceAtMost(other.mins.y)
val maxX = maxs.x.coerceAtLeast(other.maxs.x)
val maxY = maxs.y.coerceAtLeast(other.maxs.y)
return AABBi(Vector2i(minX, minY), Vector2i(maxX, maxY))
}
companion object {
/**
* Rectangle with given [width] and [height]
*/
fun rectangle(pos: IStruct2i, width: Int, height: Int = width): AABBi {
val (x, y) = pos
return AABBi(
Vector2i(x - width / 2, y - height / 2),
Vector2i(x + width / 2, y + height / 2),
)
}
/**
* Rectangle with given [width] * 2 and [height] * 2
*/
fun withSide(pos: IStruct2i, width: Int, height: Int = width): AABBi {
val (x, y) = pos
return AABBi(
Vector2i(x - width, y - height),
Vector2i(x + width, y + height),
)
}
@JvmField val ZERO = AABBi(Vector2i.ZERO, Vector2i.ZERO)
}
}

37
src/main/kotlin/ru/dbotthepony/kstarbound/math/AABBiTypeAdapter.kt Normal file
View File

@ -0,0 +1,37 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector2i
object AABBiTypeAdapter : TypeAdapter<AABBi>() {
override fun write(out: JsonWriter, value: AABBi) {
`out`.beginArray()
`out`.value(value.mins.x)
`out`.value(value.mins.y)
`out`.value(value.maxs.x)
`out`.value(value.maxs.y)
`out`.endArray()
}
override fun read(`in`: JsonReader): AABBi {
`in`.beginArray()
val minX = `in`.nextInt()
val minY = `in`.nextInt()
val maxX = `in`.nextInt()
val maxY = `in`.nextInt()
`in`.endArray()
val xMins = minX.coerceAtMost(maxX)
val xMaxs = maxX.coerceAtLeast(minX)
val yMins = minY.coerceAtMost(maxY)
val yMaxs = maxX.coerceAtLeast(minY)
return AABBi(
Vector2i(xMins, yMins),
Vector2i(xMaxs, yMaxs),
)
}
}

3
src/main/kotlin/ru/dbotthepony/kstarbound/math/Line2d.kt
View File

@ -7,11 +7,10 @@ import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.io.readVector2d
import ru.dbotthepony.kstarbound.io.writeStruct2d
import ru.dbotthepony.kstarbound.json.getAdapter
import ru.dbotthepony.kstarbound.world.physics.Poly
import java.io.DataInputStream
import java.io.DataOutputStream
import kotlin.math.absoluteValue

5
src/main/kotlin/ru/dbotthepony/kstarbound/math/Utils.kt
View File

@ -3,10 +3,7 @@ package ru.dbotthepony.kstarbound.math
import kotlin.math.PI
import kotlin.math.absoluteValue
/**
* Выполняет преобразование [value] типа [Double] в [Int] так,
* что выходной [Int] всегда будет больше или равен по модулю [value]
*/
fun roundByAbsoluteValue(value: Double): Int {
if (value > 0.0) {
if (value % 1.0 != 0.0) {

26
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector2dTypeAdapter.kt Normal file
View File

@ -0,0 +1,26 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector2d
object Vector2dTypeAdapter : TypeAdapter<Vector2d>() {
override fun write(out: JsonWriter, value: Vector2d) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector2d {
`in`.beginArray()
val x = `in`.nextDouble()
val y = `in`.nextDouble()
`in`.endArray()
return Vector2d(x, y)
}
}

26
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector2fTypeAdapter.kt Normal file
View File

@ -0,0 +1,26 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector2f
object Vector2fTypeAdapter : TypeAdapter<Vector2f>() {
override fun write(out: JsonWriter, value: Vector2f) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector2f {
`in`.beginArray()
val x = `in`.nextDouble().toFloat()
val y = `in`.nextDouble().toFloat()
`in`.endArray()
return Vector2f(x, y)
}
}

26
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector2iTypeAdapter.kt Normal file
View File

@ -0,0 +1,26 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector2i
object Vector2iTypeAdapter : TypeAdapter<Vector2i>() {
override fun write(out: JsonWriter, value: Vector2i) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector2i {
`in`.beginArray()
val x = `in`.nextInt()
val y = `in`.nextInt()
`in`.endArray()
return Vector2i(x, y)
}
}

28
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector3dTypeAdapter.kt Normal file
View File

@ -0,0 +1,28 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector3d
object Vector3dTypeAdapter : TypeAdapter<Vector3d>() {
override fun write(out: JsonWriter, value: Vector3d) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.value(value.z)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector3d {
`in`.beginArray()
val x = `in`.nextDouble()
val y = `in`.nextDouble()
val z = `in`.nextDouble()
`in`.endArray()
return Vector3d(x, y, z)
}
}

28
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector3fTypeAdapter.kt Normal file
View File

@ -0,0 +1,28 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector3f
object Vector3fTypeAdapter : TypeAdapter<Vector3f>() {
override fun write(out: JsonWriter, value: Vector3f) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.value(value.z)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector3f {
`in`.beginArray()
val x = `in`.nextDouble().toFloat()
val y = `in`.nextDouble().toFloat()
val z = `in`.nextDouble().toFloat()
`in`.endArray()
return Vector3f(x, y, z)
}
}

28
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector3iTypeAdapter.kt Normal file
View File

@ -0,0 +1,28 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector3i
object Vector3iTypeAdapter : TypeAdapter<Vector3i>() {
override fun write(out: JsonWriter, value: Vector3i) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.value(value.z)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector3i {
`in`.beginArray()
val x = `in`.nextInt()
val y = `in`.nextInt()
val z = `in`.nextInt()
`in`.endArray()
return Vector3i(x, y, z)
}
}

30
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector4dTypeAdapter.kt Normal file
View File

@ -0,0 +1,30 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector4d
object Vector4dTypeAdapter : TypeAdapter<Vector4d>() {
override fun write(out: JsonWriter, value: Vector4d) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.value(value.z)
`out`.value(value.w)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector4d {
`in`.beginArray()
val x = `in`.nextDouble()
val y = `in`.nextDouble()
val z = `in`.nextDouble()
val w = `in`.nextDouble()
`in`.endArray()
return Vector4d(x, y, z, w)
}
}

30
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector4fTypeAdapter.kt Normal file
View File

@ -0,0 +1,30 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector4f
object Vector4fTypeAdapter : TypeAdapter<Vector4f>() {
override fun write(out: JsonWriter, value: Vector4f) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.value(value.z)
`out`.value(value.w)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector4f {
`in`.beginArray()
val x = `in`.nextDouble().toFloat()
val y = `in`.nextDouble().toFloat()
val z = `in`.nextDouble().toFloat()
val w = `in`.nextDouble().toFloat()
`in`.endArray()
return Vector4f(x, y, z, w)
}
}

30
src/main/kotlin/ru/dbotthepony/kstarbound/math/Vector4iTypeAdapter.kt Normal file
View File

@ -0,0 +1,30 @@
package ru.dbotthepony.kstarbound.math
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.math.vector.Vector4i
object Vector4iTypeAdapter : TypeAdapter<Vector4i>() {
override fun write(out: JsonWriter, value: Vector4i) {
`out`.beginArray()
`out`.value(value.x)
`out`.value(value.y)
`out`.value(value.z)
`out`.value(value.w)
`out`.endArray()
}
override fun read(`in`: JsonReader): Vector4i {
`in`.beginArray()
val x = `in`.nextInt()
val y = `in`.nextInt()
val z = `in`.nextInt()
val w = `in`.nextInt()
`in`.endArray()
return Vector4i(x, y, z, w)
}
}

310
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix2d.kt Normal file
View File

@ -0,0 +1,310 @@
package ru.dbotthepony.kstarbound.math.matrix
import ru.dbotthepony.kommons.arrays.Double2DArray
import ru.dbotthepony.kommons.arrays.mulMatrixComponents
import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import java.nio.ByteBuffer
import java.nio.DoubleBuffer
sealed class Matrix2d : Double2DArray() {
abstract var c00: Double
abstract var c01: Double
abstract var c10: Double
abstract var c11: Double
fun c00() = c00
fun c00(value: Double): Matrix2d { c00 = value; return this }
fun c01() = c01
fun c01(value: Double): Matrix2d { c01 = value; return this }
fun c10() = c10
fun c10(value: Double): Matrix2d { c10 = value; return this }
fun c11() = c11
fun c11(value: Double): Matrix2d { c11 = value; return this }
var r00: Double get() = c00; set(value) { c00 = value } // row 0 column 0
var r01: Double get() = c10; set(value) { c10 = value } // row 1 column 0
var r10: Double get() = c01; set(value) { c01 = value } // row 0 column 1
var r11: Double get() = c11; set(value) { c11 = value } // row 1 column 1
fun r00() = r00
fun r00(value: Double): Matrix2d { r00 = value; return this }
fun r01() = r01
fun r01(value: Double): Matrix2d { r01 = value; return this }
fun r10() = r10
fun r10(value: Double): Matrix2d { r10 = value; return this }
fun r11() = r11
fun r11(value: Double): Matrix2d { r11 = value; return this }
final override val transposed get() =
columnMajor(
c00 = r00,
c01 = r01,
c10 = r10,
c11 = r11,
)
final override val rows: Int
get() = 2
final override val columns: Int
get() = 2
final override fun get(column: Int, row: Int): Double {
return when (row or (column shl 1)) {
C00 -> c00
C01 -> c01
C10 -> c10
C11 -> c11
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
override fun set(column: Int, row: Int, value: Double) {
when (column or (row shl 2)) {
C00 -> c00 = value
C01 -> c01 = value
C10 -> c10 = value
C11 -> c11 = value
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
final override val determinant: Double
get() = super.determinant!!
final override val cofactorMatrix
get() = from(super.cofactorMatrix!!)
final override val adjugateMatrix
get() = from(super.adjugateMatrix!!)
final override val inversed
get() = super.inversed?.let { from(it) }
fun mul(other: Matrix2d): Matrix2d {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
this.c00 = c00
this.c01 = c01
this.c10 = c10
this.c11 = c11
return this
}
fun mulIntoOther(other: Matrix2d): Matrix2d {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
other.c00 = c00
other.c01 = c01
other.c10 = c10
other.c11 = c11
return other
}
fun mul(
c00: Double = 1.0,
c01: Double = 0.0,
c10: Double = 0.0,
c11: Double = 1.0,
): Matrix2d {
val fc00 = this.c00 * c00 + this.c10 * c01
val fc01 = this.c01 * c00 + this.c11 * c01
val fc10 = this.c00 * c10 + this.c10 * c11
val fc11 = this.c01 * c10 + this.c11 * c11
this.c00 = fc00
this.c01 = fc01
this.c10 = fc10
this.c11 = fc11
return this
}
fun mulIntoThis(
c00: Double = 1.0,
c01: Double = 0.0,
c10: Double = 0.0,
c11: Double = 1.0,
): Matrix2d {
val fc00 = c00 * this.c00 + c10 * this.c01
val fc01 = c01 * this.c00 + c11 * this.c01
val fc10 = c00 * this.c10 + c10 * this.c11
val fc11 = c01 * this.c10 + c11 * this.c11
this.c00 = fc00
this.c01 = fc01
this.c10 = fc10
this.c11 = fc11
return this
}
final override fun add(other: Double): Matrix2d {
return super.add(other) as Matrix2d
}
final override fun sub(other: Double): Matrix2d {
return super.sub(other) as Matrix2d
}
final override fun mul(other: Double): Matrix2d {
return super.mul(other) as Matrix2d
}
final override fun div(other: Double): Matrix2d {
return super.div(other) as Matrix2d
}
final override fun add(other: Double2DArray): Matrix2d {
return super.add(other) as Matrix2d
}
final override fun sub(other: Double2DArray): Matrix2d {
return super.sub(other) as Matrix2d
}
fun to3d(filler: Double) = Matrix3d.from(this, filler)
fun to3d() = Matrix3d.from(this)
fun to4d(filler: Double) = Matrix4d.from(this, filler)
fun to4d() = Matrix4d.from(this)
fun copy(): Matrix2d {
return Impl(c00, c01, c10, c11)
}
@JvmOverloads
fun scale(x: Double = 1.0, y: Double = 1.0): Matrix2d {
return mul(c00 = x, c11 = y)
}
fun scale(value: IStruct2d) = scale(value.component1(), value.component2())
fun scale(value: Vector2d) = scale(value.component1(), value.component2())
@JvmOverloads
fun preScale(x: Double = 1.0, y: Double = 1.0): Matrix2d {
return mulIntoThis(c00 = x, c11 = y)
}
fun preScale(value: IStruct2d) = preScale(value.component1(), value.component2())
fun preScale(value: Vector2d) = preScale(value.component1(), value.component2())
fun translate(x: Double) = mul(c10 = x)
fun preTranslate(x: Double) = mulIntoThis(c10 = x)
private data class Impl(
override var c00: Double = 1.0,
override var c01: Double = 0.0,
override var c10: Double = 0.0,
override var c11: Double = 1.0,
) : Matrix2d() {
override fun toString(): String {
return "Matrix2d" + super.toString()
}
override fun equals(other: Any?): Boolean {
if (other !is Matrix2d) return false
return this === other || c00 == other.c00 &&
c01 == other.c01 &&
c10 == other.c10 &&
c11 == other.c11
}
}
private class View(private val parent: Matrix2d) : Matrix2d() {
override var c00: Double get() = parent.c00; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c01: Double get() = parent.c01; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c10: Double get() = parent.c10; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c11: Double get() = parent.c11; set(_) { throw UnsupportedOperationException("Read-Only view") }
override fun set(column: Int, row: Int, value: Double) {
throw UnsupportedOperationException("Read-Only view")
}
override fun equals(other: Any?): Boolean {
return other === this || parent == other
}
override fun hashCode(): Int {
return parent.hashCode()
}
override fun toString(): String {
return "View = $parent"
}
}
companion object {
@JvmStatic
fun all(value: Double) = construct2(value, Companion::columnMajor)
@JvmStatic
fun zero() = all(0.0)
@JvmStatic
fun identity() = columnMajor()
@JvmStatic
fun unmodifiable(value: Matrix2d): Matrix2d {
if (value is View)
return value
else
return View(value)
}
@JvmStatic
fun columnMajor(
c00: Double = 1.0,
c01: Double = 0.0,
c10: Double = 0.0,
c11: Double = 1.0,
): Matrix2d {
return Impl(c00, c01, c10, c11)
}
@JvmStatic
fun rowMajor(
r00: Double = 1.0, r01: Double = 0.0,
r10: Double = 0.0, r11: Double = 1.0,
): Matrix2d {
return Impl(
r00, r10,
r01, r11,
)
}
@JvmStatic
fun from(matrix: Double2DArray, filler: Double) = construct2(matrix, Double2DArray::get, Companion::columnMajor, filler)
@JvmStatic
fun from(matrix: Double2DArray) = construct2(matrix, Double2DArray::get, Companion::columnMajor, 0.0)
@JvmStatic
fun from(matrix: Matrix2d) = construct2(matrix, Double2DArray::get, Companion::columnMajor)
@JvmStatic
fun from(matrix: Matrix3d) = construct2(matrix, Double2DArray::get, Companion::columnMajor)
@JvmStatic
fun from(matrix: Matrix4d) = construct2(matrix, Double2DArray::get, Companion::columnMajor)
@JvmStatic
fun fromTransposed(matrix: Double2DArray) = construct2(matrix, Double2DArray::get, Companion::rowMajor, 0.0)
@JvmStatic
fun fromTransposed(matrix: Double2DArray, filler: Double) = construct2(matrix, Double2DArray::get, Companion::rowMajor, filler)
@JvmStatic
fun fromTransposed(matrix: Matrix2d) = construct2(matrix, Double2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromTransposed(matrix: Matrix3d) = construct2(matrix, Double2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromTransposed(matrix: Matrix4d) = construct2(matrix, Double2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromColumnMajor(buffer: DoubleBuffer) = construct2(buffer, DoubleBuffer::get, Companion::columnMajor)
@JvmStatic
fun fromColumnMajor(buffer: ByteBuffer) = construct2(buffer, ByteBuffer::getDouble, Companion::columnMajor)
@JvmStatic
fun fromRowMajor(buffer: DoubleBuffer) = construct2(buffer, DoubleBuffer::get, Companion::rowMajor)
@JvmStatic
fun fromRowMajor(buffer: ByteBuffer) = construct2(buffer, ByteBuffer::getDouble, Companion::rowMajor)
// kotlin compiler bug? it refuses to use TABLESWITCH if these are inlined
const val C00 = (0 or (0 shl 1))
const val C01 = (0 or (1 shl 1))
const val C10 = (1 or (0 shl 1))
const val C11 = (1 or (1 shl 1))
}
}

310
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix2f.kt Normal file
View File

@ -0,0 +1,310 @@
package ru.dbotthepony.kstarbound.math.matrix
import ru.dbotthepony.kommons.arrays.Float2DArray
import ru.dbotthepony.kommons.arrays.mulMatrixComponents
import ru.dbotthepony.kommons.util.IStruct2f
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import java.nio.ByteBuffer
import java.nio.FloatBuffer
sealed class Matrix2f : Float2DArray() {
abstract var c00: Float
abstract var c01: Float
abstract var c10: Float
abstract var c11: Float
fun c00() = c00
fun c00(value: Float): Matrix2f { c00 = value; return this }
fun c01() = c01
fun c01(value: Float): Matrix2f { c01 = value; return this }
fun c10() = c10
fun c10(value: Float): Matrix2f { c10 = value; return this }
fun c11() = c11
fun c11(value: Float): Matrix2f { c11 = value; return this }
var r00: Float get() = c00; set(value) { c00 = value } // row 0 column 0
var r01: Float get() = c10; set(value) { c10 = value } // row 1 column 0
var r10: Float get() = c01; set(value) { c01 = value } // row 0 column 1
var r11: Float get() = c11; set(value) { c11 = value } // row 1 column 1
fun r00() = r00
fun r00(value: Float): Matrix2f { r00 = value; return this }
fun r01() = r01
fun r01(value: Float): Matrix2f { r01 = value; return this }
fun r10() = r10
fun r10(value: Float): Matrix2f { r10 = value; return this }
fun r11() = r11
fun r11(value: Float): Matrix2f { r11 = value; return this }
final override val transposed get() =
columnMajor(
c00 = r00,
c01 = r01,
c10 = r10,
c11 = r11,
)
final override val rows: Int
get() = 2
final override val columns: Int
get() = 2
final override fun get(column: Int, row: Int): Float {
return when (row or (column shl 1)) {
C00 -> c00
C01 -> c01
C10 -> c10
C11 -> c11
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
override fun set(column: Int, row: Int, value: Float) {
when (column or (row shl 2)) {
C00 -> c00 = value
C01 -> c01 = value
C10 -> c10 = value
C11 -> c11 = value
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
final override val determinant: Float
get() = super.determinant!!
final override val cofactorMatrix
get() = from(super.cofactorMatrix!!)
final override val adjugateMatrix
get() = from(super.adjugateMatrix!!)
final override val inversed
get() = super.inversed?.let { from(it) }
fun mul(other: Matrix2f): Matrix2f {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
this.c00 = c00
this.c01 = c01
this.c10 = c10
this.c11 = c11
return this
}
fun mulIntoOther(other: Matrix2f): Matrix2f {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
other.c00 = c00
other.c01 = c01
other.c10 = c10
other.c11 = c11
return other
}
fun mul(
c00: Float = 1f,
c01: Float = 0f,
c10: Float = 0f,
c11: Float = 1f,
): Matrix2f {
val fc00 = this.c00 * c00 + this.c10 * c01
val fc01 = this.c01 * c00 + this.c11 * c01
val fc10 = this.c00 * c10 + this.c10 * c11
val fc11 = this.c01 * c10 + this.c11 * c11
this.c00 = fc00
this.c01 = fc01
this.c10 = fc10
this.c11 = fc11
return this
}
fun mulIntoThis(
c00: Float = 1f,
c01: Float = 0f,
c10: Float = 0f,
c11: Float = 1f,
): Matrix2f {
val fc00 = c00 * this.c00 + c10 * this.c01
val fc01 = c01 * this.c00 + c11 * this.c01
val fc10 = c00 * this.c10 + c10 * this.c11
val fc11 = c01 * this.c10 + c11 * this.c11
this.c00 = fc00
this.c01 = fc01
this.c10 = fc10
this.c11 = fc11
return this
}
final override fun add(other: Float): Matrix2f {
return super.add(other) as Matrix2f
}
final override fun sub(other: Float): Matrix2f {
return super.sub(other) as Matrix2f
}
final override fun mul(other: Float): Matrix2f {
return super.mul(other) as Matrix2f
}
final override fun div(other: Float): Matrix2f {
return super.div(other) as Matrix2f
}
final override fun add(other: Float2DArray): Matrix2f {
return super.add(other) as Matrix2f
}
final override fun sub(other: Float2DArray): Matrix2f {
return super.sub(other) as Matrix2f
}
fun to3f(filler: Float) = Matrix3f.from(this, filler)
fun to3f() = Matrix3f.from(this)
fun to4f(filler: Float) = Matrix4f.from(this, filler)
fun to4f() = Matrix4f.from(this)
fun copy(): Matrix2f {
return Impl(c00, c01, c10, c11)
}
@JvmOverloads
fun scale(x: Float = 1f, y: Float = 1f): Matrix2f {
return mul(c00 = x, c11 = y)
}
fun scale(value: IStruct2f) = scale(value.component1(), value.component2())
fun scale(value: Vector2f) = scale(value.component1(), value.component2())
@JvmOverloads
fun preScale(x: Float = 1f, y: Float = 1f): Matrix2f {
return mulIntoThis(c00 = x, c11 = y)
}
fun preScale(value: IStruct2f) = preScale(value.component1(), value.component2())
fun preScale(value: Vector2f) = preScale(value.component1(), value.component2())
fun translate(x: Float) = mul(c10 = x)
fun preTranslate(x: Float) = mulIntoThis(c10 = x)
private data class Impl(
override var c00: Float = 1f,
override var c01: Float = 0f,
override var c10: Float = 0f,
override var c11: Float = 1f,
) : Matrix2f() {
override fun toString(): String {
return "Matrix2f" + super.toString()
}
override fun equals(other: Any?): Boolean {
if (other !is Matrix2f) return false
return this === other || c00 == other.c00 &&
c01 == other.c01 &&
c10 == other.c10 &&
c11 == other.c11
}
}
private class View(private val parent: Matrix2f) : Matrix2f() {
override var c00: Float get() = parent.c00; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c01: Float get() = parent.c01; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c10: Float get() = parent.c10; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c11: Float get() = parent.c11; set(_) { throw UnsupportedOperationException("Read-Only view") }
override fun set(column: Int, row: Int, value: Float) {
throw UnsupportedOperationException("Read-Only view")
}
override fun equals(other: Any?): Boolean {
return other === this || parent == other
}
override fun hashCode(): Int {
return parent.hashCode()
}
override fun toString(): String {
return "View = $parent"
}
}
companion object {
@JvmStatic
fun all(value: Float) = construct2(value, Companion::columnMajor)
@JvmStatic
fun zero() = all(0f)
@JvmStatic
fun identity() = columnMajor()
@JvmStatic
fun unmodifiable(value: Matrix2f): Matrix2f {
if (value is View)
return value
else
return View(value)
}
@JvmStatic
fun columnMajor(
c00: Float = 1f,
c01: Float = 0f,
c10: Float = 0f,
c11: Float = 1f,
): Matrix2f {
return Impl(c00, c01, c10, c11)
}
@JvmStatic
fun rowMajor(
r00: Float = 1f, r01: Float = 0f,
r10: Float = 0f, r11: Float = 1f,
): Matrix2f {
return Impl(
r00, r10,
r01, r11,
)
}
@JvmStatic
fun from(matrix: Float2DArray, filler: Float) = construct2(matrix, Float2DArray::get, Companion::columnMajor, filler)
@JvmStatic
fun from(matrix: Float2DArray) = construct2(matrix, Float2DArray::get, Companion::columnMajor, 0f)
@JvmStatic
fun from(matrix: Matrix2f) = construct2(matrix, Float2DArray::get, Companion::columnMajor)
@JvmStatic
fun from(matrix: Matrix3f) = construct2(matrix, Float2DArray::get, Companion::columnMajor)
@JvmStatic
fun from(matrix: Matrix4f) = construct2(matrix, Float2DArray::get, Companion::columnMajor)
@JvmStatic
fun fromTransposed(matrix: Float2DArray) = construct2(matrix, Float2DArray::get, Companion::rowMajor, 0f)
@JvmStatic
fun fromTransposed(matrix: Float2DArray, filler: Float) = construct2(matrix, Float2DArray::get, Companion::rowMajor, filler)
@JvmStatic
fun fromTransposed(matrix: Matrix2f) = construct2(matrix, Float2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromTransposed(matrix: Matrix3f) = construct2(matrix, Float2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromTransposed(matrix: Matrix4f) = construct2(matrix, Float2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromColumnMajor(buffer: FloatBuffer) = construct2(buffer, FloatBuffer::get, Companion::columnMajor)
@JvmStatic
fun fromColumnMajor(buffer: ByteBuffer) = construct2(buffer, ByteBuffer::getFloat, Companion::columnMajor)
@JvmStatic
fun fromRowMajor(buffer: FloatBuffer) = construct2(buffer, FloatBuffer::get, Companion::rowMajor)
@JvmStatic
fun fromRowMajor(buffer: ByteBuffer) = construct2(buffer, ByteBuffer::getFloat, Companion::rowMajor)
// kotlin compiler bug? it refuses to use TABLESWITCH if these are inlined
const val C00 = (0 or (0 shl 1))
const val C01 = (0 or (1 shl 1))
const val C10 = (1 or (0 shl 1))
const val C11 = (1 or (1 shl 1))
}
}

496
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix3d.kt Normal file
View File

@ -0,0 +1,496 @@
package ru.dbotthepony.kstarbound.math.matrix
import ru.dbotthepony.kommons.arrays.Double2DArray
import ru.dbotthepony.kommons.arrays.mulMatrixComponents
import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.util.IStruct3d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector3d
import java.nio.ByteBuffer
import java.nio.DoubleBuffer
import kotlin.math.cos
import kotlin.math.sin
sealed class Matrix3d : Double2DArray() {
abstract var c00: Double
abstract var c01: Double
abstract var c02: Double
abstract var c10: Double
abstract var c11: Double
abstract var c12: Double
abstract var c20: Double
abstract var c21: Double
abstract var c22: Double
fun c00() = c00
fun c00(value: Double): Matrix3d { c00 = value; return this }
fun c01() = c01
fun c01(value: Double): Matrix3d { c01 = value; return this }
fun c02() = c02
fun c02(value: Double): Matrix3d { c02 = value; return this }
fun c10() = c10
fun c10(value: Double): Matrix3d { c10 = value; return this }
fun c11() = c11
fun c11(value: Double): Matrix3d { c11 = value; return this }
fun c12() = c12
fun c12(value: Double): Matrix3d { c12 = value; return this }
fun c20() = c20
fun c20(value: Double): Matrix3d { c20 = value; return this }
fun c21() = c21
fun c21(value: Double): Matrix3d { c21 = value; return this }
fun c22() = c22
fun c22(value: Double): Matrix3d { c22 = value; return this }
var r00: Double get() = c00; set(value) { c00 = value } // row 0 column 0
var r01: Double get() = c10; set(value) { c10 = value } // row 1 column 0
var r02: Double get() = c20; set(value) { c20 = value } // row 2 column 0
var r10: Double get() = c01; set(value) { c01 = value } // row 0 column 1
var r11: Double get() = c11; set(value) { c11 = value } // row 1 column 1
var r12: Double get() = c21; set(value) { c21 = value } // row 2 column 1
var r20: Double get() = c02; set(value) { c02 = value } // row 0 column 2
var r21: Double get() = c12; set(value) { c12 = value } // row 1 column 2
var r22: Double get() = c22; set(value) { c22 = value } // row 2 column 2
fun r00() = r00
fun r00(value: Double): Matrix3d { r00 = value; return this }
fun r01() = r01
fun r01(value: Double): Matrix3d { r01 = value; return this }
fun r02() = r02
fun r02(value: Double): Matrix3d { r02 = value; return this }
fun r10() = r10
fun r10(value: Double): Matrix3d { r10 = value; return this }
fun r11() = r11
fun r11(value: Double): Matrix3d { r11 = value; return this }
fun r12() = r12
fun r12(value: Double): Matrix3d { r12 = value; return this }
fun r20() = r20
fun r20(value: Double): Matrix3d { r20 = value; return this }
fun r21() = r21
fun r21(value: Double): Matrix3d { r21 = value; return this }
fun r22() = r22
fun r22(value: Double): Matrix3d { r22 = value; return this }
final override val rows: Int
get() = 3
final override val columns: Int
get() = 3
final override val determinant: Double
get() = super.determinant!!
final override val cofactorMatrix
get() = from(super.cofactorMatrix!!)
final override val adjugateMatrix
get() = from(super.adjugateMatrix!!)
final override val inversed
get() = super.inversed?.let { from(it) }
final override val transposed get() =
columnMajor(
c00 = r00,
c01 = r01,
c02 = r02,
c10 = r10,
c11 = r11,
c12 = r12,
c20 = r20,
c21 = r21,
c22 = r22,
)
final override fun get(column: Int, row: Int): Double {
return when (column or (row shl 2)) {
C00 -> c00
C01 -> c01
C02 -> c02
C10 -> c10
C11 -> c11
C12 -> c12
C20 -> c20
C21 -> c21
C22 -> c22
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
override fun set(column: Int, row: Int, value: Double) {
when (column or (row shl 2)) {
C00 -> c00 = value
C01 -> c01 = value
C02 -> c02 = value
C10 -> c10 = value
C11 -> c11 = value
C12 -> c12 = value
C20 -> c20 = value
C21 -> c21 = value
C22 -> c22 = value
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
fun mul(other: Matrix3d): Matrix3d {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c02 = mulMatrixComponents(this, other, 0, 2)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
val c12 = mulMatrixComponents(this, other, 1, 2)
val c20 = mulMatrixComponents(this, other, 2, 0)
val c21 = mulMatrixComponents(this, other, 2, 1)
val c22 = mulMatrixComponents(this, other, 2, 2)
this.c00 = c00
this.c01 = c01
this.c02 = c02
this.c10 = c10
this.c11 = c11
this.c12 = c12
this.c20 = c20
this.c21 = c21
this.c22 = c22
return this
}
fun mulIntoOther(other: Matrix3d): Matrix3d {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c02 = mulMatrixComponents(this, other, 0, 2)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
val c12 = mulMatrixComponents(this, other, 1, 2)
val c20 = mulMatrixComponents(this, other, 2, 0)
val c21 = mulMatrixComponents(this, other, 2, 1)
val c22 = mulMatrixComponents(this, other, 2, 2)
other.c00 = c00
other.c01 = c01
other.c02 = c02
other.c10 = c10
other.c11 = c11
other.c12 = c12
other.c20 = c20
other.c21 = c21
other.c22 = c22
return other
}
fun mul(
c00: Double = 1.0,
c01: Double = 0.0,
c02: Double = 0.0,
c10: Double = 0.0,
c11: Double = 1.0,
c12: Double = 0.0,
c20: Double = 0.0,
c21: Double = 0.0,
c22: Double = 1.0,
): Matrix3d {
val fc00 = this.c00 * c00 + this.c10 * c01 + this.c20 * c02
val fc01 = this.c01 * c00 + this.c11 * c01 + this.c21 * c02
val fc02 = this.c02 * c00 + this.c12 * c01 + this.c22 * c02
val fc10 = this.c00 * c10 + this.c10 * c11 + this.c20 * c12
val fc11 = this.c01 * c10 + this.c11 * c11 + this.c21 * c12
val fc12 = this.c02 * c10 + this.c12 * c11 + this.c22 * c12
val fc20 = this.c00 * c20 + this.c10 * c21 + this.c20 * c22
val fc21 = this.c01 * c20 + this.c11 * c21 + this.c21 * c22
val fc22 = this.c02 * c20 + this.c12 * c21 + this.c22 * c22
this.c00 = fc00
this.c01 = fc01
this.c02 = fc02
this.c10 = fc10
this.c11 = fc11
this.c12 = fc12
this.c20 = fc20
this.c21 = fc21
this.c22 = fc22
return this
}
fun mulIntoThis(
c00: Double = 1.0,
c01: Double = 0.0,
c02: Double = 0.0,
c10: Double = 0.0,
c11: Double = 1.0,
c12: Double = 0.0,
c20: Double = 0.0,
c21: Double = 0.0,
c22: Double = 1.0,
): Matrix3d {
val fc00 = c00 * this.c00 + c10 * this.c01 + c20 * this.c02
val fc01 = c01 * this.c00 + c11 * this.c01 + c21 * this.c02
val fc02 = c02 * this.c00 + c12 * this.c01 + c22 * this.c02
val fc10 = c00 * this.c10 + c10 * this.c11 + c20 * this.c12
val fc11 = c01 * this.c10 + c11 * this.c11 + c21 * this.c12
val fc12 = c02 * this.c10 + c12 * this.c11 + c22 * this.c12
val fc20 = c00 * this.c20 + c10 * this.c21 + c20 * this.c22
val fc21 = c01 * this.c20 + c11 * this.c21 + c21 * this.c22
val fc22 = c02 * this.c20 + c12 * this.c21 + c22 * this.c22
this.c00 = fc00
this.c01 = fc01
this.c02 = fc02
this.c10 = fc10
this.c11 = fc11
this.c12 = fc12
this.c20 = fc20
this.c21 = fc21
this.c22 = fc22
return this
}
final override fun add(other: Double): Matrix3d {
return super.add(other) as Matrix3d
}
final override fun sub(other: Double): Matrix3d {
return super.sub(other) as Matrix3d
}
final override fun mul(other: Double): Matrix3d {
return super.mul(other) as Matrix3d
}
final override fun div(other: Double): Matrix3d {
return super.div(other) as Matrix3d
}
final override fun add(other: Double2DArray): Matrix3d {
return super.add(other) as Matrix3d
}
final override fun sub(other: Double2DArray): Matrix3d {
return super.sub(other) as Matrix3d
}
fun to2d() = Matrix2d.from(this)
fun to4d(filler: Double) = Matrix4d.from(this, filler)
fun to4d() = Matrix4d.from(this)
fun copy(): Matrix3d {
return Impl(c00, c01, c02, c10, c11, c12, c20, c21, c22)
}
@JvmOverloads
fun translate(x: Double = 0.0, y: Double = 0.0): Matrix3d {
return mul(c20 = x, c21 = y)
}
fun translate(value: IStruct2d) = translate(value.component1(), value.component2())
fun translate(value: Vector2d) = translate(value.component1(), value.component2())
@JvmOverloads
fun preTranslate(x: Double = 0.0, y: Double = 0.0): Matrix3d {
return mulIntoThis(c20 = x, c21 = y)
}
fun preTranslate(value: IStruct2d) = preTranslate(value.component1(), value.component2())
fun preTranslate(value: Vector2d) = preTranslate(value.component1(), value.component2())
@JvmOverloads
fun scale(x: Double = 1.0, y: Double = 1.0, z: Double = 1.0): Matrix3d {
return mul(c00 = x, c11 = y, c22 = z)
}
fun scale(value: IStruct2d) = scale(value.component1(), value.component2())
fun scale(value: IStruct3d) = scale(value.component1(), value.component2(), value.component3())
fun scale(value: Vector2d) = scale(value.component1(), value.component2())
fun scale(value: Vector3d) = scale(value.component1(), value.component2(), value.component3())
@JvmOverloads
fun preScale(x: Double = 1.0, y: Double = 1.0, z: Double = 1.0): Matrix3d {
return mulIntoThis(c00 = x, c11 = y, c22 = z)
}
fun preScale(value: IStruct2d) = preScale(value.component1(), value.component2())
fun preScale(value: IStruct3d) = preScale(value.component1(), value.component2(), value.component3())
fun preScale(value: Vector2d) = preScale(value.component1(), value.component2())
fun preScale(value: Vector3d) = preScale(value.component1(), value.component2(), value.component3())
fun rotateAroundZ(angle: Double): Matrix3d {
val cos = cos(angle)
val sin = sin(angle)
return mul(
c00 = cos,
c10 = -sin,
c01 = sin,
c11 = cos,
)
}
fun preRotateAroundZ(angle: Double): Matrix3d {
val cos = cos(angle)
val sin = sin(angle)
return mulIntoThis(
c00 = cos,
c10 = -sin,
c01 = sin,
c11 = cos,
)
}
private data class Impl(
override var c00: Double,
override var c01: Double,
override var c02: Double,
override var c10: Double,
override var c11: Double,
override var c12: Double,
override var c20: Double,
override var c21: Double,
override var c22: Double,
) : Matrix3d() {
override fun toString(): String {
return "Matrix3d" + super.toString()
}
override fun equals(other: Any?): Boolean {
if (other !is Matrix3d) return false
return this === other || c00 == other.c00 &&
c01 == other.c01 &&
c02 == other.c02 &&
c10 == other.c10 &&
c11 == other.c11 &&
c12 == other.c12 &&
c20 == other.c20 &&
c21 == other.c21 &&
c22 == other.c22
}
}
private class View(private val parent: Matrix3d) : Matrix3d() {
override var c00: Double get() = parent.c00; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c01: Double get() = parent.c01; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c02: Double get() = parent.c02; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c10: Double get() = parent.c10; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c11: Double get() = parent.c11; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c12: Double get() = parent.c12; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c20: Double get() = parent.c20; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c21: Double get() = parent.c21; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c22: Double get() = parent.c22; set(_) { throw UnsupportedOperationException("Read-Only view") }
override fun set(column: Int, row: Int, value: Double) {
throw UnsupportedOperationException("Read-Only view")
}
override fun equals(other: Any?): Boolean {
return other === this || parent == other
}
override fun hashCode(): Int {
return parent.hashCode()
}
override fun toString(): String {
return "View = $parent"
}
}
companion object {
@JvmStatic
fun all(value: Double) = construct3(value, Companion::columnMajor)
@JvmStatic
fun zero() = all(0.0)
@JvmStatic
fun identity() = columnMajor()
@JvmStatic
fun unmodifiable(value: Matrix3d): Matrix3d {
if (value is View)
return value
else
return View(value)
}
@JvmStatic
fun columnMajor(
c00: Double = 1.0, c01: Double = 0.0, c02: Double = 0.0,
c10: Double = 0.0, c11: Double = 1.0, c12: Double = 0.0,
c20: Double = 0.0, c21: Double = 0.0, c22: Double = 1.0,
): Matrix3d {
return Impl(c00, c01, c02, c10, c11, c12, c20, c21, c22)
}
@JvmStatic
fun rowMajor(
r00: Double = 1.0, r01: Double = 0.0, r02: Double = 0.0,
r10: Double = 0.0, r11: Double = 1.0, r12: Double = 0.0,
r20: Double = 0.0, r21: Double = 0.0, r22: Double = 1.0,
): Matrix3d {
return Impl(
r00, r10, r20,
r01, r11, r21,
r02, r12, r22,
)
}
@JvmStatic
fun from(matrix: Double2DArray, filler: Double) = construct3(matrix, Double2DArray::get, Companion::columnMajor, filler)
@JvmStatic
fun from(matrix: Double2DArray) = construct3(matrix, Double2DArray::get, Companion::columnMajor, 0.0)
@JvmStatic
fun from(matrix: Matrix3d) = construct3(matrix, Double2DArray::get, Companion::columnMajor)
@JvmStatic
fun from(matrix: Matrix4d) = construct3(matrix, Double2DArray::get, Companion::columnMajor)
@JvmStatic
fun fromTransposed(matrix: Double2DArray, filler: Double) = construct3(matrix, Double2DArray::get, Companion::rowMajor, filler)
@JvmStatic
fun fromTransposed(matrix: Double2DArray) = construct3(matrix, Double2DArray::get, Companion::rowMajor, 0.0)
@JvmStatic
fun fromTransposed(matrix: Matrix3d) = construct3(matrix, Double2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromTransposed(matrix: Matrix4d) = construct3(matrix, Double2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromColumnMajor(buffer: DoubleBuffer) = construct3(buffer, DoubleBuffer::get, Companion::columnMajor)
@JvmStatic
fun fromColumnMajor(buffer: ByteBuffer) = construct3(buffer, ByteBuffer::getDouble, Companion::columnMajor)
@JvmStatic
fun fromRowMajor(buffer: DoubleBuffer) = construct3(buffer, DoubleBuffer::get, Companion::rowMajor)
@JvmStatic
fun fromRowMajor(buffer: ByteBuffer) = construct3(buffer, ByteBuffer::getDouble, Companion::rowMajor)
/**
* Constructs new ortho projection matrix, with Y coordinate flipped (useful for OpenGL GUI drawing).
*
* Inversion of Y means that X 0 Y 0 will be top left position on screen (in OpenGL), not bottom left.
*/
@JvmStatic
fun ortho(left: Double, right: Double, bottom: Double, top: Double): Matrix3d {
return rowMajor(
r00 = 2.0 / (right - left),
r11 = -2.0 / (top - bottom),
r02 = -(right + left) / (right - left),
r12 = -(top + bottom) / (top - bottom) + 2f,
)
}
/**
* Constructs new ortho projection matrix
*/
@JvmStatic
fun orthoDirect(left: Double, right: Double, bottom: Double, top: Double): Matrix3d {
return rowMajor(
r00 = 2.0 / (right - left),
r11 = 2.0 / (top - bottom),
r02 = -(right + left) / (right - left),
r12 = -(top + bottom) / (top - bottom),
)
}
// kotlin compiler bug? it refuses to use TABLESWITCH if these are inlined
const val C00 = (0 or (0 shl 2))
const val C01 = (0 or (1 shl 2))
const val C02 = (0 or (2 shl 2))
const val C10 = (1 or (0 shl 2))
const val C11 = (1 or (1 shl 2))
const val C12 = (1 or (2 shl 2))
const val C20 = (2 or (0 shl 2))
const val C21 = (2 or (1 shl 2))
const val C22 = (2 or (2 shl 2))
}
}

55
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix3dStack.kt Normal file
View File

@ -0,0 +1,55 @@
package ru.dbotthepony.kstarbound.math.matrix
class Matrix3dStack {
private val stack = ArrayDeque<Matrix3d>()
init {
stack.addLast(Matrix3d.identity())
}
fun clear(top: Matrix3d): Matrix3dStack {
stack.clear()
stack.addLast(top.copy())
return this
}
fun push(): Matrix3dStack {
stack.addLast(stack.last().copy())
return this
}
fun pop(): Matrix3d {
return stack.removeLast()
}
fun last(): Matrix3d {
return stack.last()
}
fun push(matrix: Matrix3d): Matrix3dStack {
stack.addLast(matrix.copy())
return this
}
fun identity() = push(Matrix3d.identity())
fun zero() = push(Matrix3d.all(0.0))
fun all(value: Double) = push(Matrix3d.all(value))
inline fun <T> with(block: Matrix3d.() -> T): T {
return try {
push()
block(last())
} finally {
pop()
}
}
inline fun <T> with(matrix: Matrix3d, block: Matrix3d.() -> T): T {
return try {
push(matrix)
block(last())
} finally {
pop()
}
}
}

496
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix3f.kt Normal file
View File

@ -0,0 +1,496 @@
package ru.dbotthepony.kstarbound.math.matrix
import ru.dbotthepony.kommons.arrays.Float2DArray
import ru.dbotthepony.kommons.arrays.mulMatrixComponents
import ru.dbotthepony.kommons.util.IStruct2f
import ru.dbotthepony.kommons.util.IStruct3f
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector3f
import java.nio.ByteBuffer
import java.nio.FloatBuffer
import kotlin.math.cos
import kotlin.math.sin
sealed class Matrix3f : Float2DArray() {
abstract var c00: Float
abstract var c01: Float
abstract var c02: Float
abstract var c10: Float
abstract var c11: Float
abstract var c12: Float
abstract var c20: Float
abstract var c21: Float
abstract var c22: Float
fun c00() = c00
fun c00(value: Float): Matrix3f { c00 = value; return this }
fun c01() = c01
fun c01(value: Float): Matrix3f { c01 = value; return this }
fun c02() = c02
fun c02(value: Float): Matrix3f { c02 = value; return this }
fun c10() = c10
fun c10(value: Float): Matrix3f { c10 = value; return this }
fun c11() = c11
fun c11(value: Float): Matrix3f { c11 = value; return this }
fun c12() = c12
fun c12(value: Float): Matrix3f { c12 = value; return this }
fun c20() = c20
fun c20(value: Float): Matrix3f { c20 = value; return this }
fun c21() = c21
fun c21(value: Float): Matrix3f { c21 = value; return this }
fun c22() = c22
fun c22(value: Float): Matrix3f { c22 = value; return this }
var r00: Float get() = c00; set(value) { c00 = value } // row 0 column 0
var r01: Float get() = c10; set(value) { c10 = value } // row 1 column 0
var r02: Float get() = c20; set(value) { c20 = value } // row 2 column 0
var r10: Float get() = c01; set(value) { c01 = value } // row 0 column 1
var r11: Float get() = c11; set(value) { c11 = value } // row 1 column 1
var r12: Float get() = c21; set(value) { c21 = value } // row 2 column 1
var r20: Float get() = c02; set(value) { c02 = value } // row 0 column 2
var r21: Float get() = c12; set(value) { c12 = value } // row 1 column 2
var r22: Float get() = c22; set(value) { c22 = value } // row 2 column 2
fun r00() = r00
fun r00(value: Float): Matrix3f { r00 = value; return this }
fun r01() = r01
fun r01(value: Float): Matrix3f { r01 = value; return this }
fun r02() = r02
fun r02(value: Float): Matrix3f { r02 = value; return this }
fun r10() = r10
fun r10(value: Float): Matrix3f { r10 = value; return this }
fun r11() = r11
fun r11(value: Float): Matrix3f { r11 = value; return this }
fun r12() = r12
fun r12(value: Float): Matrix3f { r12 = value; return this }
fun r20() = r20
fun r20(value: Float): Matrix3f { r20 = value; return this }
fun r21() = r21
fun r21(value: Float): Matrix3f { r21 = value; return this }
fun r22() = r22
fun r22(value: Float): Matrix3f { r22 = value; return this }
final override val rows: Int
get() = 3
final override val columns: Int
get() = 3
final override val determinant: Float
get() = super.determinant!!
final override val cofactorMatrix
get() = from(super.cofactorMatrix!!)
final override val adjugateMatrix
get() = from(super.adjugateMatrix!!)
final override val inversed
get() = super.inversed?.let { from(it) }
final override val transposed get() =
columnMajor(
c00 = r00,
c01 = r01,
c02 = r02,
c10 = r10,
c11 = r11,
c12 = r12,
c20 = r20,
c21 = r21,
c22 = r22,
)
final override fun get(column: Int, row: Int): Float {
return when (column or (row shl 2)) {
C00 -> c00
C01 -> c01
C02 -> c02
C10 -> c10
C11 -> c11
C12 -> c12
C20 -> c20
C21 -> c21
C22 -> c22
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
override fun set(column: Int, row: Int, value: Float) {
when (column or (row shl 2)) {
C00 -> c00 = value
C01 -> c01 = value
C02 -> c02 = value
C10 -> c10 = value
C11 -> c11 = value
C12 -> c12 = value
C20 -> c20 = value
C21 -> c21 = value
C22 -> c22 = value
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
fun mul(other: Matrix3f): Matrix3f {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c02 = mulMatrixComponents(this, other, 0, 2)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
val c12 = mulMatrixComponents(this, other, 1, 2)
val c20 = mulMatrixComponents(this, other, 2, 0)
val c21 = mulMatrixComponents(this, other, 2, 1)
val c22 = mulMatrixComponents(this, other, 2, 2)
this.c00 = c00
this.c01 = c01
this.c02 = c02
this.c10 = c10
this.c11 = c11
this.c12 = c12
this.c20 = c20
this.c21 = c21
this.c22 = c22
return this
}
fun mulIntoOther(other: Matrix3f): Matrix3f {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c02 = mulMatrixComponents(this, other, 0, 2)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
val c12 = mulMatrixComponents(this, other, 1, 2)
val c20 = mulMatrixComponents(this, other, 2, 0)
val c21 = mulMatrixComponents(this, other, 2, 1)
val c22 = mulMatrixComponents(this, other, 2, 2)
other.c00 = c00
other.c01 = c01
other.c02 = c02
other.c10 = c10
other.c11 = c11
other.c12 = c12
other.c20 = c20
other.c21 = c21
other.c22 = c22
return other
}
fun mul(
c00: Float = 1f,
c01: Float = 0f,
c02: Float = 0f,
c10: Float = 0f,
c11: Float = 1f,
c12: Float = 0f,
c20: Float = 0f,
c21: Float = 0f,
c22: Float = 1f,
): Matrix3f {
val fc00 = this.c00 * c00 + this.c10 * c01 + this.c20 * c02
val fc01 = this.c01 * c00 + this.c11 * c01 + this.c21 * c02
val fc02 = this.c02 * c00 + this.c12 * c01 + this.c22 * c02
val fc10 = this.c00 * c10 + this.c10 * c11 + this.c20 * c12
val fc11 = this.c01 * c10 + this.c11 * c11 + this.c21 * c12
val fc12 = this.c02 * c10 + this.c12 * c11 + this.c22 * c12
val fc20 = this.c00 * c20 + this.c10 * c21 + this.c20 * c22
val fc21 = this.c01 * c20 + this.c11 * c21 + this.c21 * c22
val fc22 = this.c02 * c20 + this.c12 * c21 + this.c22 * c22
this.c00 = fc00
this.c01 = fc01
this.c02 = fc02
this.c10 = fc10
this.c11 = fc11
this.c12 = fc12
this.c20 = fc20
this.c21 = fc21
this.c22 = fc22
return this
}
fun mulIntoThis(
c00: Float = 1f,
c01: Float = 0f,
c02: Float = 0f,
c10: Float = 0f,
c11: Float = 1f,
c12: Float = 0f,
c20: Float = 0f,
c21: Float = 0f,
c22: Float = 1f,
): Matrix3f {
val fc00 = c00 * this.c00 + c10 * this.c01 + c20 * this.c02
val fc01 = c01 * this.c00 + c11 * this.c01 + c21 * this.c02
val fc02 = c02 * this.c00 + c12 * this.c01 + c22 * this.c02
val fc10 = c00 * this.c10 + c10 * this.c11 + c20 * this.c12
val fc11 = c01 * this.c10 + c11 * this.c11 + c21 * this.c12
val fc12 = c02 * this.c10 + c12 * this.c11 + c22 * this.c12
val fc20 = c00 * this.c20 + c10 * this.c21 + c20 * this.c22
val fc21 = c01 * this.c20 + c11 * this.c21 + c21 * this.c22
val fc22 = c02 * this.c20 + c12 * this.c21 + c22 * this.c22
this.c00 = fc00
this.c01 = fc01
this.c02 = fc02
this.c10 = fc10
this.c11 = fc11
this.c12 = fc12
this.c20 = fc20
this.c21 = fc21
this.c22 = fc22
return this
}
final override fun add(other: Float): Matrix3f {
return super.add(other) as Matrix3f
}
final override fun sub(other: Float): Matrix3f {
return super.sub(other) as Matrix3f
}
final override fun mul(other: Float): Matrix3f {
return super.mul(other) as Matrix3f
}
final override fun div(other: Float): Matrix3f {
return super.div(other) as Matrix3f
}
final override fun add(other: Float2DArray): Matrix3f {
return super.add(other) as Matrix3f
}
final override fun sub(other: Float2DArray): Matrix3f {
return super.sub(other) as Matrix3f
}
fun to2f() = Matrix2f.from(this)
fun to4f(filler: Float) = Matrix4f.from(this, filler)
fun to4f() = Matrix4f.from(this)
fun copy(): Matrix3f {
return Impl(c00, c01, c02, c10, c11, c12, c20, c21, c22)
}
@JvmOverloads
fun translate(x: Float = 0f, y: Float = 0f): Matrix3f {
return mul(c20 = x, c21 = y)
}
fun translate(value: IStruct2f) = translate(value.component1(), value.component2())
fun translate(value: Vector2f) = translate(value.component1(), value.component2())
@JvmOverloads
fun preTranslate(x: Float = 0f, y: Float = 0f): Matrix3f {
return mulIntoThis(c20 = x, c21 = y)
}
fun preTranslate(value: IStruct2f) = preTranslate(value.component1(), value.component2())
fun preTranslate(value: Vector2f) = preTranslate(value.component1(), value.component2())
@JvmOverloads
fun scale(x: Float = 1f, y: Float = 1f, z: Float = 1f): Matrix3f {
return mul(c00 = x, c11 = y, c22 = z)
}
fun scale(value: IStruct2f) = scale(value.component1(), value.component2())
fun scale(value: IStruct3f) = scale(value.component1(), value.component2(), value.component3())
fun scale(value: Vector2f) = scale(value.component1(), value.component2())
fun scale(value: Vector3f) = scale(value.component1(), value.component2(), value.component3())
@JvmOverloads
fun preScale(x: Float = 1f, y: Float = 1f, z: Float = 1f): Matrix3f {
return mulIntoThis(c00 = x, c11 = y, c22 = z)
}
fun preScale(value: IStruct2f) = preScale(value.component1(), value.component2())
fun preScale(value: IStruct3f) = preScale(value.component1(), value.component2(), value.component3())
fun preScale(value: Vector2f) = preScale(value.component1(), value.component2())
fun preScale(value: Vector3f) = preScale(value.component1(), value.component2(), value.component3())
fun rotateAroundZ(angle: Float): Matrix3f {
val cos = cos(angle)
val sin = sin(angle)
return mul(
c00 = cos,
c10 = -sin,
c01 = sin,
c11 = cos,
)
}
fun preRotateAroundZ(angle: Float): Matrix3f {
val cos = cos(angle)
val sin = sin(angle)
return mulIntoThis(
c00 = cos,
c10 = -sin,
c01 = sin,
c11 = cos,
)
}
private data class Impl(
override var c00: Float,
override var c01: Float,
override var c02: Float,
override var c10: Float,
override var c11: Float,
override var c12: Float,
override var c20: Float,
override var c21: Float,
override var c22: Float,
) : Matrix3f() {
override fun toString(): String {
return "Matrix3f" + super.toString()
}
override fun equals(other: Any?): Boolean {
if (other !is Matrix3f) return false
return c00 == other.c00 &&
c01 == other.c01 &&
c02 == other.c02 &&
c10 == other.c10 &&
c11 == other.c11 &&
c12 == other.c12 &&
c20 == other.c20 &&
c21 == other.c21 &&
c22 == other.c22
}
}
private class View(private val parent: Matrix3f) : Matrix3f() {
override var c00: Float get() = parent.c00; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c01: Float get() = parent.c01; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c02: Float get() = parent.c02; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c10: Float get() = parent.c10; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c11: Float get() = parent.c11; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c12: Float get() = parent.c12; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c20: Float get() = parent.c20; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c21: Float get() = parent.c21; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c22: Float get() = parent.c22; set(_) { throw UnsupportedOperationException("Read-Only view") }
override fun set(column: Int, row: Int, value: Float) {
throw UnsupportedOperationException("Read-Only view")
}
override fun equals(other: Any?): Boolean {
return other === this || parent == other
}
override fun hashCode(): Int {
return parent.hashCode()
}
override fun toString(): String {
return "View = $parent"
}
}
companion object {
@JvmStatic
fun all(value: Float) = construct3(value, Companion::columnMajor)
@JvmStatic
fun zero() = all(0f)
@JvmStatic
fun identity() = columnMajor()
@JvmStatic
fun unmodifiable(value: Matrix3f): Matrix3f {
if (value is View)
return value
else
return View(value)
}
@JvmStatic
fun columnMajor(
c00: Float = 1f, c01: Float = 0f, c02: Float = 0f,
c10: Float = 0f, c11: Float = 1f, c12: Float = 0f,
c20: Float = 0f, c21: Float = 0f, c22: Float = 1f,
): Matrix3f {
return Impl(c00, c01, c02, c10, c11, c12, c20, c21, c22)
}
@JvmStatic
fun rowMajor(
r00: Float = 1f, r01: Float = 0f, r02: Float = 0f,
r10: Float = 0f, r11: Float = 1f, r12: Float = 0f,
r20: Float = 0f, r21: Float = 0f, r22: Float = 1f,
): Matrix3f {
return Impl(
r00, r10, r20,
r01, r11, r21,
r02, r12, r22,
)
}
@JvmStatic
fun from(matrix: Float2DArray, filler: Float) = construct3(matrix, Float2DArray::get, Companion::columnMajor, filler)
@JvmStatic
fun from(matrix: Float2DArray) = construct3(matrix, Float2DArray::get, Companion::columnMajor, 0f)
@JvmStatic
fun from(matrix: Matrix3f) = construct3(matrix, Float2DArray::get, Companion::columnMajor)
@JvmStatic
fun from(matrix: Matrix4f) = construct3(matrix, Float2DArray::get, Companion::columnMajor)
@JvmStatic
fun fromTransposed(matrix: Float2DArray, filler: Float) = construct3(matrix, Float2DArray::get, Companion::rowMajor, filler)
@JvmStatic
fun fromTransposed(matrix: Float2DArray) = construct3(matrix, Float2DArray::get, Companion::rowMajor, 0f)
@JvmStatic
fun fromTransposed(matrix: Matrix3f) = construct3(matrix, Float2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromTransposed(matrix: Matrix4f) = construct3(matrix, Float2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromColumnMajor(buffer: FloatBuffer) = construct3(buffer, FloatBuffer::get, Companion::columnMajor)
@JvmStatic
fun fromColumnMajor(buffer: ByteBuffer) = construct3(buffer, ByteBuffer::getFloat, Companion::columnMajor)
@JvmStatic
fun fromRowMajor(buffer: FloatBuffer) = construct3(buffer, FloatBuffer::get, Companion::rowMajor)
@JvmStatic
fun fromRowMajor(buffer: ByteBuffer) = construct3(buffer, ByteBuffer::getFloat, Companion::rowMajor)
/**
* Constructs new ortho projection matrix, with Y coordinate flipped (useful for OpenGL GUI drawing).
*
* Inversion of Y means that X 0 Y 0 will be top left position on screen (in OpenGL), not bottom left.
*/
@JvmStatic
fun ortho(left: Float, right: Float, bottom: Float, top: Float): Matrix3f {
return rowMajor(
r00 = 2f / (right - left),
r11 = -2f / (top - bottom),
r02 = -(right + left) / (right - left),
r12 = -(top + bottom) / (top - bottom) + 2f,
)
}
/**
* Constructs new ortho projection matrix
*/
@JvmStatic
fun orthoDirect(left: Float, right: Float, bottom: Float, top: Float): Matrix3f {
return rowMajor(
r00 = 2f / (right - left),
r11 = 2f / (top - bottom),
r02 = -(right + left) / (right - left),
r12 = -(top + bottom) / (top - bottom),
)
}
// kotlin compiler bug? it refuses to use TABLESWITCH if these are inlined
const val C00 = (0 or (0 shl 2))
const val C01 = (0 or (1 shl 2))
const val C02 = (0 or (2 shl 2))
const val C10 = (1 or (0 shl 2))
const val C11 = (1 or (1 shl 2))
const val C12 = (1 or (2 shl 2))
const val C20 = (2 or (0 shl 2))
const val C21 = (2 or (1 shl 2))
const val C22 = (2 or (2 shl 2))
}
}

55
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix3fStack.kt Normal file
View File

@ -0,0 +1,55 @@
package ru.dbotthepony.kstarbound.math.matrix
class Matrix3fStack {
private val stack = ArrayDeque<Matrix3f>()
init {
stack.addLast(Matrix3f.identity())
}
fun clear(top: Matrix3f): Matrix3fStack {
stack.clear()
stack.addLast(top.copy())
return this
}
fun push(): Matrix3fStack {
stack.addLast(stack.last().copy())
return this
}
fun pop(): Matrix3f {
return stack.removeLast()
}
fun last(): Matrix3f {
return stack.last()
}
fun push(matrix: Matrix3f): Matrix3fStack {
stack.addLast(matrix.copy())
return this
}
fun identity() = push(Matrix3f.identity())
fun zero() = push(Matrix3f.all(0f))
fun all(value: Float) = push(Matrix3f.all(value))
inline fun <T> with(block: Matrix3f.() -> T): T {
return try {
push()
block(last())
} finally {
pop()
}
}
inline fun <T> with(matrix: Matrix3f, block: Matrix3f.() -> T): T {
return try {
push(matrix)
block(last())
} finally {
pop()
}
}
}

734
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix4d.kt Normal file
View File

@ -0,0 +1,734 @@
package ru.dbotthepony.kstarbound.math.matrix
import ru.dbotthepony.kommons.arrays.Double2DArray
import ru.dbotthepony.kommons.arrays.mulMatrixComponents
import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.util.IStruct3d
import ru.dbotthepony.kommons.util.IStruct4d
import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector3d
import ru.dbotthepony.kstarbound.math.vector.Vector4d
import java.nio.ByteBuffer
import java.nio.DoubleBuffer
import kotlin.math.cos
import kotlin.math.sin
import kotlin.math.tan
sealed class Matrix4d : Double2DArray() {
abstract var c00: Double
abstract var c01: Double
abstract var c02: Double
abstract var c03: Double
abstract var c10: Double
abstract var c11: Double
abstract var c12: Double
abstract var c13: Double
abstract var c20: Double
abstract var c21: Double
abstract var c22: Double
abstract var c23: Double
abstract var c30: Double
abstract var c31: Double
abstract var c32: Double
abstract var c33: Double
fun c00() = c00
fun c00(value: Double): Matrix4d { c00 = value; return this }
fun c01() = c01
fun c01(value: Double): Matrix4d { c01 = value; return this }
fun c02() = c02
fun c02(value: Double): Matrix4d { c02 = value; return this }
fun c03() = c03
fun c03(value: Double): Matrix4d { c03 = value; return this }
fun c10() = c10
fun c10(value: Double): Matrix4d { c10 = value; return this }
fun c11() = c11
fun c11(value: Double): Matrix4d { c11 = value; return this }
fun c12() = c12
fun c12(value: Double): Matrix4d { c12 = value; return this }
fun c13() = c13
fun c13(value: Double): Matrix4d { c13 = value; return this }
fun c20() = c20
fun c20(value: Double): Matrix4d { c20 = value; return this }
fun c21() = c21
fun c21(value: Double): Matrix4d { c21 = value; return this }
fun c22() = c22
fun c22(value: Double): Matrix4d { c22 = value; return this }
fun c23() = c23
fun c23(value: Double): Matrix4d { c23 = value; return this }
fun c30() = c30
fun c30(value: Double): Matrix4d { c30 = value; return this }
fun c31() = c31
fun c31(value: Double): Matrix4d { c31 = value; return this }
fun c32() = c32
fun c32(value: Double): Matrix4d { c32 = value; return this }
fun c33() = c33
fun c33(value: Double): Matrix4d { c33 = value; return this }
var r00: Double get() = c00; set(value) { c00 = value } // row 0 column 0
var r01: Double get() = c10; set(value) { c10 = value } // row 1 column 0
var r02: Double get() = c20; set(value) { c20 = value } // row 2 column 0
var r03: Double get() = c30; set(value) { c30 = value } // row 3 column 0
var r10: Double get() = c01; set(value) { c01 = value } // row 0 column 1
var r11: Double get() = c11; set(value) { c11 = value } // row 1 column 1
var r12: Double get() = c21; set(value) { c21 = value } // row 2 column 1
var r13: Double get() = c31; set(value) { c31 = value } // row 3 column 1
var r20: Double get() = c02; set(value) { c02 = value } // row 0 column 2
var r21: Double get() = c12; set(value) { c12 = value } // row 1 column 2
var r22: Double get() = c22; set(value) { c22 = value } // row 2 column 2
var r23: Double get() = c32; set(value) { c32 = value } // row 3 column 2
var r30: Double get() = c03; set(value) { c03 = value } // row 0 column 3
var r31: Double get() = c13; set(value) { c13 = value } // row 1 column 3
var r32: Double get() = c23; set(value) { c23 = value } // row 2 column 3
var r33: Double get() = c33; set(value) { c33 = value } // row 3 column 3
fun r00() = r00
fun r00(value: Double): Matrix4d { r00 = value; return this }
fun r01() = r01
fun r01(value: Double): Matrix4d { r01 = value; return this }
fun r02() = r02
fun r02(value: Double): Matrix4d { r02 = value; return this }
fun r03() = r03
fun r03(value: Double): Matrix4d { r03 = value; return this }
fun r10() = r10
fun r10(value: Double): Matrix4d { r10 = value; return this }
fun r11() = r11
fun r11(value: Double): Matrix4d { r11 = value; return this }
fun r12() = r12
fun r12(value: Double): Matrix4d { r12 = value; return this }
fun r13() = r13
fun r13(value: Double): Matrix4d { r13 = value; return this }
fun r20() = r20
fun r20(value: Double): Matrix4d { r20 = value; return this }
fun r21() = r21
fun r21(value: Double): Matrix4d { r21 = value; return this }
fun r22() = r22
fun r22(value: Double): Matrix4d { r22 = value; return this }
fun r23() = r23
fun r23(value: Double): Matrix4d { r23 = value; return this }
fun r30() = r30
fun r30(value: Double): Matrix4d { r30 = value; return this }
fun r31() = r31
fun r31(value: Double): Matrix4d { r31 = value; return this }
fun r32() = r32
fun r32(value: Double): Matrix4d { r32 = value; return this }
fun r33() = r33
fun r33(value: Double): Matrix4d { r33 = value; return this }
final override val rows: Int
get() = 4
final override val columns: Int
get() = 4
final override val transposed get() =
columnMajor(
c00 = r00,
c01 = r01,
c02 = r02,
c03 = r03,
c10 = r10,
c11 = r11,
c12 = r12,
c13 = r13,
c20 = r20,
c21 = r21,
c22 = r22,
c23 = r23,
c30 = r30,
c31 = r31,
c32 = r32,
c33 = r33,
)
final override fun get(column: Int, row: Int): Double {
return when (column or (row shl 2)) {
C00 -> c00
C01 -> c01
C02 -> c02
C03 -> c03
C10 -> c10
C11 -> c11
C12 -> c12
C13 -> c13
C20 -> c20
C21 -> c21
C22 -> c22
C23 -> c23
C30 -> c30
C31 -> c31
C32 -> c32
C33 -> c33
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
override fun set(column: Int, row: Int, value: Double) {
when (column or (row shl 2)) {
C00 -> c00 = value
C01 -> c01 = value
C02 -> c02 = value
C03 -> c03 = value
C10 -> c10 = value
C11 -> c11 = value
C12 -> c12 = value
C13 -> c13 = value
C20 -> c20 = value
C21 -> c21 = value
C22 -> c22 = value
C23 -> c23 = value
C30 -> c30 = value
C31 -> c31 = value
C32 -> c32 = value
C33 -> c33 = value
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
fun mul(other: Matrix4d): Matrix4d {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c02 = mulMatrixComponents(this, other, 0, 2)
val c03 = mulMatrixComponents(this, other, 0, 3)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
val c12 = mulMatrixComponents(this, other, 1, 2)
val c13 = mulMatrixComponents(this, other, 1, 3)
val c20 = mulMatrixComponents(this, other, 2, 0)
val c21 = mulMatrixComponents(this, other, 2, 1)
val c22 = mulMatrixComponents(this, other, 2, 2)
val c23 = mulMatrixComponents(this, other, 2, 3)
val c30 = mulMatrixComponents(this, other, 3, 0)
val c31 = mulMatrixComponents(this, other, 3, 1)
val c32 = mulMatrixComponents(this, other, 3, 2)
val c33 = mulMatrixComponents(this, other, 3, 3)
this.c00 = c00
this.c01 = c01
this.c02 = c02
this.c03 = c03
this.c10 = c10
this.c11 = c11
this.c12 = c12
this.c13 = c13
this.c20 = c20
this.c21 = c21
this.c22 = c22
this.c23 = c23
this.c30 = c30
this.c31 = c31
this.c32 = c32
this.c33 = c33
return this
}
fun mulIntoOther(other: Matrix4d): Matrix4d {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c02 = mulMatrixComponents(this, other, 0, 2)
val c03 = mulMatrixComponents(this, other, 0, 3)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
val c12 = mulMatrixComponents(this, other, 1, 2)
val c13 = mulMatrixComponents(this, other, 1, 3)
val c20 = mulMatrixComponents(this, other, 2, 0)
val c21 = mulMatrixComponents(this, other, 2, 1)
val c22 = mulMatrixComponents(this, other, 2, 2)
val c23 = mulMatrixComponents(this, other, 2, 3)
val c30 = mulMatrixComponents(this, other, 3, 0)
val c31 = mulMatrixComponents(this, other, 3, 1)
val c32 = mulMatrixComponents(this, other, 3, 2)
val c33 = mulMatrixComponents(this, other, 3, 3)
other.c00 = c00
other.c01 = c01
other.c02 = c02
other.c03 = c03
other.c10 = c10
other.c11 = c11
other.c12 = c12
other.c13 = c13
other.c20 = c20
other.c21 = c21
other.c22 = c22
other.c23 = c23
other.c30 = c30
other.c31 = c31
other.c32 = c32
other.c33 = c33
return other
}
/**
* this * other, writes result into this
*/
fun mul(
c00: Double = 1.0,
c01: Double = 0.0,
c02: Double = 0.0,
c03: Double = 0.0,
c10: Double = 0.0,
c11: Double = 1.0,
c12: Double = 0.0,
c13: Double = 0.0,
c20: Double = 0.0,
c21: Double = 0.0,
c22: Double = 1.0,
c23: Double = 0.0,
c30: Double = 0.0,
c31: Double = 0.0,
c32: Double = 0.0,
c33: Double = 1.0,
): Matrix4d {
val fc00 = this.c00 * c00 + this.c10 * c01 + this.c20 * c02 + this.c30 * c03
val fc01 = this.c01 * c00 + this.c11 * c01 + this.c21 * c02 + this.c31 * c03
val fc02 = this.c02 * c00 + this.c12 * c01 + this.c22 * c02 + this.c32 * c03
val fc03 = this.c03 * c00 + this.c13 * c01 + this.c23 * c02 + this.c33 * c03
val fc10 = this.c00 * c10 + this.c10 * c11 + this.c20 * c12 + this.c30 * c13
val fc11 = this.c01 * c10 + this.c11 * c11 + this.c21 * c12 + this.c31 * c13
val fc12 = this.c02 * c10 + this.c12 * c11 + this.c22 * c12 + this.c32 * c13
val fc13 = this.c03 * c10 + this.c13 * c11 + this.c23 * c12 + this.c33 * c13
val fc20 = this.c00 * c20 + this.c10 * c21 + this.c20 * c22 + this.c30 * c23
val fc21 = this.c01 * c20 + this.c11 * c21 + this.c21 * c22 + this.c31 * c23
val fc22 = this.c02 * c20 + this.c12 * c21 + this.c22 * c22 + this.c32 * c23
val fc23 = this.c03 * c20 + this.c13 * c21 + this.c23 * c22 + this.c33 * c23
val fc30 = this.c00 * c30 + this.c10 * c31 + this.c20 * c32 + this.c30 * c33
val fc31 = this.c01 * c30 + this.c11 * c31 + this.c21 * c32 + this.c31 * c33
val fc32 = this.c02 * c30 + this.c12 * c31 + this.c22 * c32 + this.c32 * c33
val fc33 = this.c03 * c30 + this.c13 * c31 + this.c23 * c32 + this.c33 * c33
this.c00 = fc00
this.c01 = fc01
this.c02 = fc02
this.c03 = fc03
this.c10 = fc10
this.c11 = fc11
this.c12 = fc12
this.c13 = fc13
this.c20 = fc20
this.c21 = fc21
this.c22 = fc22
this.c23 = fc23
this.c30 = fc30
this.c31 = fc31
this.c32 = fc32
this.c33 = fc33
return this
}
/**
* other * this, writes result into this
*/
fun mulIntoThis(
c00: Double = 1.0,
c01: Double = 0.0,
c02: Double = 0.0,
c03: Double = 0.0,
c10: Double = 0.0,
c11: Double = 1.0,
c12: Double = 0.0,
c13: Double = 0.0,
c20: Double = 0.0,
c21: Double = 0.0,
c22: Double = 1.0,
c23: Double = 0.0,
c30: Double = 0.0,
c31: Double = 0.0,
c32: Double = 0.0,
c33: Double = 1.0,
): Matrix4d {
val fc00 = c00 * this.c00 + c10 * this.c01 + c20 * this.c02 + c30 * this.c03
val fc01 = c01 * this.c00 + c11 * this.c01 + c21 * this.c02 + c31 * this.c03
val fc02 = c02 * this.c00 + c12 * this.c01 + c22 * this.c02 + c32 * this.c03
val fc03 = c03 * this.c00 + c13 * this.c01 + c23 * this.c02 + c33 * this.c03
val fc10 = c00 * this.c10 + c10 * this.c11 + c20 * this.c12 + c30 * this.c13
val fc11 = c01 * this.c10 + c11 * this.c11 + c21 * this.c12 + c31 * this.c13
val fc12 = c02 * this.c10 + c12 * this.c11 + c22 * this.c12 + c32 * this.c13
val fc13 = c03 * this.c10 + c13 * this.c11 + c23 * this.c12 + c33 * this.c13
val fc20 = c00 * this.c20 + c10 * this.c21 + c20 * this.c22 + c30 * this.c23
val fc21 = c01 * this.c20 + c11 * this.c21 + c21 * this.c22 + c31 * this.c23
val fc22 = c02 * this.c20 + c12 * this.c21 + c22 * this.c22 + c32 * this.c23
val fc23 = c03 * this.c20 + c13 * this.c21 + c23 * this.c22 + c33 * this.c23
val fc30 = c00 * this.c30 + c10 * this.c31 + c20 * this.c32 + c30 * this.c33
val fc31 = c01 * this.c30 + c11 * this.c31 + c21 * this.c32 + c31 * this.c33
val fc32 = c02 * this.c30 + c12 * this.c31 + c22 * this.c32 + c32 * this.c33
val fc33 = c03 * this.c30 + c13 * this.c31 + c23 * this.c32 + c33 * this.c33
this.c00 = fc00
this.c01 = fc01
this.c02 = fc02
this.c03 = fc03
this.c10 = fc10
this.c11 = fc11
this.c12 = fc12
this.c13 = fc13
this.c20 = fc20
this.c21 = fc21
this.c22 = fc22
this.c23 = fc23
this.c30 = fc30
this.c31 = fc31
this.c32 = fc32
this.c33 = fc33
return this
}
final override fun add(other: Double): Matrix4d {
return super.add(other) as Matrix4d
}
final override fun sub(other: Double): Matrix4d {
return super.sub(other) as Matrix4d
}
final override fun mul(other: Double): Matrix4d {
return super.mul(other) as Matrix4d
}
final override fun div(other: Double): Matrix4d {
return super.div(other) as Matrix4d
}
final override fun add(other: Double2DArray): Matrix4d {
return super.add(other) as Matrix4d
}
final override fun sub(other: Double2DArray): Matrix4d {
return super.sub(other) as Matrix4d
}
fun to2d() = Matrix2d.from(this)
fun to3d() = Matrix3d.from(this)
fun copy(): Matrix4d {
return Impl(c00, c01, c02, c03, c10, c11, c12, c13, c20, c21, c22, c23, c30, c31, c32, c33)
}
@JvmOverloads
fun translate(x: Double = 0.0, y: Double = 0.0, z: Double = 0.0): Matrix4d {
return mul(c30 = x, c31 = y, c32 = z)
}
fun translate(value: IStruct2d) = translate(value.component1(), value.component2())
fun translate(value: IStruct3d) = translate(value.component1(), value.component2(), value.component3())
fun translate(value: Vector2d) = translate(value.component1(), value.component2())
fun translate(value: Vector3d) = translate(value.component1(), value.component2(), value.component3())
@JvmOverloads
fun preTranslate(x: Double = 0.0, y: Double = 0.0, z: Double = 0.0): Matrix4d {
return mulIntoThis(c30 = x, c31 = y, c32 = z)
}
fun preTranslate(value: IStruct2d) = preTranslate(value.component1(), value.component2())
fun preTranslate(value: IStruct3d) = preTranslate(value.component1(), value.component2(), value.component3())
fun preTranslate(value: Vector2d) = preTranslate(value.component1(), value.component2())
fun preTranslate(value: Vector3d) = preTranslate(value.component1(), value.component2(), value.component3())
@JvmOverloads
fun scale(x: Double = 1.0, y: Double = 1.0, z: Double = 1.0, w: Double = 1.0): Matrix4d {
return mul(c00 = x, c11 = y, c22 = z, c33 = w)
}
fun scale(value: IStruct2d) = scale(value.component1(), value.component2())
fun scale(value: IStruct3d) = scale(value.component1(), value.component2(), value.component3())
fun scale(value: IStruct4d) = scale(value.component1(), value.component2(), value.component3(), value.component3())
fun scale(value: Vector2d) = scale(value.component1(), value.component2())
fun scale(value: Vector3d) = scale(value.component1(), value.component2(), value.component3())
fun scale(value: Vector4d) = scale(value.component1(), value.component2(), value.component3(), value.component3())
@JvmOverloads
fun preScale(x: Double = 1.0, y: Double = 1.0, z: Double = 1.0, w: Double = 1.0): Matrix4d {
return mulIntoThis(c00 = x, c11 = y, c22 = z, c33 = w)
}
fun preScale(value: IStruct2d) = preScale(value.component1(), value.component2())
fun preScale(value: IStruct3d) = preScale(value.component1(), value.component2(), value.component3())
fun preScale(value: IStruct4d) = preScale(value.component1(), value.component2(), value.component3(), value.component3())
fun preScale(value: Vector2d) = preScale(value.component1(), value.component2())
fun preScale(value: Vector3d) = preScale(value.component1(), value.component2(), value.component3())
fun preScale(value: Vector4d) = preScale(value.component1(), value.component2(), value.component3(), value.component3())
fun rotateAroundX(angle: Double): Matrix4d {
val cos = cos(angle)
val sin = sin(angle)
return mul(
c11 = cos,
c21 = -sin,
c12 = sin,
c22 = cos,
)
}
fun rotateAroundY(angle: Double): Matrix4d {
val cos = cos(angle)
val sin = sin(angle)
return mul(
c00 = cos,
c20 = sin,
c02 = -sin,
c22 = cos,
)
}
fun rotateAroundZ(angle: Double): Matrix4d {
val cos = cos(angle)
val sin = sin(angle)
return mul(
c00 = cos,
c10 = -sin,
c01 = sin,
c11 = cos,
)
}
fun preRotateAroundX(angle: Double): Matrix4d {
val cos = cos(angle)
val sin = sin(angle)
return mulIntoThis(
c11 = cos,
c21 = -sin,
c12 = sin,
c22 = cos,
)
}
fun preRotateAroundY(angle: Double): Matrix4d {
val cos = cos(angle)
val sin = sin(angle)
return mulIntoThis(
c00 = cos,
c20 = sin,
c02 = -sin,
c22 = cos,
)
}
fun preRotateAroundZ(angle: Double): Matrix4d {
val cos = cos(angle)
val sin = sin(angle)
return mulIntoThis(
c00 = cos,
c10 = -sin,
c01 = sin,
c11 = cos,
)
}
private data class Impl(
override var c00: Double,
override var c01: Double,
override var c02: Double,
override var c03: Double,
override var c10: Double,
override var c11: Double,
override var c12: Double,
override var c13: Double,
override var c20: Double,
override var c21: Double,
override var c22: Double,
override var c23: Double,
override var c30: Double,
override var c31: Double,
override var c32: Double,
override var c33: Double,
) : Matrix4d() {
override fun toString(): String {
return "Matrix4d" + super.toString()
}
override fun equals(other: Any?): Boolean {
if (other !is Matrix4d) return false
return this === other || c00 == other.c00 &&
c01 == other.c01 &&
c02 == other.c02 &&
c03 == other.c03 &&
c10 == other.c10 &&
c11 == other.c11 &&
c12 == other.c12 &&
c13 == other.c13 &&
c20 == other.c20 &&
c21 == other.c21 &&
c22 == other.c22 &&
c23 == other.c23 &&
c30 == other.c30 &&
c31 == other.c31 &&
c32 == other.c32 &&
c33 == other.c33
}
}
private class View(private val parent: Matrix4d) : Matrix4d() {
override var c00: Double get() = parent.c00; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c01: Double get() = parent.c01; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c02: Double get() = parent.c02; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c03: Double get() = parent.c03; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c10: Double get() = parent.c10; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c11: Double get() = parent.c11; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c12: Double get() = parent.c12; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c13: Double get() = parent.c13; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c20: Double get() = parent.c20; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c21: Double get() = parent.c21; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c22: Double get() = parent.c22; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c23: Double get() = parent.c23; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c30: Double get() = parent.c30; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c31: Double get() = parent.c31; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c32: Double get() = parent.c32; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c33: Double get() = parent.c33; set(_) { throw UnsupportedOperationException("Read-Only view") }
override fun set(column: Int, row: Int, value: Double) {
throw UnsupportedOperationException("Read-Only view")
}
override fun equals(other: Any?): Boolean {
return other === this || parent == other
}
override fun hashCode(): Int {
return parent.hashCode()
}
override fun toString(): String {
return "View = $parent"
}
}
companion object {
@JvmStatic
fun all(value: Double) = construct4(value, Companion::columnMajor)
@JvmStatic
fun zero() = all(0.0)
@JvmStatic
fun identity() = columnMajor()
@JvmStatic
fun unmodifiable(value: Matrix4d): Matrix4d {
if (value is View)
return value
else
return View(value)
}
@JvmStatic
fun columnMajor(
c00: Double = 1.0, c01: Double = 0.0, c02: Double = 0.0, c03: Double = 0.0,
c10: Double = 0.0, c11: Double = 1.0, c12: Double = 0.0, c13: Double = 0.0,
c20: Double = 0.0, c21: Double = 0.0, c22: Double = 1.0, c23: Double = 0.0,
c30: Double = 0.0, c31: Double = 0.0, c32: Double = 0.0, c33: Double = 1.0,
): Matrix4d {
return Impl(c00, c01, c02, c03, c10, c11, c12, c13, c20, c21, c22, c23, c30, c31, c32, c33)
}
@JvmStatic
fun rowMajor(
r00: Double = 1.0, r01: Double = 0.0, r02: Double = 0.0, r03: Double = 0.0,
r10: Double = 0.0, r11: Double = 1.0, r12: Double = 0.0, r13: Double = 0.0,
r20: Double = 0.0, r21: Double = 0.0, r22: Double = 1.0, r23: Double = 0.0,
r30: Double = 0.0, r31: Double = 0.0, r32: Double = 0.0, r33: Double = 1.0
): Matrix4d {
return Impl(
r00, r10, r20, r30,
r01, r11, r21, r31,
r02, r12, r22, r32,
r03, r13, r23, r33
)
}
@JvmStatic
fun from(matrix: Double2DArray, filler: Double) = construct4(matrix, Double2DArray::get, Companion::columnMajor, filler)
@JvmStatic
fun from(matrix: Double2DArray) = construct4(matrix, Double2DArray::get, Companion::columnMajor, 0.0)
@JvmStatic
fun from(matrix: Matrix4d) = construct4(matrix, Double2DArray::get, Companion::columnMajor)
@JvmStatic
fun fromTransposed(matrix: Double2DArray) = construct4(matrix, Double2DArray::get, Companion::rowMajor, 0.0)
@JvmStatic
fun fromTransposed(matrix: Double2DArray, filler: Double) = construct4(matrix, Double2DArray::get, Companion::rowMajor, filler)
@JvmStatic
fun fromTransposed(matrix: Matrix4d) = construct4(matrix, Double2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromColumnMajor(buffer: DoubleBuffer) = construct4(buffer, DoubleBuffer::get, Companion::columnMajor)
@JvmStatic
fun fromColumnMajor(buffer: ByteBuffer) = construct4(buffer, ByteBuffer::getDouble, Companion::columnMajor)
@JvmStatic
fun fromRowMajor(buffer: DoubleBuffer) = construct4(buffer, DoubleBuffer::get, Companion::rowMajor)
@JvmStatic
fun fromRowMajor(buffer: ByteBuffer) = construct4(buffer, ByteBuffer::getDouble, Companion::rowMajor)
/**
* Constructs new ortho projection matrix, with Y coordinate flipped (useful for OpenGL GUI drawing).
*
* Inversion of Y means that X 0 Y 0 will be top left position on screen (in OpenGL), not bottom left.
*/
@JvmStatic
fun ortho(left: Double, right: Double, bottom: Double, top: Double, zNear: Double, zFar: Double): Matrix4d {
return rowMajor(
r00 = 2.0 / (right - left),
r11 = -2.0 / (top - bottom),
r22 = 2.0 / (zFar - zNear),
r03 = -(right + left) / (right - left),
r13 = -(top + bottom) / (top - bottom) + 2.0,
r23 = -(zFar + zNear) / (zFar - zNear)
)
}
/**
* Constructs new ortho projection matrix
*/
@JvmStatic
fun orthoDirect(left: Double, right: Double, bottom: Double, top: Double, zNear: Double, zFar: Double): Matrix4d {
return rowMajor(
r00 = 2.0 / (right - left),
r11 = 2.0 / (top - bottom),
r22 = 2.0 / (zFar - zNear),
r03 = -(right + left) / (right - left),
r13 = -(top + bottom) / (top - bottom),
r23 = -(zFar + zNear) / (zFar - zNear)
)
}
/**
* Constructs new perspective matrix
*/
@JvmStatic
fun perspective(fov: Double, zFar: Double, zNear: Double): Matrix4d {
val scale = (1.0 / (tan(Math.toRadians(fov.toDouble()) / 2.0))).toDouble()
val r = zFar - zNear
return rowMajor(
r00 = scale,
r11 = scale,
r22 = -zFar / r,
r23 = -1.0,
r32 = -zFar * zNear / r,
)
}
// kotlin compiler bug? it refuses to use TABLESWITCH if these are inlined
const val C00 = (0 or (0 shl 2))
const val C01 = (0 or (1 shl 2))
const val C02 = (0 or (2 shl 2))
const val C03 = (0 or (3 shl 2))
const val C10 = (1 or (0 shl 2))
const val C11 = (1 or (1 shl 2))
const val C12 = (1 or (2 shl 2))
const val C13 = (1 or (3 shl 2))
const val C20 = (2 or (0 shl 2))
const val C21 = (2 or (1 shl 2))
const val C22 = (2 or (2 shl 2))
const val C23 = (2 or (3 shl 2))
const val C30 = (3 or (0 shl 2))
const val C31 = (3 or (1 shl 2))
const val C32 = (3 or (2 shl 2))
const val C33 = (3 or (3 shl 2))
}
}

55
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix4dStack.kt Normal file
View File

@ -0,0 +1,55 @@
package ru.dbotthepony.kstarbound.math.matrix
class Matrix4dStack {
private val stack = ArrayDeque<Matrix4d>()
init {
stack.addLast(Matrix4d.identity())
}
fun clear(top: Matrix4d): Matrix4dStack {
stack.clear()
stack.addLast(top.copy())
return this
}
fun push(): Matrix4dStack {
stack.addLast(stack.last().copy())
return this
}
fun pop(): Matrix4d {
return stack.removeLast()
}
fun last(): Matrix4d {
return stack.last()
}
fun push(matrix: Matrix4d): Matrix4dStack {
stack.addLast(matrix.copy())
return this
}
fun identity() = push(Matrix4d.identity())
fun zero() = push(Matrix4d.all(0.0))
fun all(value: Double) = push(Matrix4d.all(value))
inline fun <T> with(block: Matrix4d.() -> T): T {
return try {
push()
block(last())
} finally {
pop()
}
}
inline fun <T> with(matrix: Matrix4d, block: Matrix4d.() -> T): T {
return try {
push(matrix)
block(last())
} finally {
pop()
}
}
}

734
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix4f.kt Normal file
View File

@ -0,0 +1,734 @@
package ru.dbotthepony.kstarbound.math.matrix
import ru.dbotthepony.kommons.arrays.Float2DArray
import ru.dbotthepony.kommons.arrays.mulMatrixComponents
import ru.dbotthepony.kommons.util.IStruct2f
import ru.dbotthepony.kommons.util.IStruct3f
import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector3f
import ru.dbotthepony.kstarbound.math.vector.Vector4f
import java.nio.ByteBuffer
import java.nio.FloatBuffer
import kotlin.math.cos
import kotlin.math.sin
import kotlin.math.tan
sealed class Matrix4f : Float2DArray() {
abstract var c00: Float
abstract var c01: Float
abstract var c02: Float
abstract var c03: Float
abstract var c10: Float
abstract var c11: Float
abstract var c12: Float
abstract var c13: Float
abstract var c20: Float
abstract var c21: Float
abstract var c22: Float
abstract var c23: Float
abstract var c30: Float
abstract var c31: Float
abstract var c32: Float
abstract var c33: Float
fun c00() = c00
fun c00(value: Float): Matrix4f { c00 = value; return this }
fun c01() = c01
fun c01(value: Float): Matrix4f { c01 = value; return this }
fun c02() = c02
fun c02(value: Float): Matrix4f { c02 = value; return this }
fun c03() = c03
fun c03(value: Float): Matrix4f { c03 = value; return this }
fun c10() = c10
fun c10(value: Float): Matrix4f { c10 = value; return this }
fun c11() = c11
fun c11(value: Float): Matrix4f { c11 = value; return this }
fun c12() = c12
fun c12(value: Float): Matrix4f { c12 = value; return this }
fun c13() = c13
fun c13(value: Float): Matrix4f { c13 = value; return this }
fun c20() = c20
fun c20(value: Float): Matrix4f { c20 = value; return this }
fun c21() = c21
fun c21(value: Float): Matrix4f { c21 = value; return this }
fun c22() = c22
fun c22(value: Float): Matrix4f { c22 = value; return this }
fun c23() = c23
fun c23(value: Float): Matrix4f { c23 = value; return this }
fun c30() = c30
fun c30(value: Float): Matrix4f { c30 = value; return this }
fun c31() = c31
fun c31(value: Float): Matrix4f { c31 = value; return this }
fun c32() = c32
fun c32(value: Float): Matrix4f { c32 = value; return this }
fun c33() = c33
fun c33(value: Float): Matrix4f { c33 = value; return this }
var r00: Float get() = c00; set(value) { c00 = value } // row 0 column 0
var r01: Float get() = c10; set(value) { c10 = value } // row 1 column 0
var r02: Float get() = c20; set(value) { c20 = value } // row 2 column 0
var r03: Float get() = c30; set(value) { c30 = value } // row 3 column 0
var r10: Float get() = c01; set(value) { c01 = value } // row 0 column 1
var r11: Float get() = c11; set(value) { c11 = value } // row 1 column 1
var r12: Float get() = c21; set(value) { c21 = value } // row 2 column 1
var r13: Float get() = c31; set(value) { c31 = value } // row 3 column 1
var r20: Float get() = c02; set(value) { c02 = value } // row 0 column 2
var r21: Float get() = c12; set(value) { c12 = value } // row 1 column 2
var r22: Float get() = c22; set(value) { c22 = value } // row 2 column 2
var r23: Float get() = c32; set(value) { c32 = value } // row 3 column 2
var r30: Float get() = c03; set(value) { c03 = value } // row 0 column 3
var r31: Float get() = c13; set(value) { c13 = value } // row 1 column 3
var r32: Float get() = c23; set(value) { c23 = value } // row 2 column 3
var r33: Float get() = c33; set(value) { c33 = value } // row 3 column 3
fun r00() = r00
fun r00(value: Float): Matrix4f { r00 = value; return this }
fun r01() = r01
fun r01(value: Float): Matrix4f { r01 = value; return this }
fun r02() = r02
fun r02(value: Float): Matrix4f { r02 = value; return this }
fun r03() = r03
fun r03(value: Float): Matrix4f { r03 = value; return this }
fun r10() = r10
fun r10(value: Float): Matrix4f { r10 = value; return this }
fun r11() = r11
fun r11(value: Float): Matrix4f { r11 = value; return this }
fun r12() = r12
fun r12(value: Float): Matrix4f { r12 = value; return this }
fun r13() = r13
fun r13(value: Float): Matrix4f { r13 = value; return this }
fun r20() = r20
fun r20(value: Float): Matrix4f { r20 = value; return this }
fun r21() = r21
fun r21(value: Float): Matrix4f { r21 = value; return this }
fun r22() = r22
fun r22(value: Float): Matrix4f { r22 = value; return this }
fun r23() = r23
fun r23(value: Float): Matrix4f { r23 = value; return this }
fun r30() = r30
fun r30(value: Float): Matrix4f { r30 = value; return this }
fun r31() = r31
fun r31(value: Float): Matrix4f { r31 = value; return this }
fun r32() = r32
fun r32(value: Float): Matrix4f { r32 = value; return this }
fun r33() = r33
fun r33(value: Float): Matrix4f { r33 = value; return this }
final override val rows: Int
get() = 4
final override val columns: Int
get() = 4
final override val transposed get() =
columnMajor(
c00 = r00,
c01 = r01,
c02 = r02,
c03 = r03,
c10 = r10,
c11 = r11,
c12 = r12,
c13 = r13,
c20 = r20,
c21 = r21,
c22 = r22,
c23 = r23,
c30 = r30,
c31 = r31,
c32 = r32,
c33 = r33,
)
final override fun get(column: Int, row: Int): Float {
return when (column or (row shl 2)) {
C00 -> c00
C01 -> c01
C02 -> c02
C03 -> c03
C10 -> c10
C11 -> c11
C12 -> c12
C13 -> c13
C20 -> c20
C21 -> c21
C22 -> c22
C23 -> c23
C30 -> c30
C31 -> c31
C32 -> c32
C33 -> c33
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
override fun set(column: Int, row: Int, value: Float) {
when (column or (row shl 2)) {
C00 -> c00 = value
C01 -> c01 = value
C02 -> c02 = value
C03 -> c03 = value
C10 -> c10 = value
C11 -> c11 = value
C12 -> c12 = value
C13 -> c13 = value
C20 -> c20 = value
C21 -> c21 = value
C22 -> c22 = value
C23 -> c23 = value
C30 -> c30 = value
C31 -> c31 = value
C32 -> c32 = value
C33 -> c33 = value
else -> throw IndexOutOfBoundsException("Column $column; Row $row; while size of this matrix are 4x4")
}
}
fun mul(other: Matrix4f): Matrix4f {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c02 = mulMatrixComponents(this, other, 0, 2)
val c03 = mulMatrixComponents(this, other, 0, 3)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
val c12 = mulMatrixComponents(this, other, 1, 2)
val c13 = mulMatrixComponents(this, other, 1, 3)
val c20 = mulMatrixComponents(this, other, 2, 0)
val c21 = mulMatrixComponents(this, other, 2, 1)
val c22 = mulMatrixComponents(this, other, 2, 2)
val c23 = mulMatrixComponents(this, other, 2, 3)
val c30 = mulMatrixComponents(this, other, 3, 0)
val c31 = mulMatrixComponents(this, other, 3, 1)
val c32 = mulMatrixComponents(this, other, 3, 2)
val c33 = mulMatrixComponents(this, other, 3, 3)
this.c00 = c00
this.c01 = c01
this.c02 = c02
this.c03 = c03
this.c10 = c10
this.c11 = c11
this.c12 = c12
this.c13 = c13
this.c20 = c20
this.c21 = c21
this.c22 = c22
this.c23 = c23
this.c30 = c30
this.c31 = c31
this.c32 = c32
this.c33 = c33
return this
}
fun mulIntoOther(other: Matrix4f): Matrix4f {
val c00 = mulMatrixComponents(this, other, 0, 0)
val c01 = mulMatrixComponents(this, other, 0, 1)
val c02 = mulMatrixComponents(this, other, 0, 2)
val c03 = mulMatrixComponents(this, other, 0, 3)
val c10 = mulMatrixComponents(this, other, 1, 0)
val c11 = mulMatrixComponents(this, other, 1, 1)
val c12 = mulMatrixComponents(this, other, 1, 2)
val c13 = mulMatrixComponents(this, other, 1, 3)
val c20 = mulMatrixComponents(this, other, 2, 0)
val c21 = mulMatrixComponents(this, other, 2, 1)
val c22 = mulMatrixComponents(this, other, 2, 2)
val c23 = mulMatrixComponents(this, other, 2, 3)
val c30 = mulMatrixComponents(this, other, 3, 0)
val c31 = mulMatrixComponents(this, other, 3, 1)
val c32 = mulMatrixComponents(this, other, 3, 2)
val c33 = mulMatrixComponents(this, other, 3, 3)
other.c00 = c00
other.c01 = c01
other.c02 = c02
other.c03 = c03
other.c10 = c10
other.c11 = c11
other.c12 = c12
other.c13 = c13
other.c20 = c20
other.c21 = c21
other.c22 = c22
other.c23 = c23
other.c30 = c30
other.c31 = c31
other.c32 = c32
other.c33 = c33
return other
}
/**
* this * other, writes result into this
*/
fun mul(
c00: Float = 1f,
c01: Float = 0f,
c02: Float = 0f,
c03: Float = 0f,
c10: Float = 0f,
c11: Float = 1f,
c12: Float = 0f,
c13: Float = 0f,
c20: Float = 0f,
c21: Float = 0f,
c22: Float = 1f,
c23: Float = 0f,
c30: Float = 0f,
c31: Float = 0f,
c32: Float = 0f,
c33: Float = 1f,
): Matrix4f {
val fc00 = this.c00 * c00 + this.c10 * c01 + this.c20 * c02 + this.c30 * c03
val fc01 = this.c01 * c00 + this.c11 * c01 + this.c21 * c02 + this.c31 * c03
val fc02 = this.c02 * c00 + this.c12 * c01 + this.c22 * c02 + this.c32 * c03
val fc03 = this.c03 * c00 + this.c13 * c01 + this.c23 * c02 + this.c33 * c03
val fc10 = this.c00 * c10 + this.c10 * c11 + this.c20 * c12 + this.c30 * c13
val fc11 = this.c01 * c10 + this.c11 * c11 + this.c21 * c12 + this.c31 * c13
val fc12 = this.c02 * c10 + this.c12 * c11 + this.c22 * c12 + this.c32 * c13
val fc13 = this.c03 * c10 + this.c13 * c11 + this.c23 * c12 + this.c33 * c13
val fc20 = this.c00 * c20 + this.c10 * c21 + this.c20 * c22 + this.c30 * c23
val fc21 = this.c01 * c20 + this.c11 * c21 + this.c21 * c22 + this.c31 * c23
val fc22 = this.c02 * c20 + this.c12 * c21 + this.c22 * c22 + this.c32 * c23
val fc23 = this.c03 * c20 + this.c13 * c21 + this.c23 * c22 + this.c33 * c23
val fc30 = this.c00 * c30 + this.c10 * c31 + this.c20 * c32 + this.c30 * c33
val fc31 = this.c01 * c30 + this.c11 * c31 + this.c21 * c32 + this.c31 * c33
val fc32 = this.c02 * c30 + this.c12 * c31 + this.c22 * c32 + this.c32 * c33
val fc33 = this.c03 * c30 + this.c13 * c31 + this.c23 * c32 + this.c33 * c33
this.c00 = fc00
this.c01 = fc01
this.c02 = fc02
this.c03 = fc03
this.c10 = fc10
this.c11 = fc11
this.c12 = fc12
this.c13 = fc13
this.c20 = fc20
this.c21 = fc21
this.c22 = fc22
this.c23 = fc23
this.c30 = fc30
this.c31 = fc31
this.c32 = fc32
this.c33 = fc33
return this
}
/**
* other * this, writes result into this
*/
fun mulIntoThis(
c00: Float = 1f,
c01: Float = 0f,
c02: Float = 0f,
c03: Float = 0f,
c10: Float = 0f,
c11: Float = 1f,
c12: Float = 0f,
c13: Float = 0f,
c20: Float = 0f,
c21: Float = 0f,
c22: Float = 1f,
c23: Float = 0f,
c30: Float = 0f,
c31: Float = 0f,
c32: Float = 0f,
c33: Float = 1f,
): Matrix4f {
val fc00 = c00 * this.c00 + c10 * this.c01 + c20 * this.c02 + c30 * this.c03
val fc01 = c01 * this.c00 + c11 * this.c01 + c21 * this.c02 + c31 * this.c03
val fc02 = c02 * this.c00 + c12 * this.c01 + c22 * this.c02 + c32 * this.c03
val fc03 = c03 * this.c00 + c13 * this.c01 + c23 * this.c02 + c33 * this.c03
val fc10 = c00 * this.c10 + c10 * this.c11 + c20 * this.c12 + c30 * this.c13
val fc11 = c01 * this.c10 + c11 * this.c11 + c21 * this.c12 + c31 * this.c13
val fc12 = c02 * this.c10 + c12 * this.c11 + c22 * this.c12 + c32 * this.c13
val fc13 = c03 * this.c10 + c13 * this.c11 + c23 * this.c12 + c33 * this.c13
val fc20 = c00 * this.c20 + c10 * this.c21 + c20 * this.c22 + c30 * this.c23
val fc21 = c01 * this.c20 + c11 * this.c21 + c21 * this.c22 + c31 * this.c23
val fc22 = c02 * this.c20 + c12 * this.c21 + c22 * this.c22 + c32 * this.c23
val fc23 = c03 * this.c20 + c13 * this.c21 + c23 * this.c22 + c33 * this.c23
val fc30 = c00 * this.c30 + c10 * this.c31 + c20 * this.c32 + c30 * this.c33
val fc31 = c01 * this.c30 + c11 * this.c31 + c21 * this.c32 + c31 * this.c33
val fc32 = c02 * this.c30 + c12 * this.c31 + c22 * this.c32 + c32 * this.c33
val fc33 = c03 * this.c30 + c13 * this.c31 + c23 * this.c32 + c33 * this.c33
this.c00 = fc00
this.c01 = fc01
this.c02 = fc02
this.c03 = fc03
this.c10 = fc10
this.c11 = fc11
this.c12 = fc12
this.c13 = fc13
this.c20 = fc20
this.c21 = fc21
this.c22 = fc22
this.c23 = fc23
this.c30 = fc30
this.c31 = fc31
this.c32 = fc32
this.c33 = fc33
return this
}
final override fun add(other: Float): Matrix4f {
return super.add(other) as Matrix4f
}
final override fun sub(other: Float): Matrix4f {
return super.sub(other) as Matrix4f
}
final override fun mul(other: Float): Matrix4f {
return super.mul(other) as Matrix4f
}
final override fun div(other: Float): Matrix4f {
return super.div(other) as Matrix4f
}
final override fun add(other: Float2DArray): Matrix4f {
return super.add(other) as Matrix4f
}
final override fun sub(other: Float2DArray): Matrix4f {
return super.sub(other) as Matrix4f
}
fun to2f() = Matrix2f.from(this)
fun to3f() = Matrix3f.from(this)
fun copy(): Matrix4f {
return Impl(c00, c01, c02, c03, c10, c11, c12, c13, c20, c21, c22, c23, c30, c31, c32, c33)
}
@JvmOverloads
fun translate(x: Float = 0f, y: Float = 0f, z: Float = 0f): Matrix4f {
return mul(c30 = x, c31 = y, c32 = z)
}
fun translate(value: IStruct2f) = translate(value.component1(), value.component2())
fun translate(value: IStruct3f) = translate(value.component1(), value.component2(), value.component3())
fun translate(value: Vector2f) = translate(value.component1(), value.component2())
fun translate(value: Vector3f) = translate(value.component1(), value.component2(), value.component3())
@JvmOverloads
fun preTranslate(x: Float = 0f, y: Float = 0f, z: Float = 0f): Matrix4f {
return mulIntoThis(c30 = x, c31 = y, c32 = z)
}
fun preTranslate(value: IStruct2f) = preTranslate(value.component1(), value.component2())
fun preTranslate(value: IStruct3f) = preTranslate(value.component1(), value.component2(), value.component3())
fun preTranslate(value: Vector2f) = preTranslate(value.component1(), value.component2())
fun preTranslate(value: Vector3f) = preTranslate(value.component1(), value.component2(), value.component3())
@JvmOverloads
fun scale(x: Float = 1f, y: Float = 1f, z: Float = 1f, w: Float = 1f): Matrix4f {
return mul(c00 = x, c11 = y, c22 = z, c33 = w)
}
fun scale(value: IStruct2f) = scale(value.component1(), value.component2())
fun scale(value: IStruct3f) = scale(value.component1(), value.component2(), value.component3())
fun scale(value: IStruct4f) = scale(value.component1(), value.component2(), value.component3(), value.component3())
fun scale(value: Vector2f) = scale(value.component1(), value.component2())
fun scale(value: Vector3f) = scale(value.component1(), value.component2(), value.component3())
fun scale(value: Vector4f) = scale(value.component1(), value.component2(), value.component3(), value.component3())
@JvmOverloads
fun preScale(x: Float = 1f, y: Float = 1f, z: Float = 1f, w: Float = 1f): Matrix4f {
return mulIntoThis(c00 = x, c11 = y, c22 = z, c33 = w)
}
fun preScale(value: IStruct2f) = preScale(value.component1(), value.component2())
fun preScale(value: IStruct3f) = preScale(value.component1(), value.component2(), value.component3())
fun preScale(value: IStruct4f) = preScale(value.component1(), value.component2(), value.component3(), value.component3())
fun preScale(value: Vector2f) = preScale(value.component1(), value.component2())
fun preScale(value: Vector3f) = preScale(value.component1(), value.component2(), value.component3())
fun preScale(value: Vector4f) = preScale(value.component1(), value.component2(), value.component3(), value.component3())
fun rotateAroundX(angle: Float): Matrix4f {
val cos = cos(angle)
val sin = sin(angle)
return mul(
c11 = cos,
c21 = -sin,
c12 = sin,
c22 = cos,
)
}
fun rotateAroundY(angle: Float): Matrix4f {
val cos = cos(angle)
val sin = sin(angle)
return mul(
c00 = cos,
c20 = sin,
c02 = -sin,
c22 = cos,
)
}
fun rotateAroundZ(angle: Float): Matrix4f {
val cos = cos(angle)
val sin = sin(angle)
return mul(
c00 = cos,
c10 = -sin,
c01 = sin,
c11 = cos,
)
}
fun preRotateAroundX(angle: Float): Matrix4f {
val cos = cos(angle)
val sin = sin(angle)
return mulIntoThis(
c11 = cos,
c21 = -sin,
c12 = sin,
c22 = cos,
)
}
fun preRotateAroundY(angle: Float): Matrix4f {
val cos = cos(angle)
val sin = sin(angle)
return mulIntoThis(
c00 = cos,
c20 = sin,
c02 = -sin,
c22 = cos,
)
}
fun preRotateAroundZ(angle: Float): Matrix4f {
val cos = cos(angle)
val sin = sin(angle)
return mulIntoThis(
c00 = cos,
c10 = -sin,
c01 = sin,
c11 = cos,
)
}
private data class Impl(
override var c00: Float,
override var c01: Float,
override var c02: Float,
override var c03: Float,
override var c10: Float,
override var c11: Float,
override var c12: Float,
override var c13: Float,
override var c20: Float,
override var c21: Float,
override var c22: Float,
override var c23: Float,
override var c30: Float,
override var c31: Float,
override var c32: Float,
override var c33: Float,
) : Matrix4f() {
override fun toString(): String {
return "Matrix4f" + super.toString()
}
override fun equals(other: Any?): Boolean {
if (other !is Matrix4f) return false
return this === other || c00 == other.c00 &&
c01 == other.c01 &&
c02 == other.c02 &&
c03 == other.c03 &&
c10 == other.c10 &&
c11 == other.c11 &&
c12 == other.c12 &&
c13 == other.c13 &&
c20 == other.c20 &&
c21 == other.c21 &&
c22 == other.c22 &&
c23 == other.c23 &&
c30 == other.c30 &&
c31 == other.c31 &&
c32 == other.c32 &&
c33 == other.c33
}
}
private class View(private val parent: Matrix4f) : Matrix4f() {
override var c00: Float get() = parent.c00; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c01: Float get() = parent.c01; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c02: Float get() = parent.c02; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c03: Float get() = parent.c03; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c10: Float get() = parent.c10; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c11: Float get() = parent.c11; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c12: Float get() = parent.c12; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c13: Float get() = parent.c13; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c20: Float get() = parent.c20; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c21: Float get() = parent.c21; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c22: Float get() = parent.c22; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c23: Float get() = parent.c23; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c30: Float get() = parent.c30; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c31: Float get() = parent.c31; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c32: Float get() = parent.c32; set(_) { throw UnsupportedOperationException("Read-Only view") }
override var c33: Float get() = parent.c33; set(_) { throw UnsupportedOperationException("Read-Only view") }
override fun set(column: Int, row: Int, value: Float) {
throw UnsupportedOperationException("Read-Only view")
}
override fun equals(other: Any?): Boolean {
return other === this || parent == other
}
override fun hashCode(): Int {
return parent.hashCode()
}
override fun toString(): String {
return "View = $parent"
}
}
companion object {
@JvmStatic
fun all(value: Float) = construct4(value, Companion::columnMajor)
@JvmStatic
fun zero() = all(0f)
@JvmStatic
fun identity() = columnMajor()
@JvmStatic
fun unmodifiable(value: Matrix4f): Matrix4f {
if (value is View)
return value
else
return View(value)
}
@JvmStatic
fun columnMajor(
c00: Float = 1f, c01: Float = 0f, c02: Float = 0f, c03: Float = 0f,
c10: Float = 0f, c11: Float = 1f, c12: Float = 0f, c13: Float = 0f,
c20: Float = 0f, c21: Float = 0f, c22: Float = 1f, c23: Float = 0f,
c30: Float = 0f, c31: Float = 0f, c32: Float = 0f, c33: Float = 1f,
): Matrix4f {
return Impl(c00, c01, c02, c03, c10, c11, c12, c13, c20, c21, c22, c23, c30, c31, c32, c33)
}
@JvmStatic
fun rowMajor(
r00: Float = 1f, r01: Float = 0f, r02: Float = 0f, r03: Float = 0f,
r10: Float = 0f, r11: Float = 1f, r12: Float = 0f, r13: Float = 0f,
r20: Float = 0f, r21: Float = 0f, r22: Float = 1f, r23: Float = 0f,
r30: Float = 0f, r31: Float = 0f, r32: Float = 0f, r33: Float = 1f
): Matrix4f {
return Impl(
r00, r10, r20, r30,
r01, r11, r21, r31,
r02, r12, r22, r32,
r03, r13, r23, r33
)
}
@JvmStatic
fun from(matrix: Float2DArray, filler: Float) = construct4(matrix, Float2DArray::get, Companion::columnMajor, filler)
@JvmStatic
fun from(matrix: Float2DArray) = construct4(matrix, Float2DArray::get, Companion::columnMajor, 0f)
@JvmStatic
fun from(matrix: Matrix4f) = construct4(matrix, Float2DArray::get, Companion::columnMajor)
@JvmStatic
fun fromTransposed(matrix: Float2DArray) = construct4(matrix, Float2DArray::get, Companion::rowMajor, 0f)
@JvmStatic
fun fromTransposed(matrix: Float2DArray, filler: Float) = construct4(matrix, Float2DArray::get, Companion::rowMajor, filler)
@JvmStatic
fun fromTransposed(matrix: Matrix4f) = construct4(matrix, Float2DArray::get, Companion::rowMajor)
@JvmStatic
fun fromColumnMajor(buffer: FloatBuffer) = construct4(buffer, FloatBuffer::get, Companion::columnMajor)
@JvmStatic
fun fromColumnMajor(buffer: ByteBuffer) = construct4(buffer, ByteBuffer::getFloat, Companion::columnMajor)
@JvmStatic
fun fromRowMajor(buffer: FloatBuffer) = construct4(buffer, FloatBuffer::get, Companion::rowMajor)
@JvmStatic
fun fromRowMajor(buffer: ByteBuffer) = construct4(buffer, ByteBuffer::getFloat, Companion::rowMajor)
/**
* Constructs new ortho projection matrix, with Y coordinate flipped (useful for OpenGL GUI drawing).
*
* Inversion of Y means that X 0 Y 0 will be top left position on screen (in OpenGL), not bottom left.
*/
@JvmStatic
fun ortho(left: Float, right: Float, bottom: Float, top: Float, zNear: Float, zFar: Float): Matrix4f {
return rowMajor(
r00 = 2f / (right - left),
r11 = -2f / (top - bottom),
r22 = 2f / (zFar - zNear),
r03 = -(right + left) / (right - left),
r13 = -(top + bottom) / (top - bottom) + 2f,
r23 = -(zFar + zNear) / (zFar - zNear)
)
}
/**
* Constructs new ortho projection matrix
*/
@JvmStatic
fun orthoDirect(left: Float, right: Float, bottom: Float, top: Float, zNear: Float, zFar: Float): Matrix4f {
return rowMajor(
r00 = 2f / (right - left),
r11 = 2f / (top - bottom),
r22 = 2f / (zFar - zNear),
r03 = -(right + left) / (right - left),
r13 = -(top + bottom) / (top - bottom),
r23 = -(zFar + zNear) / (zFar - zNear)
)
}
/**
* Constructs new perspective matrix
*/
@JvmStatic
fun perspective(fov: Float, zFar: Float, zNear: Float): Matrix4f {
val scale = (1.0 / (tan(Math.toRadians(fov.toDouble()) / 2.0))).toFloat()
val r = zFar - zNear
return rowMajor(
r00 = scale,
r11 = scale,
r22 = -zFar / r,
r23 = -1f,
r32 = -zFar * zNear / r,
)
}
// kotlin compiler bug? it refuses to use TABLESWITCH if these are inlined
const val C00 = (0 or (0 shl 2))
const val C01 = (0 or (1 shl 2))
const val C02 = (0 or (2 shl 2))
const val C03 = (0 or (3 shl 2))
const val C10 = (1 or (0 shl 2))
const val C11 = (1 or (1 shl 2))
const val C12 = (1 or (2 shl 2))
const val C13 = (1 or (3 shl 2))
const val C20 = (2 or (0 shl 2))
const val C21 = (2 or (1 shl 2))
const val C22 = (2 or (2 shl 2))
const val C23 = (2 or (3 shl 2))
const val C30 = (3 or (0 shl 2))
const val C31 = (3 or (1 shl 2))
const val C32 = (3 or (2 shl 2))
const val C33 = (3 or (3 shl 2))
}
}

55
src/main/kotlin/ru/dbotthepony/kstarbound/math/matrix/Matrix4fStack.kt Normal file
View File

@ -0,0 +1,55 @@
package ru.dbotthepony.kstarbound.math.matrix
class Matrix4fStack {
private val stack = ArrayDeque<Matrix4f>()
init {
stack.addLast(Matrix4f.identity())
}
fun clear(top: Matrix4f): Matrix4fStack {
stack.clear()
stack.addLast(top.copy())
return this
}
fun push(): Matrix4fStack {
stack.addLast(stack.last().copy())
return this
}
fun pop(): Matrix4f {
return stack.removeLast()
}
fun last(): Matrix4f {
return stack.last()
}
fun push(matrix: Matrix4f): Matrix4fStack {
stack.addLast(matrix.copy())
return this
}
fun identity() = push(Matrix4f.identity())
fun zero() = push(Matrix4f.all(0f))
fun all(value: Float) = push(Matrix4f.all(value))
inline fun <T> with(block: Matrix4f.() -> T): T {
return try {
push()
block(last())
} finally {
pop()
}
}
inline fun <T> with(matrix: Matrix4f, block: Matrix4f.() -> T): T {
return try {
push(matrix)
block(last())
} finally {
pop()
}
}
}

Some files were not shown because too many files have changed in this diff Show More