Skip to content

Commit eec0933

Browse files
committed
Fixed a few warnings
1 parent 29e1cb7 commit eec0933

File tree

10 files changed

+18
-14
lines changed

10 files changed

+18
-14
lines changed

buildSrc/src/main/kotlin/kool.lib-conventions.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ kotlin {
2323
compilerOptions {
2424
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
2525
freeCompilerArgs.add("-Xcontext-parameters")
26+
freeCompilerArgs.add("-Xexplicit-backing-fields")
2627
}
2728

2829
sourceSets.all {

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ kotlin-atomicfu = { group = "org.jetbrains.kotlinx", name = "atomicfu", version.
3030
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
3131
kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
3232
jsvg = { group = "com.github.weisj", name = "jsvg", version.ref = "jsvg" }
33+
jspecify-annotations = { module = "org.jspecify:jspecify", version = "1.0.0" }
3334
androidsvg = { group = "com.caverock", name = "androidsvg-aar", version.ref = "androidsvg" }
3435
lwjgl-core = { group = "org.lwjgl", name = "lwjgl", version.ref = "lwjgl" }
3536
lwjgl-glfw = { group = "org.lwjgl", name = "lwjgl-glfw", version.ref = "lwjgl" }

kool-core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ kotlin {
3030
.filter { it.name !in nonNativeLibs }
3131
.forEach { lib -> runtimeOnly("$lib:$platform") }
3232
}
33+
compileOnly(libs.jspecify.annotations) // used / needed by lwjgl
3334
}
3435
desktopTest.dependencies {
3536
implementation(libs.kotlin.test.junit)

kool-core/src/commonMain/kotlin/de/fabmax/kool/modules/gltf/GltfMaterial.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ data class GltfMaterial(
150150
}
151151
textureProperty(roughnessTexture, 0, texName)
152152
}
153-
val occlusionFactor = this@GltfMaterial.occlusionTexture?.strength ?: 1f
153+
val occlusionFactor = this@GltfMaterial.occlusionTexture.strength
154154
if (occlusionFactor != 1f) {
155155
constProperty(occlusionFactor, blendMode = PropertyBlockConfig.BlendMode.Multiply)
156156
}

kool-core/src/commonMain/kotlin/de/fabmax/kool/modules/ui2/LaunchedEffect.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import kotlinx.coroutines.Job
55
import kotlinx.coroutines.launch
66

77
/**
8-
* Runs a coroutine when entering the composition and relaunches it when [key1] changes.
8+
* Runs a coroutine when entering the composition and relaunches it when [keys] change.
99
* Useful for triggering suspend operations (e.g. animations) in response to state updates.
1010
*/
1111
fun UiScope.LaunchedEffect(vararg keys: Any?, block: suspend CoroutineScope.() -> Unit) {

kool-core/src/commonMain/kotlin/de/fabmax/kool/modules/ui2/UiAnimations.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ fun UiScope.animateFloatAsState(
1111
): MutableStateValue<Float> {
1212
val animatable = remember { AnimatableFloat(targetValue) }
1313
LaunchedEffect(targetValue) {
14+
1415
animationSpec.animateTo(animatable, targetValue)
1516
}
1617
return animatable

kool-core/src/commonMain/kotlin/de/fabmax/kool/modules/ui2/UiScope.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ interface UiScope {
1717
val Int.dp: Dp get() = Dp(this.toFloat())
1818
val Float.dp: Dp get() = Dp(this)
1919

20-
fun <T: Any?> MutableStateValue<T>.use(): T = use(surface)
20+
fun <T> MutableStateValue<T>.use(): T = use(surface)
2121
fun <T> MutableStateList<T>.use(): MutableStateList<T> = use(surface)
2222

2323
fun <T: Any> AnimatedState<T>.progressAndUse(): T {
@@ -29,10 +29,10 @@ interface UiScope {
2929
compose()
3030
}
3131

32-
operator fun <T: Any?> MutableStateValue<T>.getValue(thisRef: Any?, property: KProperty<*>): T = use(surface)
33-
operator fun <T: Any?> MutableStateValue<T>.setValue(thisRef: Any?, property: KProperty<*>, value: T) = set(value)
32+
operator fun <T> MutableStateValue<T>.getValue(thisRef: Any?, property: KProperty<*>): T = use(surface)
33+
operator fun <T> MutableStateValue<T>.setValue(thisRef: Any?, property: KProperty<*>, value: T) = set(value)
3434

35-
operator fun <T: Any?> MutableStateList<T>.getValue(thisRef: Any?, property: KProperty<*>): MutableStateList<T> = use(surface)
35+
operator fun <T> MutableStateList<T>.getValue(thisRef: Any?, property: KProperty<*>): MutableStateList<T> = use(surface)
3636
}
3737

3838
inline fun UiScope.Popup(
@@ -57,7 +57,7 @@ inline fun UiScope.Popup(
5757
}
5858

5959
inline fun <reified T: Any> UiScope.remember(provider: () -> T): T = uiNode.weakMemory.weakMemory(provider)
60-
fun <T: Any?> UiScope.remember(initialState: T): MutableStateValue<T> = remember { mutableStateOf(initialState) }
61-
fun <T: Any?> UiScope.remember(initialState: T, onChange: (T, T) -> Unit) = remember { mutableStateOf(initialState).onChange(onChange) }
60+
fun <T> UiScope.remember(initialState: T): MutableStateValue<T> = remember { mutableStateOf(initialState) }
61+
fun <T> UiScope.remember(initialState: T, onChange: (T, T) -> Unit) = remember { mutableStateOf(initialState).onChange(onChange) }
6262
fun UiScope.rememberScrollState(): ScrollState = remember { ScrollState() }
6363
fun UiScope.rememberListState(): LazyListState = remember { LazyListState() }

kool-core/src/commonMain/kotlin/de/fabmax/kool/modules/ui2/WeakMemory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class WeakMemory {
3737
nextEntry++
3838
val newEntry = provider()
3939
entries += newEntry
40-
return newEntry
40+
newEntry
4141
}
4242
}
4343
}

kool-core/src/commonMain/kotlin/de/fabmax/kool/modules/ui2/docking/DockNode.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ sealed class DockNode(
128128
relevantChild = relevantParent
129129
relevantParent = relevantParent.parent
130130
}
131-
(relevantParent as DockNodeRow?)?.moveEdgeTo(relevantChild.index, screenX)
131+
relevantParent?.moveEdgeTo(relevantChild.index, screenX)
132132
}
133133

134134
fun moveRightEdgeTo(screenX: Float) {
@@ -139,7 +139,7 @@ sealed class DockNode(
139139
relevantChild = relevantParent
140140
relevantParent = relevantParent.parent
141141
}
142-
(relevantParent as DockNodeRow?)?.moveEdgeTo(relevantChild.index + 1, screenX)
142+
relevantParent?.moveEdgeTo(relevantChild.index + 1, screenX)
143143
}
144144

145145
fun moveTopEdgeTo(screenY: Float) {
@@ -150,7 +150,7 @@ sealed class DockNode(
150150
relevantChild = relevantParent
151151
relevantParent = relevantParent.parent
152152
}
153-
(relevantParent as DockNodeColumn?)?.moveEdgeTo(relevantChild.index, screenY)
153+
relevantParent?.moveEdgeTo(relevantChild.index, screenY)
154154
}
155155

156156
fun moveBottomEdgeTo(screenY: Float) {
@@ -161,7 +161,7 @@ sealed class DockNode(
161161
relevantChild = relevantParent
162162
relevantParent = relevantParent.parent
163163
}
164-
(relevantParent as DockNodeColumn?)?.moveEdgeTo(relevantChild.index + 1, screenY)
164+
relevantParent?.moveEdgeTo(relevantChild.index + 1, screenY)
165165
}
166166

167167
fun <T: DockNode> countParentsOfType(nodeType: KClass<T>): Int {

kool-core/src/commonMain/kotlin/de/fabmax/kool/util/PolyUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ object PolyUtil {
159159
private fun nextEarTip(): PolyVertex? {
160160
var best: PolyVertex? = null
161161
verts.forEach { v ->
162-
if (v.isOpen && v.isEar && (best == null || best!!.interiorAngle > v.interiorAngle)) {
162+
if (v.isOpen && v.isEar && (best == null || best.interiorAngle > v.interiorAngle)) {
163163
best = v
164164
}
165165
}

0 commit comments

Comments
 (0)