fix: "persistentBetweenScenes" added for entity scene reading/writing

Kyjor · Dec 30, 2024 · 2c2b841 · 2c2b841
1 parent 7a7ea55
commit 2c2b841
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/Main.jl b/src/Main.jl
@@ -284,8 +284,8 @@ function initialize_scripts_and_components()
 		end 
 	end
 
-  MAIN.scene.rigidbodies = []
-  MAIN.scene.colliders = []
+	MAIN.scene.rigidbodies = []
+	MAIN.scene.colliders = []
 	for entity in MAIN.scene.entities
 		@debug "adding rigidbodies to global list"
 		if entity.rigidbody != C_NULL

diff --git a/src/engine/SceneManagement/SceneReader.jl b/src/engine/SceneManagement/SceneReader.jl
@@ -52,6 +52,7 @@ module SceneReaderModule
                 newEntity = Entity(get(entity, "name", "New entity"), string(entity.id))
                 newEntity.isActive = get(entity, "isActive", true)
                 newEntity.scripts = get(entity, "scripts", [])
+                newEntity.persistentBetweenScenes = get(entity, "persistentBetweenScenes", false)
 
                 for component in components
                     if typeof(component) == Animator
@@ -126,7 +127,7 @@ module SceneReaderModule
                 else
                     newUIElement = ScreenButton(uiElement.name, uiElement.buttonUpSpritePath, uiElement.buttonDownSpritePath, Vector2(uiElement.size.x, uiElement.size.y), Vector2(uiElement.position.x, uiElement.position.y), uiElement.fontPath, uiElement.text, Vector2(uiElement.textOffset.x, uiElement.textOffset.y))
                 end
-
+                newUIElement.persistentBetweenScenes = get(uiElement, "persistentBetweenScenes", false)
                 push!(res, newUIElement)
             catch e 
                 @error string(e)

diff --git a/src/engine/SceneManagement/SceneWriter.jl b/src/engine/SceneManagement/SceneWriter.jl
@@ -21,7 +21,14 @@ module SceneWriterModule
 
         count = 1
         for entity in entities
-            push!(entitiesDict, Dict("id" => string(entity.id), "parent" =>  entity.parent != C_NULL ? entity.parent.id : C_NULL, "isActive" => entity.isActive, "name" => entity.name, "components" => serialize_entity_components([entity.animator, entity.collider, entity.circleCollider, entity.rigidbody, entity.shape, entity.soundSource, entity.sprite, entity.transform]), "scripts" => serialize_entity_scripts(entity.scripts)))
+            push!(entitiesDict, Dict(
+                "id" => string(entity.id), 
+                "parent" =>  entity.parent != C_NULL ? entity.parent.id : C_NULL, 
+                "isActive" => entity.isActive, 
+                "name" => entity.name, 
+                "persistentBetweenScenes" => entity.persistentBetweenScenes,
+                "components" => serialize_entity_components([entity.animator, entity.collider, entity.circleCollider, entity.rigidbody, entity.shape, entity.soundSource, entity.sprite, entity.transform]), 
+                "scripts" => serialize_entity_scripts(entity.scripts)))
             count += 1
         end