cleanup and starting to redo script display and editing

src/Main.jl

@@ -243,7 +243,12 @@ function initialize_scripts_and_components()
 		for script in scripts
 			try
 				# TODO: only call latest if in editor and in game mode
-				Base.invokelatest(JulGame.initialize, script)
+				if JulGame.IS_EDITOR
+					println(typeof(script))
+					Base.invokelatest(JulGame.initialize, script)
+				else
+					JulGame.initialize(script)
+				end
 			catch e
 				#if typeof(e) != ErrorException || !contains(e.msg, "initialize")
 					@error string(e)

src/editor/JulGameEditor/Components/ComponentInputs.jl

@@ -540,45 +540,99 @@ function show_script_editor(entity, newScriptText)
 
         script = display_files(joinpath(JulGame.BasePath, "scripts"), "scripts", "Add Script")
         if script != ""
-            push!(entity.scripts, scriptObj(script, []))
+            #push!(entity.scripts, scriptObj(script, []))
         end
 
         for i = eachindex(entity.scripts)
-            if CImGui.TreeNode("Script $(i)")
+            if CImGui.TreeNode("$(i): $(split("$(typeof(entity.scripts[i]))", ".")[end])")
                 CImGui.Button("Delete $(i)") && (deleteat!(entity.scripts, i); return;)
-                CImGui.Text(entity.scripts[i].name)
-
-                entity.scripts[i] = scriptObj(entity.scripts[i].name, entity.scripts[i].parameters)
-                if CImGui.TreeNode("Script $(i) parameters")
-                    params = entity.scripts[i].parameters
-                    CImGui.Button("Add New Script Parameter") && (push!(params, ""); entity.scripts[i] = scriptObj(entity.scripts[i].name, params); break;)
-
-                    for j = eachindex(entity.scripts[i].parameters)
-                        buf = "$(entity.scripts[i].parameters[j])"*"\0"^(64)
-                        CImGui.Button("Delete $(j)") && (deleteat!(params, j); entity.scripts[i] = scriptObj(currentTextInTextBox, params); break;)
-                        CImGui.InputText("Parameter $(j)", buf, length(buf))
-                        currentTextInTextBox = ""
-                        for characterIndex = eachindex(buf)
-                            if Int32(buf[characterIndex]) == 0 
-                                if characterIndex != 1
-                                    currentTextInTextBox = String(SubString(buf, 1, characterIndex-1))
-                                end
-                                break
-                            end
-                        end
-                        params[j] = currentTextInTextBox
-                        entity.scripts[i] = scriptObj(entity.scripts[i].name, params)
+                for field in fieldnames(typeof(entity.scripts[i]))
+                    if field == :parent 
+                        continue
+                    end
 
+                    if isdefined(entity.scripts[i], Symbol(field)) 
+                        display_script_field_input(entity.scripts[i], field)
+                        CImGui.Text("$(field): $(getfield(entity.scripts[i], field))")
+                    else 
+                        init_undefined_field(entity.scripts[i], field)
                     end
-                    CImGui.TreePop()
                 end
+                # CImGui.Text(entity.scripts[i].name)
+
+                # entity.scripts[i] = scriptObj(entity.scripts[i].name, entity.scripts[i].parameters)
+                # if CImGui.TreeNode("Script $(i) parameters")
+                #     params = entity.scripts[i].parameters
+                #     CImGui.Button("Add New Script Parameter") && (push!(params, ""); entity.scripts[i] = scriptObj(entity.scripts[i].name, params); break;)
+
+                #     for j = eachindex(entity.scripts[i].parameters)
+                #         buf = "$(entity.scripts[i].parameters[j])"*"\0"^(64)
+                #         CImGui.Button("Delete $(j)") && (deleteat!(params, j); entity.scripts[i] = scriptObj(currentTextInTextBox, params); break;)
+                #         CImGui.InputText("Parameter $(j)", buf, length(buf))
+                #         currentTextInTextBox = ""
+                #         for characterIndex = eachindex(buf)
+                #             if Int32(buf[characterIndex]) == 0 
+                #                 if characterIndex != 1
+                #                     currentTextInTextBox = String(SubString(buf, 1, characterIndex-1))
+                #                 end
+                #                 break
+                #             end
+                #         end
+                #         params[j] = currentTextInTextBox
+                #         entity.scripts[i] = scriptObj(entity.scripts[i].name, params)
+
+                #     end
+                #    CImGui.TreePop()
+                # end
                 CImGui.TreePop()
             end
         end
         CImGui.TreePop()
     end
 end
 
