Skip to content

Commit 729d694

Browse files
committed
init
1 parent 8155048 commit 729d694

File tree

12 files changed

+70
-13
lines changed

12 files changed

+70
-13
lines changed

client/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
3535
}
3636

3737
kotlin {
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)

client/src/commonMain/kotlin/MainScene.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
}

client/src/commonMain/kotlin/ui/newLoginMenu.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import korlibs.korge.style.textSize
1111
import korlibs.korge.ui.*
1212
import korlibs.korge.view.Container
1313
import korlibs.korge.view.align.*
14-
import korlibs.korge.view.positionX
1514
import korlibs.korge.view.zIndex
1615
import korlibs.math.geom.RectCorners
1716
import 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
}

client/src/commonMain/kotlin/ui/MainMenu.kt renamed to client/src/commonMain/kotlin/ui/serverListMenu.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ package ui
33
import io.ktor.http.*
44
import korlibs.datastructure.getExtra
55
import korlibs.datastructure.setExtra
6-
import korlibs.image.bitmap.BmpSlice
76
import korlibs.image.color.Colors
87
import korlibs.korge.input.mouse
98
import korlibs.korge.input.onClick
10-
import korlibs.korge.render.SDFShaders.pow
119
import korlibs.korge.style.styles
1210
import korlibs.korge.time.timers
1311
import korlibs.korge.ui.*
@@ -22,15 +20,13 @@ import network.*
2220
import scene
2321
import styler
2422
import screen
25-
import screen
2623
import ui.custom.customUiButton
2724
import ui.custom.customUiScrollable
2825
import ui.custom.customUiText
2926
import util.ColorPalette
3027
import util.transform
3128
import kotlin.math.PI
3229
import kotlin.math.pow
33-
import kotlin.math.sqrt
3430

3531
class 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

client/src/commonMain/kotlin/ui/waitingRoom.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import event.PacketEvent
55
import korlibs.datastructure.getExtra
66
import korlibs.datastructure.setExtra
77
import korlibs.event.Key
8-
import korlibs.image.bitmap.Bitmap
98
import korlibs.image.bitmap.slice
109
import korlibs.image.color.Colors
1110
import 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
}

client/src/commonMain/kotlin/util/coroutineUtil.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ import kotlinx.coroutines.DelicateCoroutinesApi
77
import kotlinx.coroutines.GlobalScope
88
import 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+
}
26.6 KB
Loading
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
}

sandbox/build.gradle.kts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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+
}

sandbox/src/jvmMain/kotlin/Card.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import korlibs.korge.Korge
2+
import kotlinx.coroutines.runBlocking
3+
4+
fun main() {}

0 commit comments

Comments
 (0)