Merge pull request #58 from matejsemancik/feature/semlp-logo-render

SEMLP Logo Render, Kotlin 1.8.0, orx-easing
matejsemancik · Apr 16, 2023 · e528629 · e528629
2 parents 8576e25 + 4b98284
commit e528629
Show file tree

Hide file tree

Showing 8 changed files with 32,319 additions and 5 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -2,6 +2,7 @@ object Dependencies {
     const val koin = "org.koin:koin-core:${Versions.koin}"
     const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.serializationJson}"
     const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}"
+    const val orxEasing = "org.openrndr.extra:orx-easing:${Versions.orx}"
 
     val processingLibs = listOf(
         "minim",

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,7 @@
 object Versions {
-    const val kotlin = "1.6.10"
+    const val kotlin = "1.8.20"
     const val serializationJson = "1.3.2"
     const val coroutines = "1.6.0"
     const val koin = "2.1.5"
+    const val orx = "0.4.3-alpha5"
 }
diff --git a/buildSrc/src/main/kotlin/dev/matsem/astral/CommonDependencies.kt b/buildSrc/src/main/kotlin/dev/matsem/astral/CommonDependencies.kt
@@ -23,6 +23,7 @@ internal fun Project.configureCommonDependencies() {
     dependencies {
         add("implementation", Dependencies.koin)
         add("implementation", Dependencies.coroutines)
+        add("implementation", Dependencies.orxEasing)
         add(
             "implementation",
             fileTree(

diff --git a/core/src/main/kotlin/dev/matsem/astral/core/tools/animations/AnimationHandler.kt b/core/src/main/kotlin/dev/matsem/astral/core/tools/animations/AnimationHandler.kt
@@ -1,6 +1,7 @@
 package dev.matsem.astral.core.tools.animations
 
 import processing.core.PConstants
+import processing.core.PConstants.TWO_PI
 
 /**
  * Provides access to various time-based animation functions, based on elapsed time since program run.
@@ -27,7 +28,7 @@ fun AnimationHandler.saw(fHz: Float, offset: Int = 0): Float =
  * You could use the returned value to create a periodic motion, for instance by feeding
  * the returned value into the sin() function, and using the result to drive the rotation of an object.
  */
-fun AnimationHandler.radianSeconds(periodSeconds: Float) = provideMillis() / 1000f * PConstants.TWO_PI / periodSeconds
+fun AnimationHandler.radianSeconds(periodSeconds: Float) = (provideMillis() / 1000f * PConstants.TWO_PI / periodSeconds) % PConstants.TWO_PI
 
 /**
  * Generates sweep from 0f..TWO_PI at frequency given by [hz].

diff --git a/core/src/main/kotlin/dev/matsem/astral/core/tools/extensions/IntExtensions.kt b/core/src/main/kotlin/dev/matsem/astral/core/tools/extensions/IntExtensions.kt
@@ -23,4 +23,4 @@ inline val Int.rgbGreen get() = this shr 8 and 0xff
 
 inline val Int.rgbBlue get() = this and 0xff
 
-fun Int.withAlpha(alpha: Int = 255) = this or (alpha shl 24)
+fun Int.withAlpha(alpha: Int = 0xff) = this or (alpha shl 24)