diff --git a/orx-color/src/commonMain/kotlin/fettepalette/FettePalette.kt b/orx-color/src/commonMain/kotlin/fettepalette/FettePalette.kt index d2e53370..cc2c6fad 100644 --- a/orx-color/src/commonMain/kotlin/fettepalette/FettePalette.kt +++ b/orx-color/src/commonMain/kotlin/fettepalette/FettePalette.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.color.fettepalette import org.openrndr.color.ColorHSLa @@ -75,8 +77,6 @@ object Lamé : Curve { object Arc : Curve { override fun pointOnCurve(i: Double, total: Double, curveAccent: Double, min: Vector2, max: Vector2): Vector2 { val limit = PI / 2 - val percentile = i / total - val t = percentile * limit val slice = limit / total val y = cos(-PI / 2 + i * slice + curveAccent) val x = sin(PI / 2 + i * slice - curveAccent) diff --git a/orx-color/src/commonMain/kotlin/spaces/ColorOKLCHa.kt b/orx-color/src/commonMain/kotlin/spaces/ColorOKLCHa.kt index 1bceb4d4..e8dc27ff 100644 --- a/orx-color/src/commonMain/kotlin/spaces/ColorOKLCHa.kt +++ b/orx-color/src/commonMain/kotlin/spaces/ColorOKLCHa.kt @@ -33,20 +33,20 @@ data class ColorOKLCHa(val l: Double, val c: Double, val h: Double, override val @Deprecated("Legacy alpha parameter name", ReplaceWith("alpha")) val a = alpha - override fun opacify(factor: Double) = copy(alpha = a * factor) + override fun opacify(factor: Double) = copy(alpha = alpha * factor) override fun shade(factor: Double) = copy(l = l * factor) override fun shiftHue(shiftInDegrees: Double) = copy(h = h + shiftInDegrees) override fun saturate(factor: Double) = copy(c = c * factor) - override fun plus(right: ColorOKLCHa) = copy(l = l + right.l, c = c + right.c, h = h + right.h, alpha = a + right.a) - override fun minus(right: ColorOKLCHa) = copy(l = l - right.l, c = c - right.c, h = h - right.h, alpha = a - right.a) - override fun times(scale: Double) = copy(l = l * scale, c = c * scale, h = h * scale, alpha = a * scale) + override fun plus(right: ColorOKLCHa) = copy(l = l + right.l, c = c + right.c, h = h + right.h, alpha = alpha + right.alpha) + override fun minus(right: ColorOKLCHa) = copy(l = l - right.l, c = c - right.c, h = h - right.h, alpha = alpha - right.alpha) + override fun times(scale: Double) = copy(l = l * scale, c = c * scale, h = h * scale, alpha = alpha * scale) override fun mix(other: ColorOKLCHa, factor: Double) = mix(this, other, factor) fun toOKLABa(): ColorOKLABa { val a = c * cos(h.asRadians) val b = c * sin(h.asRadians) - return ColorOKLABa(l, a, b, alpha = this.a) + return ColorOKLABa(l, a, b, alpha = this.alpha) } override fun toRGBa(): ColorRGBa = toOKLABa().toRGBa() @@ -59,7 +59,7 @@ fun mix(left: ColorOKLCHa, right: ColorOKLCHa, x: Double): ColorOKLCHa { (1.0 - sx) * left.l + sx * right.l, (1.0 - sx) * left.c + sx * right.c, mixAngle(left.h, right.h, sx), - (1.0 - sx) * left.a + sx * right.a + (1.0 - sx) * left.alpha + sx * right.alpha ) } diff --git a/orx-color/src/commonMain/kotlin/spaces/ColorXSLUVa.kt b/orx-color/src/commonMain/kotlin/spaces/ColorXSLUVa.kt index 976487de..d7920203 100644 --- a/orx-color/src/commonMain/kotlin/spaces/ColorXSLUVa.kt +++ b/orx-color/src/commonMain/kotlin/spaces/ColorXSLUVa.kt @@ -40,7 +40,7 @@ data class ColorXSLUVa(val x: Double, val s: Double, val l: Double, override val } private fun xToHue(x:Double) : Double { - val x = x % 360.0 + @Suppress("NAME_SHADOWING") val x = x.mod(360.0) return if (0.0 <= x && x < 60.0) { map(x, 0.0, 60.0, 0.0, 35.0) } else if (60.0 <= x && x < 120.0) { diff --git a/orx-color/src/commonMain/kotlin/spaces/OKHelpers.kt b/orx-color/src/commonMain/kotlin/spaces/OKHelpers.kt index c8256529..ec7c35ed 100644 --- a/orx-color/src/commonMain/kotlin/spaces/OKHelpers.kt +++ b/orx-color/src/commonMain/kotlin/spaces/OKHelpers.kt @@ -105,7 +105,7 @@ internal fun find_cusp(a: Double, b: Double): DoubleArray { } internal fun get_ST_max(a: Double, b: Double, cusp: DoubleArray? = null): DoubleArray { - val cusp = cusp ?: find_cusp(a, b) + @Suppress("NAME_SHADOWING") val cusp = cusp ?: find_cusp(a, b) val L = cusp[0] val C = cusp[1] @@ -183,7 +183,7 @@ fun find_gamut_intersection( L0: Double, cusp: DoubleArray? = null ): Double { - val cusp = cusp ?: find_cusp(a, b) + @Suppress("NAME_SHADOWING") val cusp = cusp ?: find_cusp(a, b) // Find the intersection for upper and lower half seprately diff --git a/orx-fx/src/commonMain/kotlin/antialias/FXAA.kt b/orx-fx/src/commonMain/kotlin/antialias/FXAA.kt index ebaf28f0..569fcb8b 100644 --- a/orx-fx/src/commonMain/kotlin/antialias/FXAA.kt +++ b/orx-fx/src/commonMain/kotlin/antialias/FXAA.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.antialias import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/blend/BlendFilters.kt b/orx-fx/src/commonMain/kotlin/blend/BlendFilters.kt index 1f90eab6..8713756a 100644 --- a/orx-fx/src/commonMain/kotlin/blend/BlendFilters.kt +++ b/orx-fx/src/commonMain/kotlin/blend/BlendFilters.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blend import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/blur/ApproximateGaussianBlur.kt b/orx-fx/src/commonMain/kotlin/blur/ApproximateGaussianBlur.kt index 9d9f8519..922e5eab 100644 --- a/orx-fx/src/commonMain/kotlin/blur/ApproximateGaussianBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/ApproximateGaussianBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/blur/Bloom.kt b/orx-fx/src/commonMain/kotlin/blur/Bloom.kt index 7ae6d600..936b13dd 100644 --- a/orx-fx/src/commonMain/kotlin/blur/Bloom.kt +++ b/orx-fx/src/commonMain/kotlin/blur/Bloom.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/blur/BoxBlur.kt b/orx-fx/src/commonMain/kotlin/blur/BoxBlur.kt index ae353ff3..a080bc90 100644 --- a/orx-fx/src/commonMain/kotlin/blur/BoxBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/BoxBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/blur/DirectionalBlur.kt b/orx-fx/src/commonMain/kotlin/blur/DirectionalBlur.kt index ec60c585..e2c9a9e6 100644 --- a/orx-fx/src/commonMain/kotlin/blur/DirectionalBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/DirectionalBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/blur/FrameBlur.kt b/orx-fx/src/commonMain/kotlin/blur/FrameBlur.kt index 056afecc..058a4b84 100644 --- a/orx-fx/src/commonMain/kotlin/blur/FrameBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/FrameBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/blur/GaussianBlur.kt b/orx-fx/src/commonMain/kotlin/blur/GaussianBlur.kt index 82befbdb..0fe32c82 100644 --- a/orx-fx/src/commonMain/kotlin/blur/GaussianBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/GaussianBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.Filter1to1 diff --git a/orx-fx/src/commonMain/kotlin/blur/HashBlur.kt b/orx-fx/src/commonMain/kotlin/blur/HashBlur.kt index f2682a60..d1da89f5 100644 --- a/orx-fx/src/commonMain/kotlin/blur/HashBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/HashBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/blur/LaserBlur.kt b/orx-fx/src/commonMain/kotlin/blur/LaserBlur.kt index 46450088..a9fc7d28 100644 --- a/orx-fx/src/commonMain/kotlin/blur/LaserBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/LaserBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/blur/LineBlur.kt b/orx-fx/src/commonMain/kotlin/blur/LineBlur.kt index 8c36e72a..e3ac9d83 100644 --- a/orx-fx/src/commonMain/kotlin/blur/LineBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/LineBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/blur/MipBloom.kt b/orx-fx/src/commonMain/kotlin/blur/MipBloom.kt index 566c9cc9..283ebe68 100644 --- a/orx-fx/src/commonMain/kotlin/blur/MipBloom.kt +++ b/orx-fx/src/commonMain/kotlin/blur/MipBloom.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/blur/ZoomBlur.kt b/orx-fx/src/commonMain/kotlin/blur/ZoomBlur.kt index 0f625131..f0440e19 100644 --- a/orx-fx/src/commonMain/kotlin/blur/ZoomBlur.kt +++ b/orx-fx/src/commonMain/kotlin/blur/ZoomBlur.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.blur import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/color/ChromaticAberration.kt b/orx-fx/src/commonMain/kotlin/color/ChromaticAberration.kt index 63aa1c48..1d6a359c 100644 --- a/orx-fx/src/commonMain/kotlin/color/ChromaticAberration.kt +++ b/orx-fx/src/commonMain/kotlin/color/ChromaticAberration.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/color/ColorCorrection.kt b/orx-fx/src/commonMain/kotlin/color/ColorCorrection.kt index 974c780a..96d61386 100644 --- a/orx-fx/src/commonMain/kotlin/color/ColorCorrection.kt +++ b/orx-fx/src/commonMain/kotlin/color/ColorCorrection.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/color/ColorMix.kt b/orx-fx/src/commonMain/kotlin/color/ColorMix.kt index 7fabef52..8783d2b1 100644 --- a/orx-fx/src/commonMain/kotlin/color/ColorMix.kt +++ b/orx-fx/src/commonMain/kotlin/color/ColorMix.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/color/Duotone.kt b/orx-fx/src/commonMain/kotlin/color/Duotone.kt index adf2568d..19a2c7f6 100644 --- a/orx-fx/src/commonMain/kotlin/color/Duotone.kt +++ b/orx-fx/src/commonMain/kotlin/color/Duotone.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt b/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt index 2a74217d..0400c512 100644 --- a/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt +++ b/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/color/Invert.kt b/orx-fx/src/commonMain/kotlin/color/Invert.kt index d735ed4c..eadcea9b 100644 --- a/orx-fx/src/commonMain/kotlin/color/Invert.kt +++ b/orx-fx/src/commonMain/kotlin/color/Invert.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/color/LumaMap.kt b/orx-fx/src/commonMain/kotlin/color/LumaMap.kt index 2e1df54d..cfc6caa9 100644 --- a/orx-fx/src/commonMain/kotlin/color/LumaMap.kt +++ b/orx-fx/src/commonMain/kotlin/color/LumaMap.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/color/LumaOpacity.kt b/orx-fx/src/commonMain/kotlin/color/LumaOpacity.kt index 6ee65c4a..e1797314 100644 --- a/orx-fx/src/commonMain/kotlin/color/LumaOpacity.kt +++ b/orx-fx/src/commonMain/kotlin/color/LumaOpacity.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/color/LumaThreshold.kt b/orx-fx/src/commonMain/kotlin/color/LumaThreshold.kt index 8f5b7cfa..5077cdb0 100644 --- a/orx-fx/src/commonMain/kotlin/color/LumaThreshold.kt +++ b/orx-fx/src/commonMain/kotlin/color/LumaThreshold.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/color/Pal.kt b/orx-fx/src/commonMain/kotlin/color/Pal.kt index 1060b9d3..3758033f 100644 --- a/orx-fx/src/commonMain/kotlin/color/Pal.kt +++ b/orx-fx/src/commonMain/kotlin/color/Pal.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/color/Posterize.kt b/orx-fx/src/commonMain/kotlin/color/Posterize.kt index fa00717b..063c0a19 100644 --- a/orx-fx/src/commonMain/kotlin/color/Posterize.kt +++ b/orx-fx/src/commonMain/kotlin/color/Posterize.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/color/Sepia.kt b/orx-fx/src/commonMain/kotlin/color/Sepia.kt index 5edb4098..ddafece2 100644 --- a/orx-fx/src/commonMain/kotlin/color/Sepia.kt +++ b/orx-fx/src/commonMain/kotlin/color/Sepia.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/color/SetBackground.kt b/orx-fx/src/commonMain/kotlin/color/SetBackground.kt index 84e2f469..784675a0 100644 --- a/orx-fx/src/commonMain/kotlin/color/SetBackground.kt +++ b/orx-fx/src/commonMain/kotlin/color/SetBackground.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.color import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/colormap/ColormapFilter.kt b/orx-fx/src/commonMain/kotlin/colormap/ColormapFilter.kt index 4a90904d..80e29827 100644 --- a/orx-fx/src/commonMain/kotlin/colormap/ColormapFilter.kt +++ b/orx-fx/src/commonMain/kotlin/colormap/ColormapFilter.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.colormap import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/colormap/GrayscaleColormap.kt b/orx-fx/src/commonMain/kotlin/colormap/GrayscaleColormap.kt index 51289ed9..2a082e73 100644 --- a/orx-fx/src/commonMain/kotlin/colormap/GrayscaleColormap.kt +++ b/orx-fx/src/commonMain/kotlin/colormap/GrayscaleColormap.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.colormap import org.openrndr.extra.fx.fx_grayscale_colormap diff --git a/orx-fx/src/commonMain/kotlin/colormap/SpectralZucconiColormap.kt b/orx-fx/src/commonMain/kotlin/colormap/SpectralZucconiColormap.kt index fcf4e963..4343f526 100644 --- a/orx-fx/src/commonMain/kotlin/colormap/SpectralZucconiColormap.kt +++ b/orx-fx/src/commonMain/kotlin/colormap/SpectralZucconiColormap.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.colormap import org.openrndr.extra.fx.fx_spectral_zucconi_colormap diff --git a/orx-fx/src/commonMain/kotlin/colormap/TurboColormap.kt b/orx-fx/src/commonMain/kotlin/colormap/TurboColormap.kt index 8924ccfd..5581fba1 100644 --- a/orx-fx/src/commonMain/kotlin/colormap/TurboColormap.kt +++ b/orx-fx/src/commonMain/kotlin/colormap/TurboColormap.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.colormap import org.openrndr.extra.fx.fx_turbo_colormap diff --git a/orx-fx/src/commonMain/kotlin/distort/BlockRepeat.kt b/orx-fx/src/commonMain/kotlin/distort/BlockRepeat.kt index a7a67d70..4a2fb652 100644 --- a/orx-fx/src/commonMain/kotlin/distort/BlockRepeat.kt +++ b/orx-fx/src/commonMain/kotlin/distort/BlockRepeat.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/DisplaceBlend.kt b/orx-fx/src/commonMain/kotlin/distort/DisplaceBlend.kt index 60f98e37..b2116a4e 100644 --- a/orx-fx/src/commonMain/kotlin/distort/DisplaceBlend.kt +++ b/orx-fx/src/commonMain/kotlin/distort/DisplaceBlend.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/Fisheye.kt b/orx-fx/src/commonMain/kotlin/distort/Fisheye.kt index 59755dd3..7d3c77c7 100644 --- a/orx-fx/src/commonMain/kotlin/distort/Fisheye.kt +++ b/orx-fx/src/commonMain/kotlin/distort/Fisheye.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/Lenses.kt b/orx-fx/src/commonMain/kotlin/distort/Lenses.kt index 1926d8aa..00114dae 100644 --- a/orx-fx/src/commonMain/kotlin/distort/Lenses.kt +++ b/orx-fx/src/commonMain/kotlin/distort/Lenses.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/PerspectivePlane.kt b/orx-fx/src/commonMain/kotlin/distort/PerspectivePlane.kt index 32c718bd..df020ae9 100644 --- a/orx-fx/src/commonMain/kotlin/distort/PerspectivePlane.kt +++ b/orx-fx/src/commonMain/kotlin/distort/PerspectivePlane.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/Perturb.kt b/orx-fx/src/commonMain/kotlin/distort/Perturb.kt index 5e84efff..f0120533 100644 --- a/orx-fx/src/commonMain/kotlin/distort/Perturb.kt +++ b/orx-fx/src/commonMain/kotlin/distort/Perturb.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/PolarToRectangular.kt b/orx-fx/src/commonMain/kotlin/distort/PolarToRectangular.kt index cad057cd..4fd7157f 100644 --- a/orx-fx/src/commonMain/kotlin/distort/PolarToRectangular.kt +++ b/orx-fx/src/commonMain/kotlin/distort/PolarToRectangular.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/RectangularToPolar.kt b/orx-fx/src/commonMain/kotlin/distort/RectangularToPolar.kt index 50084eec..f5b238c3 100644 --- a/orx-fx/src/commonMain/kotlin/distort/RectangularToPolar.kt +++ b/orx-fx/src/commonMain/kotlin/distort/RectangularToPolar.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/StackRepeat.kt b/orx-fx/src/commonMain/kotlin/distort/StackRepeat.kt index d8f57acf..3a44abfe 100644 --- a/orx-fx/src/commonMain/kotlin/distort/StackRepeat.kt +++ b/orx-fx/src/commonMain/kotlin/distort/StackRepeat.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/StretchWaves.kt b/orx-fx/src/commonMain/kotlin/distort/StretchWaves.kt index 22de5499..cbae30a1 100644 --- a/orx-fx/src/commonMain/kotlin/distort/StretchWaves.kt +++ b/orx-fx/src/commonMain/kotlin/distort/StretchWaves.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/TapeNoise.kt b/orx-fx/src/commonMain/kotlin/distort/TapeNoise.kt index 3b64141a..304888aa 100644 --- a/orx-fx/src/commonMain/kotlin/distort/TapeNoise.kt +++ b/orx-fx/src/commonMain/kotlin/distort/TapeNoise.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/distort/Tiles.kt b/orx-fx/src/commonMain/kotlin/distort/Tiles.kt index 18dc0dc2..89ce452a 100644 --- a/orx-fx/src/commonMain/kotlin/distort/Tiles.kt +++ b/orx-fx/src/commonMain/kotlin/distort/Tiles.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/distort/VideoGlitch.kt b/orx-fx/src/commonMain/kotlin/distort/VideoGlitch.kt index 1297496b..8dc68661 100644 --- a/orx-fx/src/commonMain/kotlin/distort/VideoGlitch.kt +++ b/orx-fx/src/commonMain/kotlin/distort/VideoGlitch.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/distort/Wave.kt b/orx-fx/src/commonMain/kotlin/distort/Wave.kt index 8b2b9ed1..3bf43c8f 100644 --- a/orx-fx/src/commonMain/kotlin/distort/Wave.kt +++ b/orx-fx/src/commonMain/kotlin/distort/Wave.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.distort import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/dither/ADither.kt b/orx-fx/src/commonMain/kotlin/dither/ADither.kt index ff0d2043..2baa5822 100644 --- a/orx-fx/src/commonMain/kotlin/dither/ADither.kt +++ b/orx-fx/src/commonMain/kotlin/dither/ADither.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.dither import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/dither/CMYKHalftone.kt b/orx-fx/src/commonMain/kotlin/dither/CMYKHalftone.kt index 6c76b3cb..375a78bd 100644 --- a/orx-fx/src/commonMain/kotlin/dither/CMYKHalftone.kt +++ b/orx-fx/src/commonMain/kotlin/dither/CMYKHalftone.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.dither import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/dither/Crosshatch.kt b/orx-fx/src/commonMain/kotlin/dither/Crosshatch.kt index 679a6499..523c243e 100644 --- a/orx-fx/src/commonMain/kotlin/dither/Crosshatch.kt +++ b/orx-fx/src/commonMain/kotlin/dither/Crosshatch.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.dither import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/dither/LumaHalftone.kt b/orx-fx/src/commonMain/kotlin/dither/LumaHalftone.kt index 1b68a15a..8e1ff3ed 100644 --- a/orx-fx/src/commonMain/kotlin/dither/LumaHalftone.kt +++ b/orx-fx/src/commonMain/kotlin/dither/LumaHalftone.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.dither import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/edges/CannyEdgeDetector.kt b/orx-fx/src/commonMain/kotlin/edges/CannyEdgeDetector.kt index 3233e8d8..9f2b3d2d 100644 --- a/orx-fx/src/commonMain/kotlin/edges/CannyEdgeDetector.kt +++ b/orx-fx/src/commonMain/kotlin/edges/CannyEdgeDetector.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.edges import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/edges/Contour.kt b/orx-fx/src/commonMain/kotlin/edges/Contour.kt index ce97d163..217e6780 100644 --- a/orx-fx/src/commonMain/kotlin/edges/Contour.kt +++ b/orx-fx/src/commonMain/kotlin/edges/Contour.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.edges import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/edges/EdgesWork.kt b/orx-fx/src/commonMain/kotlin/edges/EdgesWork.kt index 9ad084a4..c60e69c1 100644 --- a/orx-fx/src/commonMain/kotlin/edges/EdgesWork.kt +++ b/orx-fx/src/commonMain/kotlin/edges/EdgesWork.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.edges import org.openrndr.draw.* diff --git a/orx-fx/src/commonMain/kotlin/edges/LumaLaplacian.kt b/orx-fx/src/commonMain/kotlin/edges/LumaLaplacian.kt index 4df91020..ce8a67c9 100644 --- a/orx-fx/src/commonMain/kotlin/edges/LumaLaplacian.kt +++ b/orx-fx/src/commonMain/kotlin/edges/LumaLaplacian.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.edges import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/edges/LumaSobel.kt b/orx-fx/src/commonMain/kotlin/edges/LumaSobel.kt index 4b8888dd..263ce95b 100644 --- a/orx-fx/src/commonMain/kotlin/edges/LumaSobel.kt +++ b/orx-fx/src/commonMain/kotlin/edges/LumaSobel.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.edges import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/grain/FilmGrain.kt b/orx-fx/src/commonMain/kotlin/grain/FilmGrain.kt index 343a2a42..de7e8988 100644 --- a/orx-fx/src/commonMain/kotlin/grain/FilmGrain.kt +++ b/orx-fx/src/commonMain/kotlin/grain/FilmGrain.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.grain import org.openrndr.draw.Filter diff --git a/orx-fx/src/commonMain/kotlin/math/MultiplyU.kt b/orx-fx/src/commonMain/kotlin/math/MultiplyU.kt index 0e2ddbb0..0359bf4b 100644 --- a/orx-fx/src/commonMain/kotlin/math/MultiplyU.kt +++ b/orx-fx/src/commonMain/kotlin/math/MultiplyU.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + import org.openrndr.draw.Filter import org.openrndr.draw.Filter1to1 import org.openrndr.draw.filterShaderFromCode diff --git a/orx-fx/src/commonMain/kotlin/math/MultiplyV.kt b/orx-fx/src/commonMain/kotlin/math/MultiplyV.kt index c1914848..6b739cba 100644 --- a/orx-fx/src/commonMain/kotlin/math/MultiplyV.kt +++ b/orx-fx/src/commonMain/kotlin/math/MultiplyV.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + import org.openrndr.draw.Filter import org.openrndr.draw.Filter1to1 import org.openrndr.draw.filterShaderFromCode diff --git a/orx-fx/src/commonMain/kotlin/math/Square.kt b/orx-fx/src/commonMain/kotlin/math/Square.kt index 259da3b8..b310bbe0 100644 --- a/orx-fx/src/commonMain/kotlin/math/Square.kt +++ b/orx-fx/src/commonMain/kotlin/math/Square.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + import org.openrndr.draw.Filter import org.openrndr.draw.Filter1to1 import org.openrndr.draw.filterShaderFromCode diff --git a/orx-fx/src/commonMain/kotlin/patterns/Checkers.kt b/orx-fx/src/commonMain/kotlin/patterns/Checkers.kt index 70e8de88..fe460783 100644 --- a/orx-fx/src/commonMain/kotlin/patterns/Checkers.kt +++ b/orx-fx/src/commonMain/kotlin/patterns/Checkers.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.patterns import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/shadow/DropShadow.kt b/orx-fx/src/commonMain/kotlin/shadow/DropShadow.kt index eef485f5..83f51818 100644 --- a/orx-fx/src/commonMain/kotlin/shadow/DropShadow.kt +++ b/orx-fx/src/commonMain/kotlin/shadow/DropShadow.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.shadow import org.openrndr.color.ColorRGBa diff --git a/orx-fx/src/commonMain/kotlin/tonemap/ACESTonemap.kt b/orx-fx/src/commonMain/kotlin/tonemap/ACESTonemap.kt index 8b138381..2ed0b061 100644 --- a/orx-fx/src/commonMain/kotlin/tonemap/ACESTonemap.kt +++ b/orx-fx/src/commonMain/kotlin/tonemap/ACESTonemap.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.tonemap import org.openrndr.draw.Filter1to1 diff --git a/orx-fx/src/commonMain/kotlin/tonemap/ReinhardTonemap.kt b/orx-fx/src/commonMain/kotlin/tonemap/ReinhardTonemap.kt index 43eb669f..d4adb55a 100644 --- a/orx-fx/src/commonMain/kotlin/tonemap/ReinhardTonemap.kt +++ b/orx-fx/src/commonMain/kotlin/tonemap/ReinhardTonemap.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.tonemap import org.openrndr.draw.Filter1to1 diff --git a/orx-fx/src/commonMain/kotlin/tonemap/Uncharted2Tonemap.kt b/orx-fx/src/commonMain/kotlin/tonemap/Uncharted2Tonemap.kt index 3f34dc10..a4010e93 100644 --- a/orx-fx/src/commonMain/kotlin/tonemap/Uncharted2Tonemap.kt +++ b/orx-fx/src/commonMain/kotlin/tonemap/Uncharted2Tonemap.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.fx.tonemap import org.openrndr.draw.Filter diff --git a/orx-shade-styles/src/commonMain/kotlin/AngularGradient.kt b/orx-shade-styles/src/commonMain/kotlin/AngularGradient.kt index 0c9b21de..93981cec 100644 --- a/orx-shade-styles/src/commonMain/kotlin/AngularGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/AngularGradient.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.shadestyles import org.openrndr.color.ColorRGBa diff --git a/orx-shade-styles/src/commonMain/kotlin/HalfAngularGradient.kt b/orx-shade-styles/src/commonMain/kotlin/HalfAngularGradient.kt index 033e43dc..76747b1b 100644 --- a/orx-shade-styles/src/commonMain/kotlin/HalfAngularGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/HalfAngularGradient.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.shadestyles import org.openrndr.color.ColorRGBa diff --git a/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt b/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt index ea176022..ce958b2e 100644 --- a/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.shadestyles import org.openrndr.color.* diff --git a/orx-shade-styles/src/commonMain/kotlin/NPointGradient.kt b/orx-shade-styles/src/commonMain/kotlin/NPointGradient.kt index 7e48a9cb..814e2e01 100644 --- a/orx-shade-styles/src/commonMain/kotlin/NPointGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/NPointGradient.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.shadestyles import org.openrndr.color.ColorRGBa diff --git a/orx-shade-styles/src/commonMain/kotlin/NPointLinearGradient.kt b/orx-shade-styles/src/commonMain/kotlin/NPointLinearGradient.kt index 7422c7fb..1ebf51b3 100644 --- a/orx-shade-styles/src/commonMain/kotlin/NPointLinearGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/NPointLinearGradient.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.shadestyles import org.openrndr.color.AlgebraicColor diff --git a/orx-shade-styles/src/commonMain/kotlin/NPointRadialGradient.kt b/orx-shade-styles/src/commonMain/kotlin/NPointRadialGradient.kt index de514d37..2e74893d 100644 --- a/orx-shade-styles/src/commonMain/kotlin/NPointRadialGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/NPointRadialGradient.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.shadestyles import org.openrndr.color.ColorRGBa diff --git a/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt b/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt index ff041340..78c0f3ec 100644 --- a/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt @@ -1,3 +1,5 @@ +@file:Suppress("RUNTIME_ANNOTATION_NOT_SUPPORTED") + package org.openrndr.extra.shadestyles import org.openrndr.color.* diff --git a/orx-shapes/src/commonMain/kotlin/Circle.kt b/orx-shapes/src/commonMain/kotlin/Circle.kt index b46e122c..df96eda5 100644 --- a/orx-shapes/src/commonMain/kotlin/Circle.kt +++ b/orx-shapes/src/commonMain/kotlin/Circle.kt @@ -15,8 +15,8 @@ fun Circle.contour(segments: Int): ShapeContour { val p = Polar(0.0, radius) moveTo(center + p.cartesian) for (i in 1 until segments+1) { - val p = Polar(i * 360.0/segments, radius).cartesian + center - arcTo(radius, radius, 360.0/segments, false, true, p.x, p.y) + val lp = Polar(i * 360.0/segments, radius).cartesian + center + arcTo(radius, radius, 360.0/segments, false, true, lp.x, lp.y) } close() } diff --git a/orx-shapes/src/commonMain/kotlin/utilities/FromContours.kt b/orx-shapes/src/commonMain/kotlin/utilities/FromContours.kt index 3e7d71ba..282ed4da 100644 --- a/orx-shapes/src/commonMain/kotlin/utilities/FromContours.kt +++ b/orx-shapes/src/commonMain/kotlin/utilities/FromContours.kt @@ -7,7 +7,7 @@ import org.openrndr.shape.contour * Create a contour from a list of contours */ fun ShapeContour.Companion.fromContours(contours: List, closed: Boolean, connectEpsilon:Double=1E-6) : ShapeContour { - val contours = contours.filter { !it.empty } + @Suppress("NAME_SHADOWING") val contours = contours.filter { !it.empty } if (contours.isEmpty()) { return EMPTY }