Scene fixes with ids

Kyjor · Kyjor · commit e866541c345a · 2024-08-18T13:57:02.000-04:00
diff --git a/src/CommonFunctions.jl b/src/CommonFunctions.jl
@@ -20,6 +20,7 @@ function destroy_entity end
 function destroy_ui_element end
 function draw end
 function flip end
+function generate_uuid end
 function get_last_update end
 function get_offset end
 function get_parent end
diff --git a/src/Entity.jl b/src/Entity.jl
@@ -30,7 +30,7 @@ module EntityModule
         sprite::Union{InternalSprite, Ptr{Nothing}}
         transform::Transform
 
-        function Entity(name::String = "New entity", id::String = generate_uuid(), transform::Transform = Transform(), scripts::Vector = [])
+        function Entity(name::String = "New entity", id::String = JulGame.generate_uuid(), transform::Transform = Transform(), scripts::Vector = [])
             this = new()
 
             this.id = id
@@ -169,7 +169,7 @@ module EntityModule
         return this.shape
     end
 
-    function generate_uuid()
+    function JulGame.generate_uuid()
         return string(UUIDs.uuid4())
     end
 end
diff --git a/src/editor/JulGameEditor/Components/ComponentInputs.jl b/src/editor/JulGameEditor/Components/ComponentInputs.jl
@@ -325,10 +325,13 @@ function show_sprite_fields(sprite, animation_window_dict)
                 # animation_window_dict[]["frame $(k)"][]["points"] = points
                 window_info[] = animation_window_dict[][key][]
             else
+                print("Adding crop window info for: $key")
                 animation_window_dict[][key] = window_info
             end
 
-            crop_x, crop_y, crop_w, crop_h = show_animation_window("crop", window_info, sprite.texture, sprite.size.x, sprite.size.y)
+            CImGui.PushID(sprite.parent.id)
+                crop_x, crop_y, crop_w, crop_h = show_animation_window("crop", window_info, sprite.texture, sprite.size.x, sprite.size.y)
+            CImGui.PopID()
             vec4i = Cint[crop_x, crop_y, crop_w, crop_h]
             @c CImGui.InputInt4("crop", vec4i)
             sprite.crop = JulGame.Math.Vector4(Int32(vec4i[1]), Int32(vec4i[2]), Int32(vec4i[3]), Int32(vec4i[4]))
diff --git a/src/editor/JulGameEditor/Components/MainMenuBar.jl b/src/editor/JulGameEditor/Components/MainMenuBar.jl
@@ -9,16 +9,23 @@ Create a fullscreen menu bar and populate it.
 # Arguments
 - `events`: An array of event functions. These are callbacks that are triggered when the user selects a menu item.
 """
-function show_main_menu_bar(events)
+function show_main_menu_bar(events, main)
     if CImGui.BeginMainMenuBar()
         @cstatic buf="File"*"\0"^128 begin
             if CImGui.BeginMenu(buf)
                 ShowMenuFile(events)
                 CImGui.EndMenu()
             end
+        end
+
+        @cstatic buf="Scene"*"\0"^128 begin
+            if main !== nothing && CImGui.BeginMenu(buf)
+                show_scene_menu(events)
+                CImGui.EndMenu()
+            end
 
-            CImGui.EndMainMenuBar()
         end
+        CImGui.EndMainMenuBar()
     end
 end
 
@@ -31,10 +38,23 @@ Show the file menu in the main menu bar.
 - `events`: An array of event functions. These are callbacks that are triggered when the user selects a menu item.
 """
 function ShowMenuFile(events)
-    if CImGui.MenuItem("Open", "Ctrl+O")
-        events[end]()
+    if CImGui.MenuItem("Open Project", "Ctrl+O")
+        events["Select-project"]()
     end
-    if length(events) > 1 && CImGui.MenuItem("Save", "Ctrl+S")
-        events[1]()
+end
+
+function show_scene_menu(events)
+    if CImGui.MenuItem("Save", "Ctrl+S")
+        events["Save"]()
+    end
+    if CImGui.MenuItem("Reset Camera", "Ctrl+R")
+        events["Reset-camera"]()
     end
+
+    if CImGui.BeginMenu("Extras")
+        if CImGui.MenuItem("Regenerate Ids")
+            events["Regenerate-ids"]()
+        end
+        CImGui.EndMenu()
+    end 
 end
