kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean-up warnings

Browse Source
This commit is contained in:
Edwin Jakobs
2024-03-16 09:11:37 +01:00
parent c01d49861b
commit 8f2d382093
15 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orx-jumpflood/src/commonMain/kotlin/ClusteredField.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill
import org.openrndr.draw.*

2
orx-jumpflood/src/commonMain/kotlin/DirectionalField.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill
import org.openrndr.draw.*

2
orx-jumpflood/src/commonMain/kotlin/DistanceField.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill
import org.openrndr.draw.*

2
orx-jumpflood/src/commonMain/kotlin/draw/SDFDraw.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill.draw
import org.openrndr.color.ColorRGBa

2
orx-jumpflood/src/commonMain/kotlin/fx/InnerGlow.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill.fx
import org.openrndr.color.ColorRGBa

2
orx-jumpflood/src/commonMain/kotlin/fx/OuterGlow.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill.fx
import org.openrndr.color.ColorRGBa

2
orx-jumpflood/src/commonMain/kotlin/fx/Skeleton.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill.fx
import org.openrndr.color.ColorRGBa

2
orx-jumpflood/src/commonMain/kotlin/fx/StraightSkeleton.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill.fx
import org.openrndr.color.ColorRGBa

2
orx-jumpflood/src/commonMain/kotlin/ops/SDFOps.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED")
package org.openrndr.extra.jumpfill.ops
import org.openrndr.draw.ColorBuffer

7
orx-jvm/orx-gui/src/main/kotlin/Gui.kt
View File

@@ -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) {

35
orx-jvm/orx-kinect-v1/src/main/kotlin/Kinect1.kt
View File

@@ -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<Kinect1.DeviceInfo> {
fun listDevices(): List<Kinect1.DeviceInfo> {
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)
}

5
orx-jvm/orx-minim/src/main/kotlin/Minim.kt
View File

@@ -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()

2
orx-jvm/orx-olive/src/main/kotlin/Olive.kt
View File

@@ -136,7 +136,7 @@ class Olive<P : Program>(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()

12
orx-jvm/orx-olive/src/main/kotlin/Reloadable.kt
View File

@@ -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<Any, Any?>).get(existing)
val mp = (p as KMutableProperty1<Any, Any?>)
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
}

4
orx-jvm/orx-osc/src/main/kotlin/OSC.kt
View File

@@ -56,7 +56,7 @@ class OSC (
infix fun String.bind(prop: KMutableProperty0<Double>) {
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" }
}
}