From 329a493cd92ee6d45bf5c66b1498a4ce32eaa585 Mon Sep 17 00:00:00 2001
From: soywiz <soywiz@gmail.com>
Date: Mon, 25 Nov 2019 18:14:01 +0100
Subject: [PATCH] Updated to Korge 1.4.0 and Kotlin 1.3.60

---
 build.gradle.kts                              |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 sample-box2d/src/commonMain/kotlin/Sample1.kt | 28 +++++++++++-------
 sample-box2d/src/jvmMain/kotlin/main.kt       |  8 +++++
 .../src/commonMain/kotlin/Sample1.kt          | 29 -------------------
 settings.gradle.kts                           |  2 ++
 6 files changed, 29 insertions(+), 42 deletions(-)
 create mode 100644 sample-box2d/src/jvmMain/kotlin/main.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 367b4e4..c32fa7f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,6 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath("com.soywiz:korge-gradle-plugin:1.2.0")
+		classpath("com.soywiz.korlibs.korge.plugins:korge-gradle-plugin:1.4.0")
 	}
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 44e7c4d..f04d6a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample-box2d/src/commonMain/kotlin/Sample1.kt b/sample-box2d/src/commonMain/kotlin/Sample1.kt
index 3bcaa57..6200a50 100644
--- a/sample-box2d/src/commonMain/kotlin/Sample1.kt
+++ b/sample-box2d/src/commonMain/kotlin/Sample1.kt
@@ -17,6 +17,12 @@ import org.jbox2d.dynamics.*
 suspend fun main() = Korge(quality = GameWindow.Quality.PERFORMANCE, title = "My Awesome Box2D Game!") {
 	val admob = AdmobCreate(testing = true)
 
+	println("STARTED!")
+
+	addUpdatable {
+		//println("FRAME!")
+	}
+
 	launchImmediately {
 		try {
 			admob.bannerPrepareAndShow(Admob.Config("ca-app-pub-xxx/xxx"))
@@ -27,18 +33,18 @@ suspend fun main() = Korge(quality = GameWindow.Quality.PERFORMANCE, title = "My
 
 	views.clearColor = Colors.DARKGREEN
 	solidRect(300, 200, Colors.DARKCYAN)
-	graphics {
+	sgraphics {
 		fill(Colors.DARKCYAN) {
-			rect(-100, -100, 300, 200)
+			rect(-1, -1, 3, 2)
 		}
 		fill(Colors.AQUAMARINE) {
-			circle(0, 0, 100)
+			circle(0, 0, 1)
 		}
 		fill(Colors.AQUAMARINE) {
-			circle(100, 0, 100)
+			circle(1, 0, 1)
 		}
 		position(100, 100)
-	}.interactive()
+	}.scale(100, 100).interactive()
 	worldView {
 		position(400, 400).scale(20)
 
@@ -66,7 +72,7 @@ suspend fun main() = Korge(quality = GameWindow.Quality.PERFORMANCE, title = "My
 			shape = BoxShape(2f, 2f)
 			density = 1f
 			friction = 0.2f
-		}.setView(graphics {
+		}.setView(sgraphics {
 			fill(Colors.BLUE) {
 				rect(-1f, -1f, 2f, 2f)
 			}
@@ -79,15 +85,15 @@ suspend fun main() = Korge(quality = GameWindow.Quality.PERFORMANCE, title = "My
 			shape = CircleShape().apply { m_radius = 2f }
 			density = 22f
 			friction = 3f
-		}.setView(graphics {
-			fillStroke(Context2d.Color(Colors.BLUE), Context2d.Color(Colors.RED), Context2d.StrokeInfo(thickness = 30.0)) {
-				circle(0, 0, 200)
+		}.setView(sgraphics {
+			fillStroke(Context2d.Color(Colors.BLUE), Context2d.Color(Colors.RED), Context2d.StrokeInfo(thickness = 0.3)) {
+				circle(0, 0, 2)
 				//rect(0, 0, 400, 20)
 			}
 			fill(Colors.DARKCYAN) {
-				circle(100, 100, 20)
+				circle(1, 1, 0.2)
 			}
-			scale(1f / 100f)
+			hitTestUsingShapes = true
 		}.interactive())
 	}
 	image(resourcesVfs["korge.png"].readBitmap())
diff --git a/sample-box2d/src/jvmMain/kotlin/main.kt b/sample-box2d/src/jvmMain/kotlin/main.kt
new file mode 100644
index 0000000..e2272df
--- /dev/null
+++ b/sample-box2d/src/jvmMain/kotlin/main.kt
@@ -0,0 +1,8 @@
+import kotlinx.coroutines.*
+
+// -XstartOnFirstThread
+fun main(args: Array<String>) {
+	runBlocking {
+		main()
+	}
+}
diff --git a/sample-shapes/src/commonMain/kotlin/Sample1.kt b/sample-shapes/src/commonMain/kotlin/Sample1.kt
index a8daa40..6c12321 100644
--- a/sample-shapes/src/commonMain/kotlin/Sample1.kt
+++ b/sample-shapes/src/commonMain/kotlin/Sample1.kt
@@ -22,32 +22,3 @@ fun Stage.setupCircle() {
 		}
 	}
 }
-
-class Circle(radius: Double = 16.0, color: RGBA = Colors.WHITE) : Container() {
-	var radius: Double = radius
-		set(value) {
-			field = value; updateGraphics()
-		}
-
-	var color: RGBA = color
-		set(value) {
-			field = value; updateGraphics()
-		}
-
-	val graphics = graphics {
-	}
-
-	init {
-		updateGraphics()
-	}
-
-	private fun updateGraphics() {
-		graphics.apply {
-			clear()
-			fill(color) {
-				circle(0.0, 0.0, radius)
-			}
-		}
-	}
-}
-
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c812e9a..48bfe86 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,5 @@
+enableFeaturePreview("GRADLE_METADATA")
+
 for (file in rootDir.listFiles()) {
 	if (file.isDirectory && file.name.startsWith("sample-") && (File(file, "build.gradle").exists() || File(file, "build.gradle.kts").exists())) {
 		include(":${file.name}")