+function display_script_field_input(script, field)
+    ftype = fieldtype(typeof(script), field)
+    if ftype == String
+        buf = "$(getfield(script, field))"*"\0"^(64)
+        CImGui.InputText("$(field)", buf, length(buf))
+        currentTextInTextBox = ""
+        for characterIndex = eachindex(buf)
+            if Int32(buf[characterIndex]) == 0 
+                if characterIndex != 1
+                    currentTextInTextBox = String(SubString(buf, 1, characterIndex-1))
+                end
+                break
+            end
+        end
+        setfield!(script, field, currentTextInTextBox)
+    elseif ftype == Float64 || ftype == Float32
+        x = ftype(getfield(script, field))
+        x = Cfloat(x)
+        @c CImGui.InputFloat("$(field)", &x, 1)
+        setfield!(script, field, ftype(x))
+    elseif ftype <: Int
+        x = ftype(getfield(script, field))
+        @c CImGui.InputInt("$(field)", &x, 1)
+        setfield!(script, field, x)
+    elseif ftype == Bool
+        x = getfield(script, field)
+        @c CImGui.Checkbox("$(field)", &x)
+        setfield!(script, field, x)
+    end
+end
+
+function init_undefined_field(script, field)
+    ftype = fieldtype(typeof(script), field)
+    if ftype == String
+        setfield!(script, field, "")
+    elseif ftype <: Number
+        setfield!(script, field, 0)
+    elseif ftype == Bool
+        setfield!(script, field, false)
+    end
+end
+
 function scriptObj(name::String, parameters::Array)
     () -> (name; parameters)
 end

src/editor/JulGameEditor/Utils/EditorUtils.jl

