Sprite rotation and center, get by id and copy id to clipboard editor

Author: Kyjor

src/editor/JulGameEditor/Components/ComponentInputs.jl

@@ -86,7 +86,12 @@ The function checks the type of the field value and displays the corresponding i
 """
 function show_component_field_input(component, componentField, newScriptText)
     fieldValue = getfield(component, componentField)
-    if isa(fieldValue, Math._Vector2{Float64}) || isa(fieldValue, Math._Vector2{Int32})
+    if isa(fieldValue, String) && String(componentField) == "id"
+        #display id as text and add a button to copy it to clipboard
+        CImGui.Text("$(componentField): $(fieldValue)")
+        CImGui.SameLine()
+        CImGui.Button("Copy") && SDL2.SDL_SetClipboardText(fieldValue)
+    elseif isa(fieldValue, Math._Vector2{Float64}) || isa(fieldValue, Math._Vector2{Int32})
         isFloat::Bool = isa(fieldValue, Math._Vector2{Float64}) ? true : false
 
         x = isFloat ? Cfloat(fieldValue.x) : Cint(fieldValue.x)
@@ -348,13 +353,29 @@ function show_sprite_fields(sprite, animation_window_dict)
             end
 
             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)
+                crop_x, crop_y, crop_w, crop_h = show_animation_window("Sprite 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)
             window_info[]["points"][][1] = ImVec2(vec4i[1], vec4i[2])
             window_info[]["points"][][2] = ImVec2(round(vec4i[1] + vec4i[3]), round(vec4i[2] + vec4i[4]))
             sprite.crop = JulGame.Math.Vector4(Int32(vec4i[1]), Int32(vec4i[2]), Int32(vec4i[3]), Int32(vec4i[4]))
+        elseif fieldString == "rotation"
+            x = Cfloat(sprite.rotation)
+            @c CImGui.InputFloat("rotation", &x, 1)
+            x = Float64(x)
+            sprite.rotation = x
+        elseif fieldString == "center"
+            #float that is min 0 and max 1
+            x = Cfloat(sprite.center.x)
+            y = Cfloat(sprite.center.y)
+            @c CImGui.InputFloat("center x", &x, 0.01)
+            @c CImGui.InputFloat("center y", &y, 0.01)
+            x = Float64(x)
+            y = Float64(y)
+            c = clamp(x, 0, 1)
+            y = clamp(y, 0, 1)
+            sprite.center = Vector2f(x, y)
         else
             show_component_field_input(sprite, field, "")
         end  

src/editor/JulGameEditor/Components/SpriteViewer.jl

@@ -9,8 +9,8 @@ using CImGui.CSyntax.CStatic
 Demonstrate using the low-level ImDrawList to draw custom shapes.
 """
 function show_animation_window(frame_name, window_info, my_tex_id, my_tex_w, my_tex_h)
-    CImGui.SetNextWindowSize((350, 560), CImGui.ImGuiCond_FirstUseEver)
-    CImGui.Begin("Animation - $(frame_name)") || (CImGui.End(); return)
+    #CImGui.SetNextWindowSize((350, 560), CImGui.ImGuiCond_FirstUseEver)
+    CImGui.Begin("$(frame_name)") || (CImGui.End(); return)
 
     draw_list = CImGui.GetWindowDrawList()
     io = CImGui.GetIO()

src/engine/Component/Sprite.jl

@@ -14,12 +14,12 @@ module SpriteModule
         position::Math.Vector2f
         rotation::Float64
         pixelsPerUnit::Int32
-        center::Math.Vector2
+        center::Math.Vector2f
     end
 
     export InternalSprite
     mutable struct InternalSprite
-        center::Math.Vector2
+        center::Math.Vector2f
         color::Math.Vector3
         crop::Union{Ptr{Nothing}, Math.Vector4}
         isFlipped::Bool
@@ -36,7 +36,7 @@ module SpriteModule
         size::Math.Vector2
         texture::Union{Ptr{Nothing}, Ptr{SDL2.LibSDL2.SDL_Texture}}
 
-        function InternalSprite(parent::Any, imagePath::String, crop::Union{Ptr{Nothing}, Math.Vector4}=C_NULL, isFlipped::Bool=false, color::Math.Vector3 = Math.Vector3(255,255,255), isCreatedInEditor::Bool=false; pixelsPerUnit::Int32=Int32(-1), isWorldEntity::Bool=true, position::Math.Vector2f = Math.Vector2f(0,0), rotation::Float64 = 0.0, layer::Int32 = Int32(0), center::Math.Vector2 = Math.Vector2(0,0))
+        function InternalSprite(parent::Any, imagePath::String, crop::Union{Ptr{Nothing}, Math.Vector4}=C_NULL, isFlipped::Bool=false, color::Math.Vector3 = Math.Vector3(255,255,255), isCreatedInEditor::Bool=false; pixelsPerUnit::Int32=Int32(-1), isWorldEntity::Bool=true, position::Math.Vector2f = Math.Vector2f(0,0), rotation::Float64 = 0.0, layer::Int32 = Int32(0), center::Math.Vector2f = Math.Vector2f(0.5,0.5))
             this = new()
 
             this.offset = Math.Vector2f()
