diff --git a/orx-jumpflood/src/commonMain/kotlin/ClusteredField.kt b/orx-jumpflood/src/commonMain/kotlin/ClusteredField.kt index 6453c442..088199f2 100644 --- a/orx-jumpflood/src/commonMain/kotlin/ClusteredField.kt +++ b/orx-jumpflood/src/commonMain/kotlin/ClusteredField.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill import org.openrndr.draw.* diff --git a/orx-jumpflood/src/commonMain/kotlin/DirectionalField.kt b/orx-jumpflood/src/commonMain/kotlin/DirectionalField.kt index f3fbf87d..2b0df079 100644 --- a/orx-jumpflood/src/commonMain/kotlin/DirectionalField.kt +++ b/orx-jumpflood/src/commonMain/kotlin/DirectionalField.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill import org.openrndr.draw.* diff --git a/orx-jumpflood/src/commonMain/kotlin/DistanceField.kt b/orx-jumpflood/src/commonMain/kotlin/DistanceField.kt index ec51d1dc..ce251acb 100644 --- a/orx-jumpflood/src/commonMain/kotlin/DistanceField.kt +++ b/orx-jumpflood/src/commonMain/kotlin/DistanceField.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill import org.openrndr.draw.* diff --git a/orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt b/orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt index d0ad6d4e..c2b85c17 100644 --- a/orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt +++ b/orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill.draw import org.openrndr.color.ColorRGBa diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt b/orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt index 32866c40..dbb6012a 100644 --- a/orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt +++ b/orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill.fx import org.openrndr.color.ColorRGBa diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt b/orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt index 1e1c1b23..df05a05a 100644 --- a/orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt +++ b/orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill.fx import org.openrndr.color.ColorRGBa diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt b/orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt index 8d1e0bbf..ed4b8f9f 100644 --- a/orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt +++ b/orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill.fx import org.openrndr.color.ColorRGBa diff --git a/orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt b/orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt index 6b199213..fcf40fde 100644 --- a/orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt +++ b/orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill.fx import org.openrndr.color.ColorRGBa diff --git a/orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt b/orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt index a96586de..17ac2756 100644 --- a/orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt +++ b/orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.jumpfill.ops import org.openrndr.draw.ColorBuffer diff --git a/orx-jvm/orx-gui/src/main/kotlin/Gui.kt b/orx-jvm/orx-gui/src/main/kotlin/Gui.kt index a92acab6..301237bf 100644 --- a/orx-jvm/orx-gui/src/main/kotlin/Gui.kt +++ b/orx-jvm/orx-gui/src/main/kotlin/Gui.kt @@ -133,11 +133,11 @@ class GUI( val folderFile = File(defaultSaveFolder) val targetFile = File(defaultSaveFolder, "${it.assetMetadata.assetBaseName}.json") if (folderFile.exists() && folderFile.isDirectory) { - logger.info("Saving parameters to '${targetFile.absolutePath}") + logger.info { "Saving parameters to '${targetFile.absolutePath}" } saveParameters(targetFile) } else { if (folderFile.mkdirs()) { - logger.info("Saving parameters to '${targetFile.absolutePath}") + logger.info { "Saving parameters to '${targetFile.absolutePath}" } saveParameters(targetFile) } else { logger.error { "Could not save parameters because could not create directory ${folderFile.absolutePath}" } @@ -598,7 +598,8 @@ class GUI( if (parameter.pathIsDirectory == false) { openFileDialog( - supportedExtensions = parameter.pathExtensions?.let { listOf("supported extensions" to it.toList())} ?: emptyList(), + supportedExtensions = parameter.pathExtensions?.let { listOf("supported extensions" to it.toList()) } + ?: emptyList(), contextID = parameter.pathContext ?: "null" ) { val resolvedPath = if (parameter.absolutePath == true) { diff --git a/orx-jvm/orx-kinect-v1/src/main/kotlin/Kinect1.kt b/orx-jvm/orx-kinect-v1/src/main/kotlin/Kinect1.kt index 0be77708..482a456c 100644 --- a/orx-jvm/orx-kinect-v1/src/main/kotlin/Kinect1.kt +++ b/orx-jvm/orx-kinect-v1/src/main/kotlin/Kinect1.kt @@ -83,7 +83,9 @@ class Kinect1 : Kinect, Extension { */ var logLevel: LogLevel get() = freenect.logLevel - set(value) { freenect.logLevel = value } + set(value) { + freenect.logLevel = value + } private val logger = KotlinLogging.logger {} @@ -92,8 +94,10 @@ class Kinect1 : Kinect, Extension { private lateinit var freenect: Freenect override fun setup(program: Program) { - if (!enabled) { return } - logger.info("Starting Kinect1 support") + if (!enabled) { + return + } + logger.info { "Starting Kinect1 support" } this.program = program freenect = Freenect(initialLogLevel = LogLevel.INFO) } @@ -151,9 +155,11 @@ class Kinect1 : Kinect, Extension { } override fun shutdown(program: Program) { - if (!enabled) { return } + if (!enabled) { + return + } logger.info { "Shutting down Kinect1 support" } - logger.debug("Closing active devices, count: ${mutableActiveDevices.size}") + logger.debug { "Closing active devices, count: ${mutableActiveDevices.size}" } mutableActiveDevices.forEach { it.close() } @@ -286,8 +292,10 @@ class Kinect1 : Kinect, Extension { private fun start() { logger.info { "$info.start()" } - freenect.checkReturn(freenect_set_depth_mode( - dev, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT)) + freenect.checkReturn( + freenect_set_depth_mode( + dev, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT) + ) ) freenect.checkReturn(freenect_set_depth_buffer(dev, Pointer(bytesFront))) freenect.checkReturn(freenect_start_depth(dev)) @@ -384,7 +392,7 @@ class Freenect(private val initialLogLevel: Kinect1.LogLevel) { private var running: Boolean = true private val runner = thread(name = "kinect1", start = true) { - logger.info("Starting Kinect1 thread") + logger.info { "Starting Kinect1 thread" } checkReturn(freenect_init(ctx, usbCtx)) freenect_set_log_level(ctx, logLevel.code) val num = checkReturn(freenect_num_devices(ctx)) @@ -433,7 +441,7 @@ class Freenect(private val initialLogLevel: Kinect1.LogLevel) { block(ctx, usbCtx) logger.trace { "'$name': ended" } } catch (e: Exception) { - logger.error("'$name': failed", e) + logger.error(e) { "'$name': failed" } } } freenectCallQueue.add(task) @@ -454,7 +462,7 @@ class Freenect(private val initialLogLevel: Kinect1.LogLevel) { logger.trace { "'$name': ended" } Result.success(result) } catch (e: Exception) { - logger.error("'$name': failed", e) + logger.error(e) { "'$name': failed" } Result.failure(e) } } @@ -464,7 +472,7 @@ class Freenect(private val initialLogLevel: Kinect1.LogLevel) { return result.getOrThrow() } - fun listDevices() : List { + fun listDevices(): List { val attributes = freenect_device_attributes() freenect_list_device_attributes(ctx, attributes) try { @@ -487,9 +495,9 @@ class Freenect(private val initialLogLevel: Kinect1.LogLevel) { } fun close() { - logger.debug("Closing Kinect1 runner") + logger.debug { "Closing Kinect1 runner" } running = false - logger.debug("Waiting for runner thread to finish") + logger.debug { "Waiting for runner thread to finish" } runner.join() } @@ -553,6 +561,7 @@ internal class Kinect1DepthMappers { DepthMeasurement.RAW_NORMALIZED -> { depthToRawNormalized.select(flipH, flipV) } + DepthMeasurement.METERS -> { depthToMeters.select(flipH, flipV) } diff --git a/orx-jvm/orx-minim/src/main/kotlin/Minim.kt b/orx-jvm/orx-minim/src/main/kotlin/Minim.kt index 50dbc5a8..081b3972 100644 --- a/orx-jvm/orx-minim/src/main/kotlin/Minim.kt +++ b/orx-jvm/orx-minim/src/main/kotlin/Minim.kt @@ -6,11 +6,12 @@ import java.io.File import java.io.InputStream class MinimObject { - fun sketchPath(fileName:String) = "./" + @Suppress("UNUSED_PARAMETER") + fun sketchPath(fileName: String) = "./" fun createInput(fileName: String) = File(fileName).inputStream() as InputStream } -fun Program.minim(): Minim { +fun Program.minim(): Minim { val minim = Minim(MinimObject()) ended.listen { minim.stop() diff --git a/orx-jvm/orx-olive/src/main/kotlin/Olive.kt b/orx-jvm/orx-olive/src/main/kotlin/Olive.kt index dcf31b88..fa7db768 100644 --- a/orx-jvm/orx-olive/src/main/kotlin/Olive.kt +++ b/orx-jvm/orx-olive/src/main/kotlin/Olive.kt @@ -136,7 +136,7 @@ class Olive

(val resources: Resources? = null, private var scriptMod watcher = watchFile(File(script), requestStopEvent = watcherRequestStopEvent) { try { - logger.info("change detected, reloading script") + logger.info { "change detected, reloading script" } val scriptContents = when (scriptMode) { ScriptMode.KOTLIN_SCRIPT -> it.readText() diff --git a/orx-jvm/orx-olive/src/main/kotlin/Reloadable.kt b/orx-jvm/orx-olive/src/main/kotlin/Reloadable.kt index ade68d0a..09e7e4a8 100644 --- a/orx-jvm/orx-olive/src/main/kotlin/Reloadable.kt +++ b/orx-jvm/orx-olive/src/main/kotlin/Reloadable.kt @@ -22,8 +22,10 @@ fun clearReloadables() { */ open class Reloadable { private fun normalizeClassName(name: String): String { - return name.replace(Regex("ScriptingHost[0-9a-f]+_"), // -- since kotlin 1.3.61 the scripting host prepends class names with the host id - "").replace(Regex("Line_[0-9]+"),"") // -- when reusing the script engine the line number increments. + return name.replace( + Regex("ScriptingHost[0-9a-f]+_"), // -- since kotlin 1.3.61 the scripting host prepends class names with the host id + "" + ).replace(Regex("Line_[0-9]+"), "") // -- when reusing the script engine the line number increments. } /** @@ -41,14 +43,14 @@ open class Reloadable { val value = (e as KProperty1).get(existing) val mp = (p as KMutableProperty1) mp.set(this, value as Any) - logger.info("reloaded property ${p.name} <- ${value}") + logger.info { "reloaded property ${p.name} <- ${value}" } } catch (e: Throwable) { - logger.warn("error while reloading property ${p.name}: ${e.message}") + logger.warn { "error while reloading property ${p.name}: ${e.message}" } } } } } else { - logger.info("no existing store found for $className") + logger.info { "no existing store found for $className" } } store[normalizeClassName(this::class.jvmName)] = this } diff --git a/orx-jvm/orx-osc/src/main/kotlin/OSC.kt b/orx-jvm/orx-osc/src/main/kotlin/OSC.kt index 899a0b2b..805917c7 100644 --- a/orx-jvm/orx-osc/src/main/kotlin/OSC.kt +++ b/orx-jvm/orx-osc/src/main/kotlin/OSC.kt @@ -56,7 +56,7 @@ class OSC ( infix fun String.bind(prop: KMutableProperty0) { val channel = this - listen(channel) { address, it -> + listen(channel) { _, it -> when (val message = it.first()) { is Double -> prop.set(message) is Float -> prop.set(message.toDouble()) @@ -78,6 +78,6 @@ class OSC ( receiver.startListening() - if (receiver.isListening) logger.info("OSC is listening on port: $portIn") + if (receiver.isListening) logger.info { "OSC is listening on port: $portIn" } } }