@@ -353,7 +353,7 @@ function log_exceptions(error_type, latest_exceptions, e, top_backtrace, is_test
     Base.show_backtrace(stderr, catch_backtrace())
     push!(latest_exceptions[], [e, String("$(Dates.now())"), top_backtrace])
     if length(latest_exceptions[]) > 10
-        deleteat!(latest_exceptions, 1)
+        deleteat!(latest_exceptions[], 1)
     end
     if is_test_mode
         @warn "Error in renderloop!" exception=e

src/engine/Entity.jl

@@ -72,7 +72,7 @@ module EntityModule
         for script in this.scripts
             try
                 # TODO: only call latest if in editor and in game mode
-                Base.invokelatest(JulGame.update, script, deltaTime)
+                Base.invokelatest(JulGame.update, script, deltaTime) 
             catch e
                 @error string(e)
                 Base.show_backtrace(stdout, catch_backtrace())

src/engine/SceneManagement/SceneBuilder.jl

@@ -169,6 +169,10 @@ module SceneBuilderModule
             end
         end
 
+        if JulGame.IS_EDITOR
+            add_scripts_to_entities(joinpath(BasePath))
+        end
+
         MAIN.assets = joinpath(BasePath, "assets")
         JulGame.MainLoop.prepare_window_scripts_and_start_loop(size, isResizable, autoScaleZoom)
     end
@@ -243,6 +247,10 @@ module SceneBuilderModule
                 end
             end
         end 
+
+        if JulGame.IS_EDITOR
+            add_scripts_to_entities(joinpath(BasePath))
+        end
     end
 
     """
@@ -295,7 +303,7 @@ module SceneBuilderModule
                         end
                         push!(params, param)
                     end
-                newScript = C_NULL
+                newScript = nothing
                 try
                     # TODO: only call latest if in editor and in game mode
                     newScript = Base.invokelatest(eval, Symbol(script.name))
@@ -305,7 +313,7 @@ module SceneBuilderModule
                     Base.show_backtrace(stdout, catch_backtrace())
                     rethrow(e)
                 end
-                if newScript != C_NULL
+                if newScript != C_NULL && newScript !== nothing
                     entity.scripts[scriptCounter] = newScript
                     newScript.parent = entity
                 end
@@ -315,79 +323,63 @@ module SceneBuilderModule
     end
 
     # Define default configuration values
-const DEFAULT_CONFIG = Dict(
-    "WindowName" => "Default Game",
-    "Width" => "800",
-    "Height" => "600",
-    "CameraWidth" => "800",
-    "CameraHeight" => "600",
-    "IsResizable" => "0",
-    "Zoom" => "1.0",
-    "AutoScaleZoom" => "0",
-    "FrameRate" => "30"
-)
-
-# Function to read and parse the config file
-function parse_config()
-    filename = joinpath(JulGame.BasePath, "config.julgame")
-    config = copy(DEFAULT_CONFIG)
-
-    if isfile(filename)
-        # Open the file for reading
-        open(filename, "r") do file
-            for line in eachline(file)
-                # Split the line at the '=' character
-                parts = split(line, "=", limit=2)
-                if length(parts) == 2
-                    key, value = parts[1], parts[2]
-                    # Strip any extra whitespace and add to dictionary
-                    config[strip(key)] = strip(value)
+    const DEFAULT_CONFIG = Dict(
+        "WindowName" => "Default Game",
+        "Width" => "800",
+        "Height" => "600",
+        "CameraWidth" => "800",
+        "CameraHeight" => "600",
+        "IsResizable" => "0",
+        "Zoom" => "1.0",
+        "AutoScaleZoom" => "0",
+        "FrameRate" => "30"
+    )
+
+    # Function to read and parse the config file
+    function parse_config()
+        filename = joinpath(JulGame.BasePath, "config.julgame")
+        config = copy(DEFAULT_CONFIG)
+
+        if isfile(filename)
+            # Open the file for reading
+            open(filename, "r") do file
+                for line in eachline(file)
+                    # Split the line at the '=' character
+                    parts = split(line, "=", limit=2)
+                    if length(parts) == 2
+                        key, value = parts[1], parts[2]
+                        # Strip any extra whitespace and add to dictionary
+                        config[strip(key)] = strip(value)
+                    end
                 end
             end
+        else
+            write_config(filename, config)
         end
-    else
-        write_config(filename, config)
+
+
+        return config
     end
-
-
-    return config
-end
 
-function fill_in_config(config)
-    for (key, value) in DEFAULT_CONFIG
-        if !haskey(config, key)
-            config[key] = value
+    function fill_in_config(config)
+        for (key, value) in DEFAULT_CONFIG
+            if !haskey(config, key)
+                config[key] = value
+            end
         end
-    end
 
-    return config
-end
+        return config
+    end
 
-# Function to write values to the config file
-function write_config(filename::String, config::Dict{String, String})
-    # Open the file for writing
-    open(filename, "w") do file
-        for (key, value) in config
-            # Write each key-value pair to the file
-            println(file, "$key=$value")
+    # Function to write values to the config file
+    function write_config(filename::String, config::Dict{String, String})
+        # Open the file for writing
+        open(filename, "w") do file
+            for (key, value) in config
+                # Write each key-value pair to the file
+                println(file, "$key=$value")
+            end
         end
     end
-end
-
-# # Example usage
-# config_file = "config.txt"
-
-# # Read the configuration
-# config = parse_config(config_file)
-# println("Parsed Configuration:")
-# println(config)
-
-# # Modify some values (example)
-# config["Width"] = "800"
-# config["Height"] = "600"
-
-# # Write the updated configuration back to the file
-# write_config(config_file, config)
-# println("Updated Configuration Written to File.")
+end # module
 
-end