modifications to make openrndr-math run as JavaScript

Author: morisil

src/main/kotlin/OpenrndrMathInJsTest.kt

@@ -0,0 +1,8 @@
+package com.xemantic.test.openrndr.kotlinjs
+
+import org.openrndr.math.Vector2
+
+@JsExport
+fun main() {
+   println(Vector2(2.0, 2.0) + Vector2(2.0, 2.0))
+}

src/main/kotlin/org/openrndr/math/Bezier.kt

@@ -58,7 +58,7 @@ fun roots(p: List<Double>): List<Double> {
         val c = p[2]
         val d = a - 2 * b + c
         if (d != 0.0) {
-            val m1 = -Math.sqrt(b * b - a * c)
+            val m1 = - Math.sqrt(b * b - a * c)
             val m2 = -a + b
             val v1 = -(m1 + m2) / d
             val v2 = -(-m1 + m2) / d

src/main/kotlin/org/openrndr/math/Equations.kt

@@ -2,7 +2,7 @@ package org.openrndr.math
 
 private const val DISCRIMINANT_EPSILON = 1e-10
 private const val SOLUTION_EPSILON = 1e-8
-private val MACHINE_EPSILON = Math.ulp(1.0)
+//private val MACHINE_EPSILON = math.ulp(1.0)
 private const val EPSILON = 1e-14
 
 // adapted from https://github.com/paperjs/paper.js/blob/develop/src/util/Numerical.js
@@ -13,9 +13,7 @@ private fun trim(acc: DoubleArray, len: Int): DoubleArray {
     } else if (len == 0) {
         DoubleArray(0)
     } else {
-        val result = DoubleArray(len)
-        System.arraycopy(acc, 0, result, 0, len)
-        result
+        acc.copyOf(len)
     }
 }
 
@@ -57,6 +55,7 @@ fun solveLinear(a: Double, b: Double): DoubleArray {
     return trim(acc, solveLinear(a, b, acc))
 }
 
+/*
 fun solveQuadratic(a: Double, b: Double, c: Double, acc: DoubleArray): Int {
     var a = a
     var b = b
@@ -100,7 +99,9 @@ fun solveQuadratic(a: Double, b: Double, c: Double): DoubleArray {
     val acc = DoubleArray(2)
     return trim(acc, solveQuadratic(a, b, c, acc))
 }
+*/
 
+/*
 fun solveCubic(a: Double, b: Double, c: Double, d: Double, acc: DoubleArray): Int {
     var a = a
     var b = b
@@ -165,4 +166,5 @@ fun solveCubic(a: Double, b: Double, c: Double, d: Double, acc: DoubleArray): In
 fun solveCubic(a: Double, b: Double, c: Double, d: Double): DoubleArray {
     val acc = DoubleArray(3)
     return trim(acc, solveCubic(a, b, c, d, acc))
-}
+}
+*/

src/main/kotlin/org/openrndr/math/Functions.kt

@@ -10,16 +10,12 @@ fun mod(a: Int, b: Int) = ((a % b) + b) % b
 fun mod(a: Float, b: Float) = ((a % b) + b) % b
 fun mod(a: Long, b: Long) = ((a % b) + b) % b
 
-@JvmName("modDouble")
 fun Double.mod_(b: Double) = mod(this, b)
 
-@JvmName("modInt")
 fun Int.mod_(b: Int) = mod(this, b)
 
-@JvmName("modFloat")
 fun Float.mod_(b: Float) = mod(this, b)
 
-@JvmName("modLong")
 fun Long.mod_(b: Long) = mod(this, b)
 
 fun Vector2.mod(b: Vector2) =
@@ -55,10 +51,8 @@ fun IntVector4.mod(b: IntVector4) =
 fun clamp(value: Double, min: Double, max: Double) = max(min, min(max, value))
 fun clamp(value: Int, min: Int, max: Int) = max(min, min(max, value))
 
-@JvmName("doubleClamp")
 fun Double.clamp(min: Double, max: Double) = clamp(this, min, max)
 
-@JvmName("intClamp")
 fun Int.clamp(min: Int, max: Int) = clamp(this, min, max)
 
 fun Vector2.clamp(min : Vector2, max : Vector2) =

src/main/kotlin/org/openrndr/math/IntVector2.kt

@@ -1,13 +1,15 @@
 package org.openrndr.math
 
-import java.io.Serializable
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import kotlin.math.sqrt
 
 /**
  * Integer vector 2
  */
 @Suppress("unused")
-data class IntVector2(val x: Int, val y: Int) : Serializable {
+@Serializable
+data class IntVector2(val x: Int, val y: Int) {
     companion object {
         val ZERO = IntVector2(0, 0)
         val UNIT_X = IntVector2(1, 0)
@@ -17,13 +19,17 @@ data class IntVector2(val x: Int, val y: Int) : Serializable {
     val length get() = sqrt(1.0 * x * x + y * y)
     val squaredLength get() = x * x + y * y
     infix fun dot(right: IntVector2) = x * right.x + y * right.y
+    @Transient
     val yx get() = IntVector2(y, x)
+    @Transient
     val xx get() = IntVector2(x, x)
+    @Transient
     val yy get() = IntVector2(y, y)
     operator fun plus(v: IntVector2) = IntVector2(x + v.x, y + v.y)
     operator fun minus(v: IntVector2) = IntVector2(x - v.x, y - v.y)
     operator fun times(d: Int) = IntVector2(x * d, y * d)
     operator fun div(d: Int) = IntVector2(x / d, y / d)
+    @Transient
     val vector2 get() = Vector2(this.x.toDouble(), this.y.toDouble())
 }
 

src/main/kotlin/org/openrndr/math/IntVector3.kt

@@ -1,13 +1,15 @@
 package org.openrndr.math
 
-import java.io.Serializable
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import kotlin.math.sqrt
 
 /**
  * Integer vector 3
  */
 @Suppress("unused")
-data class IntVector3(val x: Int, val y: Int, val z: Int) : Serializable {
+@Serializable
+data class IntVector3(val x: Int, val y: Int, val z: Int) {
     companion object {
         val ZERO = IntVector3(0, 0, 0)
         val UNIT_X = IntVector3(1, 0, 0)
@@ -18,14 +20,19 @@ data class IntVector3(val x: Int, val y: Int, val z: Int) : Serializable {
     val length get() = sqrt(1.0 * x * x + y * y + z * z)
     val squaredLength get() = x * x + y * y + z * z
     infix fun dot(right: IntVector3) = x * right.x + y * right.y + z * right.z
+    @Transient
     val xy get() = IntVector2(x, y)
+    @Transient
     val yx get() = IntVector2(y, x)
+    @Transient
     val xx get() = IntVector2(x, x)
+    @Transient
     val yy get() = IntVector2(y, y)
     operator fun plus(v: IntVector3) = IntVector3(x + v.x, y + v.y, z + v.z)
     operator fun minus(v: IntVector3) = IntVector3(x - v.x, y - v.y, z - v.z)
     operator fun times(d: Int) = IntVector3(x * d, y * d, z * d)
     operator fun div(d: Int) = IntVector3(x / d, y / d, z / d)
+    @Transient
     val vector3 get() = Vector3(this.x.toDouble(), this.y.toDouble(), this.z.toDouble())
 }
 

src/main/kotlin/org/openrndr/math/IntVector4.kt

@@ -1,14 +1,15 @@
 package org.openrndr.math
 
-import java.io.Serializable
+import kotlinx.serialization.Serializable
 import kotlin.math.sqrt
 
 
 /**
  * Integer vector 4
  */
 @Suppress("unused")
-data class IntVector4(val x: Int, val y: Int, val z: Int, val w: Int) : Serializable {
+@Serializable
+data class IntVector4(val x: Int, val y: Int, val z: Int, val w: Int) {
     companion object {
         val ZERO = IntVector4(0, 0, 0, 0)
         val UNIT_X = IntVector4(1, 0, 0, 0)

src/main/kotlin/org/openrndr/math/Mapping.kt

@@ -41,7 +41,6 @@ fun map(beforeLeft: Double, beforeRight: Double,
  * @param clamp constrain the result to [afterLeft, afterRight]
  * @return a value in the after domain
  */
-@JvmName("doubleMap")
 fun Double.map(beforeLeft: Double, beforeRight: Double,
                afterLeft: Double, afterRight: Double,
                clamp: Boolean = false): Double {
@@ -94,7 +93,6 @@ fun smoothstep(edge0: Double, edge1: Double, x: Double): Double {
     return u * u * (3 - 2 * u)
 }
 
-@JvmName("doubleSmoothstep")
 fun Double.smoothstep(edge0: Double, edge1: Double) = smoothstep(edge0, edge1, this)
 
 fun Vector2.smoothstep(edge0: Vector2, edge1: Vector2): Vector2 =
@@ -148,7 +146,6 @@ fun smootherstep(edge0: Double, edge1: Double, x: Double): Double {
 
 fun saturate(x: Double) = max(0.0, min(1.0, x))
 
-@JvmName("doubleSaturate")
 fun Double.saturate() = saturate(this)
 
 fun Vector2.saturate() = Vector2(x.saturate(), y.saturate())

src/main/kotlin/org/openrndr/math/Math.kt

@@ -0,0 +1,47 @@
+package org.openrndr.math
+
+class Math {
+  companion object {
+    const val DEGREES_TO_RADIANS = 0.017453292519943295
+    const val RADIANS_TO_DEGREES = 57.29577951308232
+    fun sqrt(x: Double) = kotlin.math.sqrt(x)
+    fun toRadians(angdeg: Double) = angdeg * DEGREES_TO_RADIANS
+    fun toDegrees(angrad: Double) = angrad * RADIANS_TO_DEGREES
+    fun tan(x: Double) = kotlin.math.tan(x)
+    fun sin(x: Double) = kotlin.math.sin(x)
+    fun cos(x: Double) = kotlin.math.cos(x)
+    /*fun getExponent(d: Double): Int {
+      /*
+         * Bitwise convert d to long, mask out exponent bits, shift
+         * to the right and then subtract out double's bias adjust to
+         * get true exponent value.
+         */
+      return ((java.lang.Double.doubleToRawLongBits(d) and jdk.internal.math.DoubleConsts.EXP_BIT_MASK shr
+          jdk.internal.math.DoubleConsts.SIGNIFICAND_WIDTH - 1) - jdk.internal.math.DoubleConsts.EXP_BIAS)
+    }
+    fun ulp(d: Double): Double {
+      var exp: Int = java.lang.Math.getExponent(d)
+      return when (exp) {
+        java.lang.Double.MAX_EXPONENT + 1 -> java.lang.Math.abs(d)
+        java.lang.Double.MIN_EXPONENT - 1 -> Double.MIN_VALUE
+        else -> {
+          assert(exp <= java.lang.Double.MAX_EXPONENT && exp >= java.lang.Double.MIN_EXPONENT)
+
+          // ulp(x) is usually 2^(SIGNIFICAND_WIDTH-1)*(2^ilogb(x))
+          exp = exp - (jdk.internal.math.DoubleConsts.SIGNIFICAND_WIDTH - 1)
+          if (exp >= java.lang.Double.MIN_EXPONENT) {
+            java.lang.Math.powerOfTwoD(exp)
+          } else {
+            // return a subnormal result; left shift integer
+            // representation of Double.MIN_VALUE appropriate
+            // number of positions
+            java.lang.Double.longBitsToDouble(
+              1L shl
+                  exp - (java.lang.Double.MIN_EXPONENT - (jdk.internal.math.DoubleConsts.SIGNIFICAND_WIDTH - 1))
+            )
+          }
+        }
+      }
+    }*/
+  }
+}

src/main/kotlin/org/openrndr/math/Matrix44.kt

@@ -1,15 +1,17 @@
 package org.openrndr.math
 
-import java.io.Serializable
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 /**
  * A 4x4 matrix with double precision
  */
+@Serializable
 data class Matrix44(
         val c0r0: Double = 0.0, val c1r0: Double = 0.0, val c2r0: Double = 0.0, val c3r0: Double = 0.0,
         val c0r1: Double = 0.0, val c1r1: Double = 0.0, val c2r1: Double = 0.0, val c3r1: Double = 0.0,
         val c0r2: Double = 0.0, val c1r2: Double = 0.0, val c2r2: Double = 0.0, val c3r2: Double = 0.0,
-        val c0r3: Double = 0.0, val c1r3: Double = 0.0, val c2r3: Double = 0.0, val c3r3: Double = 0.0) : Serializable, LinearType<Matrix44> {
+        val c0r3: Double = 0.0, val c1r3: Double = 0.0, val c2r3: Double = 0.0, val c3r3: Double = 0.0) : LinearType<Matrix44> {
 
     companion object {
         /**
@@ -142,6 +144,7 @@ data class Matrix44(
     /**
      * Returns a transposed version of the matrix
      */
+    @Transient
     val transposed
         get() = Matrix44(
                 c0r0, c0r1, c0r2, c0r3,
@@ -152,6 +155,7 @@ data class Matrix44(
     /**
      * The 3x3 top-left part of the 4x4 matrix
      */
+    @Transient
     val matrix33
         get() = Matrix33(c0r0, c1r0, c2r0,
                 c0r1, c1r1, c2r1,