Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,13 @@ korge {

// To enable all targets at once

//targetAll()
targetAll()

// To enable targets based on properties/environment variables
//targetDefault()

// To selectively enable targets

targetJvm()
targetJs()
targetDesktopCross()
//targetIos()
targetAndroid()
serializationJson()
}

Expand Down
10 changes: 10 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
org.gradle.jvmargs=-Xmx4g
kotlin.mpp.stability.nowarn=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.mpp.applyDefaultHierarchyTemplate=false
kotlin.native.ignoreDisabledTargets=true
android.useAndroidX=true
org.gradle.warning.mode=none
org.gradle.configuration-cache=true
org.gradle.configuration-cache.problems=warn
kotlin.code.style=official
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[plugins]
korge = { id = "com.soywiz.korge", version = "6.0.0-beta4" }
korge = { id = "com.soywiz.korge", version = "6.0.0" }
#korge = { id = "com.soywiz.korge", version = "999.0.0.999" }
2 changes: 1 addition & 1 deletion korge-virtualcontroller/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/.idea
/.gradle
/build
/build.gradle
/build.gradle.kts
16 changes: 16 additions & 0 deletions korge-virtualcontroller/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
buildscript {
repositories {
mavenLocal(); mavenCentral(); google(); gradlePluginPortal()
maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") }
maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental") }
}
}
plugins {
id("com.soywiz.kproject")
}
dependencies {
add("commonMainApi", "com.soywiz.korlibs.korge2:korge")
}
[file("build.extra.gradle"), file("build.extra.gradle.kts")].each { extraGradle ->
if (extraGradle.exists()) apply from: extraGradle
}
3 changes: 3 additions & 0 deletions korge-virtualcontroller/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[plugins]
korge = { id = "com.soywiz.korge", version = "6.0.0" }
#korge = { id = "com.soywiz.korge", version = "999.0.0.999" }
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Mon Sep 15 17:00:56 CEST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions korge-virtualcontroller/local.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Mon Sep 15 17:00:58 CEST 2025
sdk.dir=/home/sauron/Android/Sdk
23 changes: 23 additions & 0 deletions korge-virtualcontroller/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
pluginManagement {
repositories { mavenLocal(); mavenCentral(); google(); gradlePluginPortal() }
}

buildscript {
val libsTomlFile = File(this.sourceFile?.parentFile, "gradle/libs.versions.toml").readText()
var plugins = false
var version = ""
for (line in libsTomlFile.lines().map { it.trim() }) {
if (line.startsWith("#")) continue
if (line.startsWith("[plugins]")) plugins = true
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")
}
if (version.isEmpty()) error("Can't find korge version in $libsTomlFile")

repositories { mavenLocal(); mavenCentral(); google(); gradlePluginPortal() }

dependencies {
classpath("com.soywiz.korge.settings:com.soywiz.korge.settings.gradle.plugin:$version")
}
}

apply(plugin = "com.soywiz.korge.settings")
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class KeyboardStickController(
var usedKeyboard = false

fun update(view: View, controller: VirtualController) {
val keys = view?.stage?.input?.keys ?: return@update
val keys = view.stage?.input?.keys ?: return@update
val keyPressed = keys[config.left] || keys[config.right] || keys[config.up] || keys[config.down]
if (keyPressed) {
usedKeyboard = true
Expand Down

This file was deleted.

33 changes: 14 additions & 19 deletions src/commonMain/kotlin/Main.kt → src/Main.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@ import korlibs.event.Key
import korlibs.korge.*
import korlibs.korge.scene.*
import korlibs.korge.view.*
import korlibs.korge.virtualcontroller.VirtualButtonConfig
import korlibs.korge.virtualcontroller.VirtualStickConfig
import korlibs.korge.virtualcontroller.virtualController
import korlibs.korge.virtualcontroller.*
import korlibs.math.geom.*
import korlibs.math.isAlmostZero
import korlibs.time.TimeSpan
import korlibs.time.hz
import korlibs.time.milliseconds
import korlibs.time.seconds
import kotlin.math.absoluteValue

suspend fun main() = Korge(windowSize = Size(512, 512)) {
sceneContainer().changeTo({ MainMyModuleScene() })
sceneContainer().changeTo{ MainMyModuleScene() }
}

class MainMyModuleScene : Scene() {
Expand Down Expand Up @@ -53,7 +50,7 @@ class MainMyModuleScene : Scene() {
var jumping = false
var moving = false
var playerPos = Point(0, 0)
var gravity = Vector2D(0, 10)
val gravity = Vector2D(0, 10)
var playerSpeed = Vector2D(0, 0)

fun tryMoveDelta(delta: Point): Boolean {
Expand All @@ -68,15 +65,15 @@ class MainMyModuleScene : Scene() {
}

var stateName = "-"
fun setState(name: String, time: TimeSpan) {
fun setState(name: String) {
stateName = name
}

fun updateState() {
when {
jumping -> setState("jump", 0.1.seconds)
moving -> setState("walk", 0.1.seconds)
else -> setState("idle", 0.3.seconds)
jumping -> setState("jump")
moving -> setState("walk")
else -> setState("idle")
}
}

Expand All @@ -99,13 +96,11 @@ class MainMyModuleScene : Scene() {
down(GameButton.BUTTON_SOUTH) {
val isInGround = playerSpeed.y.isAlmostZero()
//if (isInGround) {
if (true) {
if (!jumping) {
jumping = true
updateState()
}
playerSpeed += Vector2D(0, -5.5)
if (!jumping) {
jumping = true
updateState()
}
playerSpeed += Vector2D(0, -5.5)
}
changed(GameButton.LX) {
if (it.new.absoluteValue < 0.01f) {
Expand All @@ -125,9 +120,9 @@ class MainMyModuleScene : Scene() {
}
}

val STEP = 16.milliseconds
addFixedUpdater(STEP) {
playerSpeed += gravity * STEP.seconds
val step = 16.milliseconds
addFixedUpdater(step) {
playerSpeed += gravity * step.seconds
if (!tryMoveDelta(playerSpeed)) {
playerSpeed = Vector2D.ZERO
if (jumping) {
Expand Down
8 changes: 0 additions & 8 deletions src/commonTest/kotlin/MyTest.kt

This file was deleted.

Loading