Skip to content

Commit 256c38a

Browse files
committed
Update to KorGE 5.0.0
1 parent e82e3f4 commit 256c38a

File tree

8 files changed

+26
-14
lines changed

8 files changed

+26
-14
lines changed

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import korlibs.korge.gradle.*
22

33
plugins {
44
//alias(libs.plugins.korge)
5-
id("com.soywiz.korge") version "4.0.7"
5+
alias(libs.plugins.korge)
66
//id("com.soywiz.korge") version "999.0.0.999"
77
}
88

gradle/libs.versions.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[plugins]
2+
korge = { id = "com.soywiz.korge", version = "5.0.0" }
3+
#korge = { id = "com.soywiz.korge", version = "999.0.0.999" }
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

korge-dragonbones/src/commonMain/kotlin/com/dragonbones/core/TransformDb.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class TransformDb
8282
) {
8383
var point: Point
8484
get() = Point(xf, yf)
85-
set(value) { xf = value.x; yf = value.y }
85+
set(value) { xf = value.x.toFloat(); yf = value.y.toFloat() }
8686

8787
companion object {
8888
/**

korge-dragonbones/src/commonMain/kotlin/korlibs/korge/dragonbones/KorgeDbArmatureDisplay.kt

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import korlibs.korge.view.property.*
3535
import korlibs.image.color.*
3636
import korlibs.math.geom.*
3737
import korlibs.math.geom.vector.*
38+
import korlibs.time.*
3839

3940
/**
4041
* @inheritDoc

korge-dragonbones/src/commonMain/kotlin/korlibs/korge/dragonbones/KorgeDbSlot.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class KorgeDbSlot(pool: SingleObjectPool<KorgeDbSlot>) : Slot(pool) {
128128
}
129129

130130
override fun _updateColor() {
131-
val alpha = this._colorTransform.alphaMultiplier.toFloat() * this._globalAlpha.toFloat()
131+
val alpha = this._colorTransform.alphaMultiplier.toDouble() * this._globalAlpha
132132
//this._renderDisplay?.alpha = alpha
133133
//this._renderDisplay?.alpha = 1.0
134134

settings.gradle.kts

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
1-
pluginManagement { repositories { mavenLocal(); mavenCentral(); google(); gradlePluginPortal() } }
2-
3-
plugins {
4-
//id("com.soywiz.kproject.settings") version "0.0.1-SNAPSHOT"
5-
id("com.soywiz.kproject.settings") version "0.3.1"
1+
pluginManagement {
2+
repositories { mavenLocal(); mavenCentral(); google(); gradlePluginPortal() }
63
}
74

8-
kproject("./deps")
5+
// @TODO: Why can't we just use libs here? We can't even use a TOML parser since it is gradle internal, and we cannot load a library in a reasonably way here.
6+
plugins {
7+
val libsTomlFile = File("gradle/libs.versions.toml").readText()
8+
var plugins = false
9+
var version = ""
10+
for (line in libsTomlFile.lines().map { it.trim() }) {
11+
if (line.startsWith("#")) continue
12+
if (line.startsWith("[plugins]")) plugins = true
13+
if (plugins && line.startsWith("korge") && Regex("^korge\\s*=.*").containsMatchIn(line)) version = Regex("version\\s*=\\s*\"(.*?)\"").find(line)?.groupValues?.get(1) ?: error("Can't find korge version")
14+
}
15+
if (version.isEmpty()) error("Can't find korge version in $libsTomlFile")
916

10-
rootProject.name = "dragonbones-example"
17+
id("com.soywiz.korge.settings") version version
18+
}

src/commonMain/kotlin/MainDragonbones.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class MainDragonbones : Scene() {
3131
lateinit var mySceneContainer: SceneContainer
3232

3333
override suspend fun SContainer.sceneMain() {
34-
scaleAvg = 0.9f
34+
scaleAvg = 0.9
3535
//delay(1000.milliseconds)
3636
//mySceneContainer.changeToDisablingButtons<HelloWorldScene>()
3737
disablingButtons { mySceneContainer.changeTo({ EyeTrackingScene() }) }
@@ -43,8 +43,8 @@ class MainDragonbones : Scene() {
4343
//}
4444

4545
mySceneContainer = sceneContainer(views) {
46-
this.x = views.virtualWidth.toFloat() * .5f
47-
this.y = views.virtualHeight.toFloat() * .5f
46+
this.x = views.virtualWidth * .5
47+
this.y = views.virtualHeight * .5
4848
}
4949
buttonContainer = this
5050
uiButton("Hello").clicked {

0 commit comments

Comments
 (0)