File tree Expand file tree Collapse file tree 12 files changed +70
-13
lines changed
Expand file tree Collapse file tree 12 files changed +70
-13
lines changed Original file line number Diff line number Diff line change @@ -35,7 +35,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
3535}
3636
3737kotlin {
38- jvm()
3938 sourceSets {
4039 val commonMain by getting {
4140// kotlin.addSrcDir(File(project(":shared").projectDir, "src/commonMain/kotlin"))
@@ -45,6 +44,11 @@ kotlin {
4544 api(project(" :shared" ))
4645 }
4746 }
47+ val jvmTest by getting {
48+ dependencies {
49+ kotlin(" test" )
50+ }
51+ }
4852 val jsMain by getting {
4953 dependencies {
5054 api(libs.ktor.client.js)
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ class MainScene : Scene() {
4646 positionY(screen.height - height - padding)
4747 positionX(padding* 2 )
4848 }
49- newCreateRoomMenu()
49+ // newCreateRoomMenu()
5050// loginMenuView()
5151 }
5252}
Original file line number Diff line number Diff line change @@ -11,7 +11,6 @@ import korlibs.korge.style.textSize
1111import korlibs.korge.ui.*
1212import korlibs.korge.view.Container
1313import korlibs.korge.view.align.*
14- import korlibs.korge.view.positionX
1514import korlibs.korge.view.zIndex
1615import korlibs.math.geom.RectCorners
1716import korlibs.math.geom.Size
@@ -141,6 +140,6 @@ suspend fun LoginMenuState.join() {
141140 return
142141 } else {
143142 loginMenu.removeFromParent()
144- MainMenuState ().mainMenu ()
143+ MainMenuState ().serverListMenu ()
145144 }
146145}
Original file line number Diff line number Diff line change @@ -3,11 +3,9 @@ package ui
33import io.ktor.http.*
44import korlibs.datastructure.getExtra
55import korlibs.datastructure.setExtra
6- import korlibs.image.bitmap.BmpSlice
76import korlibs.image.color.Colors
87import korlibs.korge.input.mouse
98import korlibs.korge.input.onClick
10- import korlibs.korge.render.SDFShaders.pow
119import korlibs.korge.style.styles
1210import korlibs.korge.time.timers
1311import korlibs.korge.ui.*
@@ -22,15 +20,13 @@ import network.*
2220import scene
2321import styler
2422import screen
25- import screen
2623import ui.custom.customUiButton
2724import ui.custom.customUiScrollable
2825import ui.custom.customUiText
2926import util.ColorPalette
3027import util.transform
3128import kotlin.math.PI
3229import kotlin.math.pow
33- import kotlin.math.sqrt
3430
3531class MainMenuState {
3632 val elementRatio = 9
@@ -52,7 +48,7 @@ class MainMenuState {
5248
5349}
5450
55- suspend fun MainMenuState.mainMenu () {
51+ suspend fun MainMenuState.serverListMenu () {
5652
5753 screen.uiContainer mainMenu@{
5854 serverList = this
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ import event.PacketEvent
55import korlibs.datastructure.getExtra
66import korlibs.datastructure.setExtra
77import korlibs.event.Key
8- import korlibs.image.bitmap.Bitmap
98import korlibs.image.bitmap.slice
109import korlibs.image.color.Colors
1110import korlibs.image.color.RGBA
@@ -113,7 +112,7 @@ suspend fun WaitingRoomState.waitingRoom(room: UUID) {
113112 isDone = true
114113 requestLeaveRoom(sessionUUID)
115114 waitingRoom.removeFromParent()
116- MainMenuState ().mainMenu ()
115+ MainMenuState ().serverListMenu ()
117116 }
118117 }
119118 }
Original file line number Diff line number Diff line change @@ -7,4 +7,6 @@ import kotlinx.coroutines.DelicateCoroutinesApi
77import kotlinx.coroutines.GlobalScope
88import kotlin.coroutines.CoroutineContext
99
10- fun launchNow (context : CoroutineContext = GlobalScope .coroutineContext, callback : suspend () -> Unit ) = CoroutineScope (context).launchImmediately(callback)
10+ fun launchNow (context : CoroutineContext = GlobalScope .coroutineContext, callback : suspend () -> Unit ) {
11+ CoroutineScope (context).launchImmediately(callback)
12+ }
Original file line number Diff line number Diff line change 1+ package test
2+
3+ import korlibs.image.format.readBitmap
4+ import korlibs.io.async.launchImmediately
5+ import korlibs.io.async.runBlockingNoSuspensions
6+ import korlibs.io.file.std.resourcesVfs
7+ import korlibs.korge.Korge
8+ import korlibs.korge.view.image
9+ import kotlinx.coroutines.GlobalScope
10+ import kotlinx.coroutines.runBlocking
11+ import util.launchNow
12+ import kotlin.test.Test
13+
14+ class Card {
15+ @Test
16+ fun testCard () {
17+ launchImmediately(GlobalScope .coroutineContext) {
18+ Korge {
19+ image(resourcesVfs[" images/cards/d_card.png" ].readBitmap())
20+ }
21+ }
22+ }
23+
24+ }
Original file line number Diff line number Diff line change 1+ import korlibs.korge.gradle.KorgeGradlePlugin
2+ import korlibs.korge.gradle.korge
3+ import korlibs.korge.gradle.typedresources.GenerateTypedResourcesTask
4+
5+ apply<KorgeGradlePlugin >()
6+ apply (plugin = " org.jetbrains.kotlin.plugin.serialization" )
7+ plugins {
8+ kotlin(" multiplatform" )
9+ }
10+
11+ korge {
12+ targetJvm()
13+ }
14+
15+ kotlin {
16+ sourceSets {
17+ val commonMain by getting {
18+ resources.apply {
19+ setSrcDirs(srcDirs
20+ .also { it.add(File (project(" :client" ).projectDir, " src/commonMain/resources" )) })
21+ }
22+ }
23+ }
24+ }
25+
26+ tasks.create<Delete >(" disableKRes" ) {
27+ dependsOn(tasks.withType<GenerateTypedResourcesTask >())
28+ afterEvaluate { File (buildDir, " KR/KR.kt" ).delete() }
29+ }
Original file line number Diff line number Diff line change 1+ import korlibs.korge.Korge
2+ import kotlinx.coroutines.runBlocking
3+
4+ fun main () {}
You can’t perform that action at this time.
0 commit comments