Update bunnymark to new benchmarks

utopia-rise · Oct 14, 2024 · c16626e · c16626e
1 parent 7d19352
commit c16626e
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 61 deletions.
diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1DrawTexture.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1DrawTexture.kt
@@ -4,17 +4,15 @@ import godot.Node2D
 import godot.RandomNumberGenerator
 import godot.ResourceLoader
 import godot.Texture2D
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Vector2
-import godot.signals.signal
+import godot.core.signal1
 
-@RegisterClass("BunnymarkV1DrawTexture")
+@GodotScript("BunnymarkV1DrawTexture")
 class BunnymarkV1DrawTexture : Node2D() {
 
-	@RegisterSignal
-	val benchmarkFinished by signal<Int>("bunnyCount")
+	val benchmarkFinished by signal1<Int>("bunnyCount")
 
 	data class Bunny(var position: Vector2, var speed: Vector2)
 
@@ -25,19 +23,16 @@ class BunnymarkV1DrawTexture : Node2D() {
 
 	private lateinit var screenSize: Vector2
 
-	@RegisterFunction
 	override fun _ready() {
 		randomNumberGenerator.randomize()
 	}
 
-	@RegisterFunction
 	override fun _draw() {
 		for (bunny in bunnies) {
 			drawTexture(bunnyTexture, bunny.position)
 		}
 	}
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 
@@ -80,7 +75,7 @@ class BunnymarkV1DrawTexture : Node2D() {
 		queueRedraw()
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun addBunny() {
 		bunnies.add(
 			Bunny(
@@ -90,13 +85,13 @@ class BunnymarkV1DrawTexture : Node2D() {
 		)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun removeBunny() {
 		if (bunnies.size == 0) return
 		bunnies.removeAt(bunnies.size - 1)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun finish() {
         benchmarkFinished.emit(bunnies.size)
 	}

diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1Sprites.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1Sprites.kt
@@ -1,17 +1,20 @@
 package godot.benchmark.bunnymark
 
-import godot.core.*
-import godot.*
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterSignal
-import godot.signals.signal
-
-@RegisterClass("BunnymarkV1Sprites")
+import godot.Node2D
+import godot.RandomNumberGenerator
+import godot.ResourceLoader
+import godot.Sprite2D
+import godot.Texture2D
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
+import godot.core.Vector2
+import godot.core.signal1
+
+
+@GodotScript("BunnymarkV1Sprites")
 class BunnymarkV1Sprites : Node2D() {
 
-	@RegisterSignal
-	val benchmarkFinished by signal<Int>("bunnyCount")
+	val benchmarkFinished by signal1<Int>("bunnyCount")
 
 	private data class Bunny(var sprite: Sprite2D, var speed: Vector2)
 
@@ -22,12 +25,10 @@ class BunnymarkV1Sprites : Node2D() {
 
 	private lateinit var screenSize: Vector2
 
-	@RegisterFunction
 	override fun _ready() {
 		randomNumberGenerator.randomize()
 	}
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 
@@ -69,7 +70,7 @@ class BunnymarkV1Sprites : Node2D() {
 		}
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun addBunny() {
 		val bunny = Sprite2D()
 		bunny.texture = bunnyTexture
@@ -83,7 +84,7 @@ class BunnymarkV1Sprites : Node2D() {
 		)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun removeBunny() {
 		if (bunnies.size == 0) return
 		val bunny = bunnies[bunnies.size - 1]
@@ -92,7 +93,7 @@ class BunnymarkV1Sprites : Node2D() {
         bunny.sprite.queueFree()
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun finish() {
         benchmarkFinished.emit(bunnies.size)
 	}

diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV2.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV2.kt
@@ -1,17 +1,20 @@
 package godot.benchmark.bunnymark
 
-import godot.core.*
-import godot.*
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterSignal
-import godot.signals.signal
-
-@RegisterClass("BunnymarkV2")
+import godot.Label
+import godot.Node2D
+import godot.RandomNumberGenerator
+import godot.ResourceLoader
+import godot.Sprite2D
+import godot.Texture2D
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
+import godot.core.Vector2
+import godot.core.signal1
+
+@GodotScript("BunnymarkV2")
 class BunnymarkV2 : Node2D() {
 
-	@RegisterSignal
-	val benchmarkFinished by signal<Int>("bunnyCount")
+	val benchmarkFinished by signal1<Int>("bunnyCount")
 
 	private val gravity = 500
 	private val bunnySpeeds = mutableListOf<Vector2>()
@@ -22,15 +25,13 @@ class BunnymarkV2 : Node2D() {
 
 	private lateinit var screenSize: Vector2
 
-	@RegisterFunction
 	override fun _ready() {
 		randomNumberGenerator.randomize()
 		addChild(bunnies)
 		label.setPosition(Vector2(0, 20))
 		addChild(label)
 	}
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 		label.text = "Bunnies: " + bunnies.getChildCount().toString()
@@ -75,7 +76,7 @@ class BunnymarkV2 : Node2D() {
 		}
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun addBunny() {
 		val bunny = Sprite2D()
 		bunny.texture = bunnyTexture
@@ -86,7 +87,7 @@ class BunnymarkV2 : Node2D() {
 		)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun removeBunny() {
 		val childCount = bunnies.getChildCount()
 		if (childCount == 0) return
@@ -99,7 +100,7 @@ class BunnymarkV2 : Node2D() {
 		bunnySpeeds.removeAt(childCount.toInt() - 1)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun finish() {
         benchmarkFinished.emit(bunnySpeeds.size)
 	}

diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV3.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV3.kt
@@ -1,18 +1,20 @@
 package godot.benchmark.bunnymark
 
-import godot.*
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterSignal
+import godot.Label
+import godot.Node2D
+import godot.RandomNumberGenerator
+import godot.ResourceLoader
+import godot.Texture2D
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.benchmark.bunnymark.v3.Bunny
 import godot.core.Vector2
-import godot.signals.signal
+import godot.core.signal1
 
-@RegisterClass("BunnymarkV3")
+@GodotScript("BunnymarkV3")
 class BunnymarkV3 : Node2D() {
 
-	@RegisterSignal
-	val benchmarkFinished by signal<Int>("bunnyCount")
+	val benchmarkFinished by signal1<Int>("bunnyCount")
 
 	private val randomNumberGenerator = RandomNumberGenerator()
 	private val bunnyTexture = ResourceLoader.load("res://images/godot_bunny.png") as Texture2D
@@ -21,7 +23,6 @@ class BunnymarkV3 : Node2D() {
 
 	private lateinit var screenSize: Vector2
 
-	@RegisterFunction
 	override fun _ready() {
         randomNumberGenerator.randomize()
 		addChild(bunnies)
@@ -30,13 +31,12 @@ class BunnymarkV3 : Node2D() {
 		addChild(label)
 	}
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 		label.text = "Bunnies ${bunnies.getChildCount()}"
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun addBunny() {
 		val bunny = Bunny()
 		bunny.texture = bunnyTexture
@@ -45,7 +45,7 @@ class BunnymarkV3 : Node2D() {
 		bunny.speed = Vector2(randomNumberGenerator.randi() % 200 + 50, randomNumberGenerator.randi() % 200 + 50)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun removeBunny() {
 		val childCount = bunnies.getChildCount()
 		if (childCount != 0) {
@@ -55,7 +55,7 @@ class BunnymarkV3 : Node2D() {
 		}
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun finish() {
         benchmarkFinished.emit(bunnies.getChildCount())
 	}

diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/v3/Bunny.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/v3/Bunny.kt
@@ -2,11 +2,10 @@ package godot.benchmark.bunnymark.v3
 
 import godot.RandomNumberGenerator
 import godot.Sprite2D
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotScript
 import godot.core.Vector2
 
-@RegisterClass
+@GodotScript
 class Bunny : Sprite2D() {
 
 	var speed = Vector2()
@@ -15,12 +14,10 @@ class Bunny : Sprite2D() {
 	private lateinit var screenSize: Vector2
 	private val randomNumberGenerator = RandomNumberGenerator()
 
-    @RegisterFunction
     override fun _ready() {
         randomNumberGenerator.randomize()
     }
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 		val pos = position