Camera config loading

Author: Kyjor

src/editor/JulGameEditor/Components/CameraWindow.jl

@@ -98,19 +98,20 @@ function show_camera_window(this::CameraWindow)
             # CImGui.ColorEdit4("Background Color", Ref(color_r), Ref(color_g), Ref(color_b), Ref(color_a))
             # this.camera.backgroundColor = (color_r, color_g, color_b, color_a)
             CImGui.PopItemWidth()
-
-            @cstatic color=Cfloat[114/255, 144/255, 154/255, 200/255] backup_color=Cfloat[0,0,0,0] saved_palette_init=true saved_palette=fill(ImVec4(0,0,0,0), 32) alpha_preview=true alpha_half_preview=true drag_and_drop=true options_menu=true hdr=false begin
+            color = (Cfloat(this.camera.backgroundColor[1]/255), Cfloat(this.camera.backgroundColor[2]/255), Cfloat(this.camera.backgroundColor[3]/255), Cfloat(this.camera.backgroundColor[4]/255))
+            colorCfloat = Cfloat[color[1], color[2], color[3], color[4]]
+            @cstatic alpha_preview=true alpha_half_preview=true drag_and_drop=true options_menu=true hdr=false begin
                 show_help_marker("Right-click on the individual color widget to show options.")
                 CImGui.SameLine()
                 misc_flags = (hdr ? CImGui.ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : CImGui.ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? CImGui.ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_preview ? CImGui.ImGuiColorEditFlags_AlphaPreview : 0)) | (options_menu ? 0 : CImGui.ImGuiColorEditFlags_NoOptions)
                 misc_flags |= CImGui.ImGuiColorEditFlags_AlphaBar
 
                 CImGui.Text("Color widget RGBA:")
-                CImGui.ColorEdit4("Background##2", color, CImGui.ImGuiColorEditFlags_DisplayRGB | misc_flags)
+                CImGui.ColorEdit4("Background##2", colorCfloat, CImGui.ImGuiColorEditFlags_DisplayRGB | misc_flags)
                 if CImGui.IsItemEdited()
                     println("Color changed to: ", color)
                     # update the camera background color rgba
-                    this.camera.backgroundColor = (UInt8(round(color[1]*255)), UInt8(round(color[2]*255)), UInt8(round(color[3]*255)), UInt8(round(color[4]*255)))
+                    this.camera.backgroundColor = (UInt8(round(colorCfloat[1]*255)), UInt8(round(colorCfloat[2]*255)), UInt8(round(colorCfloat[3]*255)), UInt8(round(colorCfloat[4]*255)))
                 end
                 CImGui.SetColorEditOptions(CImGui.ImGuiColorEditFlags_Float | CImGui.ImGuiColorEditFlags_HDR | CImGui.ImGuiColorEditFlags_PickerHueWheel)
             end # @cstatic

src/editor/JulGameEditor/Editor.jl

@@ -166,10 +166,12 @@ module Editor
                         if confirmation_dialog(currentDialog) == "ok" && currentSceneName != ""
                             if currentSceneMain === nothing
                                 currentSceneMain = load_scene(currentScenePath, renderer)
-                                currentSceneMain.scene.camera = gameCamera
-                                #TODO: currentSceneMain.cameraBackgroundColor = (50, 50, 50)
+                                gameCamera = currentSceneMain.scene.camera
+                                cameraWindow.camera = gameCamera
                             else
                                 JulGame.change_scene(String(currentSceneName))
+                                gameCamera = currentSceneMain.scene.camera
+                                cameraWindow.camera = gameCamera
                             end
                         end
                     elseif currentDialog[] == "New Scene"

src/engine/SceneManagement/SceneBuilder.jl

@@ -114,6 +114,7 @@ module SceneBuilderModule
         scene = deserialize_scene(joinpath(BasePath, "scenes", this.scene))
         MAIN.scene.entities = scene[1]
         MAIN.scene.uiElements = scene[2]
+        MAIN.scene.camera = scene[3]
 
         for uiElement in MAIN.scene.uiElements
             if "$(typeof(uiElement))" == "JulGame.UI.TextBoxModule.Textbox" && !uiElement.isWorldEntity
@@ -190,6 +191,8 @@ module SceneBuilderModule
             end
         end
 
+        MAIN.scene.camera = scene[3]
+
         for entity in MAIN.scene.entities
             if entity.persistentBetweenScenes #TODO: Verify if the entity is in it's first scene. If it is, don't skip the scripts.
                 continue

src/engine/SceneManagement/SceneLoader.jl

@@ -49,7 +49,7 @@ module SceneLoaderModule
         JulGame.MAIN = JulGame.Main(Float64(1.0))
         #println("Loading scene $sceneFileName from $projectPath")
         scene = Scene("$sceneFileName", "$projectPath")
-
+        
         SceneBuilderModule.load_and_prepare_scene(;this=scene)
 
         return MAIN
@@ -69,25 +69,7 @@ module SceneLoaderModule
 
     """
     function get_project_path_from_full_scene_path(scenePath::String)
-        projectPath = ""
-        dirArray = length(split(scenePath, "/")) > 1 ? split(scenePath, "/") : split(scenePath, "\\")
-        counter = 1
-        for dir in dirArray
-            if counter >= length(dirArray)-1
-                continue
-            elseif counter == 1
-                projectPath = "$dir\\"
-            else
-                projectPath = joinpath(projectPath, dir)
-            end
-            counter += 1
-        end
-
-        if startswith(projectPath, "\\/")
-            projectPath = projectPath[2:end]
-        end
-
-        return projectPath
+        return dirname(dirname(scenePath))
     end
 
     export get_scene_file_name_from_full_scene_path

src/engine/SceneManagement/SceneReader.jl

@@ -2,6 +2,7 @@ module SceneReaderModule
     using JSON3
     using ...AnimatorModule
     using ...AnimationModule
+    using ...CameraModule
     using ...ColliderModule
     using ...CircleColliderModule
     using ...EntityModule
@@ -87,20 +88,25 @@ module SceneReaderModule
             end
 
             for entity in entities
-                    if haskey(childParentDict, string(entity.id))
-                        parentId = childParentDict[string(entity.id)]
-                        for e in entities
-                            if string(e.id) == string(parentId)
-                                entity.parent = e
-                            end
+                if haskey(childParentDict, string(entity.id))
+                    parentId = childParentDict[string(entity.id)]
+                    for e in entities
+                        if string(e.id) == string(parentId)
+                            entity.parent = e
                         end
                     end
+                end
             end
-
             uiElements = deserialize_ui_elements(json.UIElements)
-    
+            camera = Camera(Vector2(500,500), Vector2f(),Vector2f(), C_NULL)
+            if haskey(json, "Camera")
+                camera = Camera(Vector2(json.Camera.size.x, json.Camera.size.y), Vector2f(json.Camera.position.x, json.Camera.position.y), Vector2f(json.Camera.offset.x, json.Camera.offset.y), C_NULL)
+                camera.backgroundColor = (json.Camera.backgroundColor.r, json.Camera.backgroundColor.g, json.Camera.backgroundColor.b, json.Camera.backgroundColor.a)
+            end
+             
             push!(res, entities)
             push!(res, uiElements)
+            push!(res, camera)
             return res
         catch e 
             @error string(e)