fixed behavior editor for multiple KoolBehaviors on a single entity

kool-engine · Jul 2, 2024 · b8ec0a0 · b8ec0a0
1 parent d04fd10
commit b8ec0a0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 38 deletions.
diff --git a/kool-core/src/commonMain/kotlin/de/fabmax/kool/KoolContext.kt b/kool-core/src/commonMain/kotlin/de/fabmax/kool/KoolContext.kt
@@ -140,6 +140,6 @@ abstract class KoolContext {
 
     companion object {
         // automatically updated by gradle script on build
-        const val KOOL_VERSION = "0.16.0-SNAPSHOT"
+        const val KOOL_VERSION = "0.15.1"
     }
 }
diff --git a/kool-editor-model/build.gradle.kts b/kool-editor-model/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    id("kool.androidlib-conventions")
     id("kool.lib-conventions")
     id("kool.publish-conventions")
 }

diff --git a/kool-editor-model/src/androidMain/kotlin/de/fabmax/kool/editor/api/BehaviorLoader.android.kt b/kool-editor-model/src/androidMain/kotlin/de/fabmax/kool/editor/api/BehaviorLoader.android.kt
diff --git a/kool-editor/src/commonMain/kotlin/de/fabmax/kool/editor/ui/GameEntityEditor.kt b/kool-editor/src/commonMain/kotlin/de/fabmax/kool/editor/ui/GameEntityEditor.kt
@@ -173,13 +173,13 @@ class GameEntityEditor(ui: EditorUi) :
                     is MeshComponent -> componentEditor(objects) { MeshEditor() }
                     is SceneComponent -> componentEditor(objects) { ScenePropertiesEditor() }
                     is SceneBackgroundComponent -> componentEditor(objects) { SceneBackgroundEditor() }
-                    is BehaviorComponent -> componentEditor(objects) { BehaviorEditor() }
                     is ShadowMapComponent -> componentEditor(objects) { ShadowMapEditor() }
                     is SsaoComponent -> componentEditor(objects) { SsaoEditor() }
                     is TransformComponent -> componentEditor(objects) { TransformEditor() }
                     is PhysicsWorldComponent -> componentEditor(objects) { PhysicsWorldEditor() }
                     is RigidActorComponent -> componentEditor(objects) { RigidActorEditor() }
                     is CharacterControllerComponent -> componentEditor(objects) { CharacterControllerEditor() }
+                    is BehaviorComponent -> behaviorComponentEditor(objects, component.data.behaviorClassName)
                 }
             }
     }
@@ -193,6 +193,18 @@ class GameEntityEditor(ui: EditorUi) :
         }
     }
 
+    private fun UiScope.behaviorComponentEditor(gameEntities: List<GameEntity>, behaviorClassName: String) {
+        val components = gameEntities.map {
+            it.getComponents<BehaviorComponent>().first { c -> c.data.behaviorClassName == behaviorClassName }
+        }
+        Box(width = Grow.Std, scopeName = components[0].componentType) {
+            val editor = remember { BehaviorEditor() }
+            editor.components = components
+            editor.entityEditor = this@GameEntityEditor
+            editor()
+        }
+    }
+
     private fun UiScope.addComponentSelector(objects: List<GameEntity>) {
         val popup = remember { ContextPopupMenu<List<GameEntity>>("add-component") }
         var popupPos by remember(Vec2f.ZERO)