diff --git a/src/editor/JulGameEditor/Components/SceneViewer.jl b/src/editor/JulGameEditor/Components/SceneViewer.jl
@@ -134,6 +134,7 @@ function handle_mouse_click_duplication(main)
     end
 
     copy = deepcopy(main.selectedEntity)
+    copy.id = JulGame.generate_uuid()
     push!(main.scene.entities, copy)
     main.selectedEntity = copy
 end
diff --git a/src/editor/JulGameEditor/Components/SpriteViewer.jl b/src/editor/JulGameEditor/Components/SpriteViewer.jl
@@ -18,7 +18,7 @@ function show_animation_window(frame_name, window_info, my_tex_id, my_tex_w, my_
     # UI elements
     # grid step int input as slider with range. Min = 1, Max = 64
     CImGui.SliderInt("Grid step", window_info[]["grid_step"], 1, 64, "%d")
-    CImGui.Text("Mouse Left: drag to add square,\nMouse Right: drag to scroll, click for context menu.\nCTRL+Mouse Wheel: zoom")
+    #CImGui.Text("Mouse Left: drag to add square,\nMouse Right: drag to scroll, click for context menu.\nCTRL+Mouse Wheel: zoom")
     selectedPoint1 = length(window_info[]["points"][]) > 0 ? window_info[]["points"][][end-1] : ImVec2(0,0)
     selectedPoint2 = length(window_info[]["points"][]) > 0 ? window_info[]["points"][][end] : ImVec2(0,0)
     CImGui.Text("Current selection: x:$(selectedPoint1.x),y:$(selectedPoint1.y) w:$(selectedPoint2.x - selectedPoint1.x),h:$(selectedPoint2.y - selectedPoint1.y)")
@@ -47,19 +47,33 @@ function show_animation_window(frame_name, window_info, my_tex_id, my_tex_w, my_
     window_info[]["scrolling"][] = ImVec2(max(window_info[]["scrolling"][].x, -canvas_max.x), max(window_info[]["scrolling"][].y, -canvas_max.y))
     origin = ImVec2(min(0, 0 + window_info[]["scrolling"][].x), min(0, 0 + window_info[]["scrolling"][].y))  # Lock scrolled origin
     mouse_pos_in_canvas = ImVec2(unsafe_load(io.MousePos).x - canvas_p0.x, unsafe_load(io.MousePos).y - canvas_p0.y)
+    mouse_pos_in_canvas_zoom_adjusted = ImVec2(floor(mouse_pos_in_canvas.x / window_info[]["zoom_level"][]), floor(mouse_pos_in_canvas.y / window_info[]["zoom_level"][]))
+    CImGui.Text("Zoom level: $(window_info[]["zoom_level"][])")
+    CImGui.Text("origin: $(origin.x), $(origin.y)")
+    CImGui.Text("Origin divided by zoom: $(origin.x / window_info[]["zoom_level"][]), $(origin.y / window_info[]["zoom_level"][])")
+    CImGui.Text("Origin * zoom: $(origin.x * window_info[]["zoom_level"][]), $(origin.y * window_info[]["zoom_level"][])")
     CImGui.Text("Mouse Position: $(mouse_pos_in_canvas.x), $(mouse_pos_in_canvas.y)")
     CImGui.Text("Mouse Pixel: $(floor(mouse_pos_in_canvas.x / window_info[]["zoom_level"][])), $(floor(mouse_pos_in_canvas.y / window_info[]["zoom_level"][]))")
-
-    mouse_pos_in_canvas_zoom_adjusted = ImVec2(floor(mouse_pos_in_canvas.x / window_info[]["zoom_level"][]), floor(mouse_pos_in_canvas.y / window_info[]["zoom_level"][]))
+    CImGui.Text("Mouse position in canvas adj: $(mouse_pos_in_canvas_zoom_adjusted.x), $(mouse_pos_in_canvas_zoom_adjusted.y)")
+    CImGui.Text("Mouse position in canvas + origin: $(origin.x + mouse_pos_in_canvas_zoom_adjusted.x), $(origin.y + mouse_pos_in_canvas_zoom_adjusted.y)")
     #rounded = ImVec2(round(mouse_pos_in_canvas_zoom_adjusted.x/ window_info[]["zoom_level"][]) * window_info[]["zoom_level"][], round(mouse_pos_in_canvas_zoom_adjusted.y/ window_info[]["zoom_level"][]) * window_info[]["zoom_level"][])
     # Add first and second point
     if is_hovered && !window_info[]["adding_line"][] && CImGui.IsMouseClicked(CImGui.ImGuiMouseButton_Left)
-        push!(window_info[]["points"][], mouse_pos_in_canvas_zoom_adjusted)
-        push!(window_info[]["points"][], mouse_pos_in_canvas_zoom_adjusted)
+        if unsafe_load(io.KeyShift)
+            push!(window_info[]["points"][], ImVec2(mouse_pos_in_canvas_zoom_adjusted.x - round(origin.x* window_info[]["zoom_level"][]), mouse_pos_in_canvas_zoom_adjusted.y - round(origin.y* window_info[]["zoom_level"][])))
+            push!(window_info[]["points"][], ImVec2(mouse_pos_in_canvas_zoom_adjusted.x - round(origin.x* window_info[]["zoom_level"][]), mouse_pos_in_canvas_zoom_adjusted.y - round(origin.y* window_info[]["zoom_level"][])))
+        else
+            push!(window_info[]["points"][], ImVec2(mouse_pos_in_canvas_zoom_adjusted.x, mouse_pos_in_canvas_zoom_adjusted.y))
+            push!(window_info[]["points"][], ImVec2(mouse_pos_in_canvas_zoom_adjusted.x, mouse_pos_in_canvas_zoom_adjusted.y))
+        end
         window_info[]["adding_line"][] = true
     end
     if window_info[]["adding_line"][]
-        window_info[]["points"][][end] = mouse_pos_in_canvas_zoom_adjusted
+        if unsafe_load(io.KeyShift)
+            window_info[]["points"][][end] = ImVec2(mouse_pos_in_canvas_zoom_adjusted.x - round(origin.x* window_info[]["zoom_level"][]), mouse_pos_in_canvas_zoom_adjusted.y - round(origin.y* window_info[]["zoom_level"][]))
+        else
+            window_info[]["points"][][end] = ImVec2(mouse_pos_in_canvas_zoom_adjusted.x, mouse_pos_in_canvas_zoom_adjusted.y)
+        end
         if is_hovered && !CImGui.IsMouseDown(CImGui.ImGuiMouseButton_Left)
             window_info[]["points"][] = [window_info[]["points"][][end-1], window_info[]["points"][][end]] # only keep last two points
             window_info[]["adding_line"][] = false
@@ -74,30 +88,21 @@ function show_animation_window(frame_name, window_info, my_tex_id, my_tex_w, my_
 
     # Zoom
     if is_hovered && unsafe_load(io.KeyCtrl)
-        window_info[]["zoom_level"][] += unsafe_load(io.MouseWheel) * 4.0 # * 0.10
-        window_info[]["zoom_level"][] = clamp(window_info[]["zoom_level"][], 1.0, 50.0)
+        if unsafe_load(io.MouseWheel) == 1.0
+            window_info[]["zoom_level"][] = clamp(window_info[]["zoom_level"][] * 4, 1.0, 50.0)
+        elseif unsafe_load(io.MouseWheel) == -1.0
+            window_info[]["zoom_level"][] = clamp(window_info[]["zoom_level"][] / 4, 1.0, 50.0)
+        end 
     end
 
     # Context menu
     drag_delta = CImGui.GetMouseDragDelta(CImGui.ImGuiMouseButton_Right)
     if is_hovered && CImGui.IsMouseReleased(CImGui.ImGuiMouseButton_Right) && drag_delta.x == 0.0 && drag_delta.y == 0.0
-        CImGui.OpenPopupOnItemClick("context")
-    end
-    if CImGui.BeginPopup("context")
-        if window_info[]["adding_line"][]
-            resize!(window_info[]["points"][], length(window_info[]["points"][]) - 2)
-        end
-        window_info[]["adding_line"][] = false
-        if CImGui.MenuItem("Remove one", "", false, length(window_info[]["points"][]) > 0)
-            resize!(window_info[]["points"][], length(window_info[]["points"][]) - 2)
-        end
-        if CImGui.MenuItem("Remove all", "", false, length(window_info[]["points"][]) > 0)
-            empty!(window_info[]["points"][])
-        end
-        CImGui.EndPopup()
+        #TODO: CImGui.OpenPopupOnItemClick("context-1")
+        empty!(window_info[]["points"][])
     end
 
-    # Draw grid and lines
+    # Draw grid and lines -- Keep all draw calls between PushClipRect and PopClipRect
     CImGui.PushClipRect(draw_list, canvas_p0, canvas_p1, true)
         GRID_STEP = window_info[]["grid_step"][] * window_info[]["zoom_level"][]
 
@@ -107,18 +112,29 @@ function show_animation_window(frame_name, window_info, my_tex_id, my_tex_w, my_
         for y in 0:GRID_STEP:canvas_sz.y*10 # TODO: 10 is arbitrary
             CImGui.AddLine(draw_list, ImVec2(canvas_p0.x, origin.y + canvas_p0.y + y), ImVec2(canvas_p1.x, origin.y + canvas_p0.y + y), IM_COL32(200, 200, 200, 40))
         end
-    CImGui.PopClipRect(draw_list)
-    
-    CImGui.AddImage(draw_list, my_tex_id, ImVec2(origin.x + canvas_p0.x, origin.y + canvas_p0.y), ImVec2(origin.x + (my_tex_w * window_info[]["zoom_level"][]) + canvas_p0.x, origin.y + (my_tex_h * window_info[]["zoom_level"][]) + canvas_p0.y), ImVec2(0,0), ImVec2(1,1), IM_COL32(255,255,255,255))
-
-    # Draw squares with add rect 
-    for n in 1:2:length(window_info[]["points"][])-1
-        p1 = ImVec2(origin.x + canvas_p0.x + (window_info[]["points"][][n].x * window_info[]["zoom_level"][]), origin.y + canvas_p0.y + (window_info[]["points"][][n].y * window_info[]["zoom_level"][]))
-        p2 = ImVec2(origin.x + canvas_p0.x + (window_info[]["points"][][n+1].x * window_info[]["zoom_level"][]), origin.y + canvas_p0.y + (window_info[]["points"][][n+1].y * window_info[]["zoom_level"][]))
-        # scale to zoom level
-        CImGui.AddRect(draw_list, p1, p2, IM_COL32(255, 255, 0, 255))
-    end
 
+        # Draw image that is being inspected
+        CImGui.AddImage(draw_list, my_tex_id, ImVec2(origin.x + canvas_p0.x, origin.y + canvas_p0.y), ImVec2(origin.x + (my_tex_w * window_info[]["zoom_level"][]) + canvas_p0.x, origin.y + (my_tex_h * window_info[]["zoom_level"][]) + canvas_p0.y), ImVec2(0,0), ImVec2(1,1), IM_COL32(255,255,255,255))
+
+        # Draw squares with add rect 
+        for n in 1:2:length(window_info[]["points"][])-1
+            p1 = ImVec2(origin.x + canvas_p0.x + (window_info[]["points"][][n].x * window_info[]["zoom_level"][]), origin.y + canvas_p0.y + (window_info[]["points"][][n].y * window_info[]["zoom_level"][]))
+            p2 = ImVec2(origin.x + canvas_p0.x + (window_info[]["points"][][n+1].x * window_info[]["zoom_level"][]), origin.y + canvas_p0.y + (window_info[]["points"][][n+1].y * window_info[]["zoom_level"][]))
+            # scale to zoom level
+            CImGui.AddRect(draw_list, p1, p2, IM_COL32(255, 255, 0, 255))
+        end
+
+        if CImGui.BeginPopup("context-1")
+            # if window_info[]["adding_line"][]
+            #     resize!(window_info[]["points"][], length(window_info[]["points"][]) - 2)
+            # end
+            # window_info[]["adding_line"][] = false
+            if CImGui.MenuItem("Remove all", "", false, length(window_info[]["points"][]) > 0)
+                empty!(window_info[]["points"][])
+            end
+            CImGui.EndPopup()
+        end
+    CImGui.PopClipRect(draw_list)
 
     CImGui.End()
 
diff --git a/src/editor/JulGameEditor/Editor.jl b/src/editor/JulGameEditor/Editor.jl
@@ -73,12 +73,14 @@ module Editor
                     ################################## RENDER HERE
                     
                     ################################# MAIN MENU BAR
-                    events = []
+                    events = Dict{String, Function}()
                     if currentSceneMain !== nothing
-                        push!(events, save_scene_event(currentSceneMain.scene.entities, currentSceneMain.scene.uiElements, currentSelectedProjectPath, String(currentSceneName)))
+                        events["Save"] = save_scene_event(currentSceneMain.scene.entities, currentSceneMain.scene.uiElements, currentSelectedProjectPath, String(currentSceneName))
                     end
-                    push!(events, select_project_event(currentSceneMain, scenesLoadedFromFolder))
-                    show_main_menu_bar(events)
+                    events["Select-project"] = select_project_event(currentSceneMain, scenesLoadedFromFolder)
+                    events["Reset-camera"] = reset_camera_event(currentSceneMain)
+                    events["Regenerate-ids"] = regenerate_ids_event(currentSceneMain)
+                    show_main_menu_bar(events, currentSceneMain)
                     ################################# END MAIN MENU BAR
 
                     @c CImGui.ShowDemoWindow(Ref{Bool}(showDemoWindow)) # Uncomment this line to show the demo window and see available widgets
@@ -254,6 +256,7 @@ module Editor
                             CImGui.Separator()
                             if CImGui.Button("Duplicate") 
                                 copy = deepcopy(currentSceneMain.selectedEntity)
+                                copy.id = JulGame.generate_uuid()
                                 push!(currentSceneMain.scene.entities, copy)
                                 currentSceneMain.selectedEntity = copy
                             end
@@ -290,6 +293,7 @@ module Editor
                                     # CImGui.Separator()
                                     # if CImGui.Button("Duplicate") 
                                     #     push!(currentSceneMain.scene.uiElements, deepcopy(currentSceneMain.scene.uiElements[uiElementIndex]))
+                                    # copy.id = JulGame.generate_uuid()
                                     #     # TODO: switch to duplicated entity
                                     # end
 
@@ -320,7 +324,7 @@ module Editor
                     if currentSceneMain !== nothing
                         if JulGame.InputModule.get_button_held_down(currentSceneMain.input, "LCTRL") && JulGame.InputModule.get_button_pressed(currentSceneMain.input, "S")
                             @info string("Saving scene")
-                            events[1]()
+                            events["Save"]()
                         end
                         # delete selected entity
                         if JulGame.InputModule.get_button_pressed(currentSceneMain.input, "DELETE")
@@ -331,6 +335,7 @@ module Editor
                         # duplicate selected entity with ctrl+d
                         if JulGame.InputModule.get_button_held_down(currentSceneMain.input, "LCTRL") && JulGame.InputModule.get_button_pressed(currentSceneMain.input, "D") && currentSceneMain.selectedEntity !== nothing
                             copy = deepcopy(currentSceneMain.selectedEntity)
+                            copy.id = JulGame.generate_uuid()
                             push!(currentSceneMain.scene.entities, copy)
                             currentSceneMain.selectedEntity = copy
                         end
@@ -340,6 +345,7 @@ module Editor
                             if duplicationMode
                                 @info "Duplication mode on"
                                 copy = deepcopy(currentSceneMain.selectedEntity)
+                                copy.id = JulGame.generate_uuid()
                                 push!(currentSceneMain.scene.entities, copy)
                                 currentSceneMain.selectedEntity = copy
                             else
diff --git a/src/editor/JulGameEditor/Utils/EditorUtils.jl b/src/editor/JulGameEditor/Utils/EditorUtils.jl
@@ -306,4 +306,22 @@ function select_all_elements_in_between(hierarchyEntitySelections, lastSelectedI
             hierarchyEntitySelections[i] = (hierarchyEntitySelections[i][1], true)
         end
     end
+end
+
+function regenerate_ids_event(main)
+    event = @event begin
+        for index in eachindex(main.scene.entities)
+            main.scene.entities[index].id = JulGame.generate_uuid()
+        end
+    end
+
+    return event
+end
+
+function reset_camera_event(main)
+    event = @event begin
+        main.camera.position = Vec2(0, 0)
+    end
+
+    return event
 end