@@ -139,14 +139,15 @@ module SpriteModule
             end
         end
 
-         # Calculate center position on sprite using the center property. 
+         # Calculate center position on sprite using the center property
+         # center should be a point from 0 to 1, where 0.5 is the center of the sprite 
          # The value is a pointer to a point indicating the point around which dstrect will be rotated 
          # (if C_NULL, rotation will be done around dstrect.w / 2, dstrect.h / 2)
          # Todo: don't allocate this every frame
-        calculatedCenter = Math.Vector2f(dstRect[].w/2 + this.center.x, dstRect[].h/2 + this.center.y)
+        calculatedCenter = Math.Vector2(dstRect[].w * (this.center.x%1), dstRect[].h * (this.center.y%1))
         calculatedCenter = !this.isFloatPrecision ? Ref(SDL2.SDL_Point(round(calculatedCenter.x), round(calculatedCenter.y))) : Ref(SDL2.SDL_FPoint(calculatedCenter.x, calculatedCenter.y))   
 
-        if  this.isFloatPrecision && SDL2.SDL_RenderCopyExF(
+        if this.isFloatPrecision && SDL2.SDL_RenderCopyExF(
             JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, 
             this.texture, 
             srcRect, 

src/engine/Entity.jl

@@ -144,7 +144,7 @@ module EntityModule
         return newSoundSource
     end
 
-    function JulGame.add_sprite(this::Entity, isCreatedInEditor::Bool = false, sprite::Sprite = Sprite(Math.Vector3(255, 255, 255), C_NULL, false, "", true, 0, Math.Vector2f(0,0), Math.Vector2f(0,0), 0, -1, Math.Vector2(0,0)))
+    function JulGame.add_sprite(this::Entity, isCreatedInEditor::Bool = false, sprite::Sprite = Sprite(Math.Vector3(255, 255, 255), C_NULL, false, "", true, 0, Math.Vector2f(0,0), Math.Vector2f(0,0), 0, -1, Math.Vector2f(0.5,0.5)))
         if this.sprite != C_NULL
             println("Sprite already exists on entity named ", this.name)
             return

src/engine/Scene.jl

@@ -48,5 +48,16 @@
         end
         return entities
     end
+
+    function get_entity_by_id(this::Scene, id)
+        for entity in this.entities
+            if entity.id == id
+                return entity
+            end
+        end
+
+        @warn "No entity with id $id found"
+        return nothing
+    end
 end
 

src/engine/SceneManagement/SceneBuilder.jl

@@ -326,7 +326,7 @@ const DEFAULT_CONFIG = Dict(
 
 # Function to read and parse the config file
 function parse_config()
-    filename = joinpath(pwd(), "..", "config.julgame")
+    filename = joinpath(JulGame.BasePath, "..", "config.julgame")
     config = copy(DEFAULT_CONFIG)
 
     if isfile(filename)

src/engine/SceneManagement/SceneReader.jl

@@ -167,8 +167,8 @@ module SceneReaderModule
                 position = !haskey(component, "position") ? Vector2f() : Vector2f(component.position.x, component.position.y)
                 rotation = !haskey(component, "rotation") ? 0.0 : convert(Float64, component.rotation)
                 pixelsPerUnit = !haskey(component, "pixelsPerUnit") ? -1 : component.pixelsPerUnit
-                center = !haskey(component, "center") ? Vector2(0,0) : Vector2(component.center.x, component.center.y)
-                newComponent = Sprite(color::Vector3, crop::Union{Ptr{Nothing}, Math.Vector4}, component.isFlipped::Bool, component.imagePath::String, isWorldEntity::Bool, Int32(layer), offset::Vector2f, position::Vector2f, rotation::Float64, Int32(pixelsPerUnit), center::Vector2)
+                center = !haskey(component, "center") ? Vector2f(0.5,0.5) : Vector2f(component.center.x, component.center.y)
+                newComponent = Sprite(color::Vector3, crop::Union{Ptr{Nothing}, Math.Vector4}, component.isFlipped::Bool, component.imagePath::String, isWorldEntity::Bool, Int32(layer), offset::Vector2f, position::Vector2f, rotation::Float64, Int32(pixelsPerUnit), center::Vector2f)
             end
 
             return newComponent