Feature/sdl editor

src/Component/CircleCollider.jl

@@ -70,7 +70,7 @@
         this.isGrounded = this.parent.rigidbody.grounded
 
 
-        for i in 1:length(colliders)
+        for i in eachindex(colliders)
             #TODO: Skip any out of a certain range of this. This will prevent a bunch of unnecessary collision checks
             if !colliders[i].getParent().isActive || !colliders[i].enabled
                 if this.parent.rigidbody.grounded && i == length(colliders)
@@ -82,7 +82,7 @@
                 collision = CheckCollision(this, colliders[i])
                 if CheckIfResting(this, colliders[i])[1] == true && length(this.currentRests) > 0 && !(colliders[i] in this.currentRests)
                     # if this collider isn't already in the list of current rests, check if it is on the same Y level and the same size as any of the current rests, if it is, then add it to current rests
-                    for j in 1:length(this.currentRests)
+                    for j in eachindex(this.currentRests)
                         if this.currentRests[j].getParent().transform.getPosition().y == colliders[i].getParent().transform.getPosition().y && this.currentRests[j].getSize().y == colliders[i].getSize().y
                             push!(this.currentRests, colliders[i])
                             break
@@ -135,7 +135,7 @@
                 # end
             end
         end
-        for i in 1:length(this.currentRests)
+        for i in eachindex(this.currentRests)
             if CheckIfResting(this, this.currentRests[i])[1] == false
                 deleteat!(this.currentRests, i)
                 break

src/Component/Collider.jl

@@ -130,7 +130,7 @@
                 collision = CheckCollision(this, collider)
                 if CheckIfResting(this, collider)[1] == true && length(this.currentRests) > 0 && !(collider in this.currentRests)
                     # if this collider isn't already in the list of current rests, check if it is on the same Y level and the same size as any of the current rests, if it is, then add it to current rests
-                    for j in 1:length(this.currentRests)
+                    for j in eachindex(this.currentRests)
                         if this.currentRests[j].getParent().transform.getPosition().y == collider.getParent().transform.getPosition().y && this.currentRests[j].getSize().y == collider.getSize().y
                             push!(this.currentRests, collider)
                             break
@@ -173,7 +173,8 @@
                             eventToCall(collider)
                         catch e
                             println(e)
-                            Base.show_backtrace(stdout, catch_backtrace())
+						    Base.show_backtrace(stdout, catch_backtrace())
+						    rethrow(e)
                         end
                     end
                     #Begin to overlap, correct position
@@ -193,7 +194,7 @@
 
         #println("Skipped $colliderSkipCount colliders, checked $colliderCheckedCount")
 
-        for i in 1:length(this.currentRests)
+        for i in eachindex(this.currentRests)
             if CheckIfResting(this, this.currentRests[i])[1] == false
                 deleteat!(this.currentRests, i)
                 break

src/Component/Sprite.jl

@@ -15,10 +15,12 @@ module SpriteModule
         position::Math.Vector2f
         rotation::Float64
         pixelsPerUnit::Int32
+        center::Math.Vector2
     end
 
     export InternalSprite
     mutable struct InternalSprite
+        center::Math.Vector2
         color::Math.Vector3
         crop::Union{Ptr{Nothing}, Math.Vector4}
         isFlipped::Bool
@@ -35,12 +37,13 @@ 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(), rotation::Float64 = 0.0, layer::Int32 = Int32(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(), rotation::Float64 = 0.0, layer::Int32 = Int32(0), center::Math.Vector2 = Math.Vector2(0,0))
             this = new()
 
             this.offset = Math.Vector2f()
             this.isFlipped = isFlipped
             this.imagePath = imagePath
+            this.center = center
             this.color = color
             this.crop = crop
             this.image = C_NULL
@@ -77,21 +80,19 @@ module SpriteModule
 
     function Base.getproperty(this::InternalSprite, s::Symbol)
         method_props = (
-            draw = Component.draw,
             initialize = Component.initialize,
             flip = Component.flip,
-            setParent = Component.set_parent,
             loadImage = Component.load_image,
             destroy = Component.destroy,
             setColor = Component.set_color
         )
         deprecated_get_property(method_props, this, s)
     end
-    function Component.draw(this::InternalSprite, zoom::Float64 = 1.0)
+
+    function Component.draw(this::InternalSprite)
         if this.image == C_NULL || JulGame.Renderer == C_NULL
             return
         end
-
         if this.texture == C_NULL
             this.texture = SDL2.SDL_CreateTextureFromSurface(JulGame.Renderer, this.image)
             this.setColor()
@@ -100,43 +101,43 @@ module SpriteModule
         parentTransform = this.parent.transform
 
         cameraDiff = this.isWorldEntity ? 
-        Math.Vector2(MAIN.scene.camera.position.x * SCALE_UNITS - MAIN.scene.camera.windowPos.x, MAIN.scene.camera.position.y * SCALE_UNITS - MAIN.scene.camera.windowPos.y) : 
+        Math.Vector2(MAIN.scene.camera.position.x * SCALE_UNITS, MAIN.scene.camera.position.y * SCALE_UNITS) : 
         Math.Vector2(0,0)
         position = this.isWorldEntity ?
         parentTransform.getPosition() :
         this.position
 
         srcRect = (this.crop == Math.Vector4(0,0,0,0) || this.crop == C_NULL) ? C_NULL : Ref(SDL2.SDL_Rect(this.crop.x, this.crop.y, this.crop.z, this.crop.t))
         dstRect = Ref(SDL2.SDL_FRect(
-            (position.x + this.offset.x) * SCALE_UNITS * zoom - cameraDiff.x - (parentTransform.getScale().x * SCALE_UNITS - SCALE_UNITS) / 2, # TODO: Center the sprite within the entity
-            (position.y + this.offset.y) * SCALE_UNITS * zoom - cameraDiff.y - (parentTransform.getScale().y * SCALE_UNITS - SCALE_UNITS) / 2,
-            (this.crop == C_NULL ? this.size.x : this.crop.z) * zoom * SCALE_UNITS,
-            (this.crop == C_NULL ? this.size.y : this.crop.t) * zoom * SCALE_UNITS
+            (position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - (parentTransform.getScale().x * SCALE_UNITS - SCALE_UNITS) / 2, # TODO: Center the sprite within the entity
+            (position.y + this.offset.y) * SCALE_UNITS - cameraDiff.y - (parentTransform.getScale().y * SCALE_UNITS - SCALE_UNITS) / 2,
+            (this.crop == C_NULL ? this.size.x : this.crop.z) * SCALE_UNITS,
+            (this.crop == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS
         ))
 
         if this.pixelsPerUnit > 0 || JulGame.PIXELS_PER_UNIT > 0
             ppu = this.pixelsPerUnit > 0 ? this.pixelsPerUnit : JulGame.PIXELS_PER_UNIT
             dstRect = Ref(SDL2.SDL_FRect(
-                (position.x + this.offset.x) * SCALE_UNITS * zoom - cameraDiff.x - ((srcRect == C_NULL ? this.size.x : this.crop.z) * SCALE_UNITS / ppu - SCALE_UNITS) / 2,
-                (position.y + this.offset.y) * SCALE_UNITS * zoom - cameraDiff.y - ((srcRect == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS / ppu - SCALE_UNITS) / 2,
-                (srcRect == C_NULL ? this.size.x : this.crop.z) * SCALE_UNITS/ppu * zoom,
-                (srcRect == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS/ppu * zoom
+                (position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - ((srcRect == C_NULL ? this.size.x : this.crop.z) * SCALE_UNITS / ppu - SCALE_UNITS) / 2,
+                (position.y + this.offset.y) * SCALE_UNITS - cameraDiff.y - ((srcRect == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS / ppu - SCALE_UNITS) / 2,
+                (srcRect == C_NULL ? this.size.x : this.crop.z) * SCALE_UNITS/ppu,
+                (srcRect == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS/ppu
             ))     
         end
 
         srcRect = !this.isFloatPrecision ? (this.crop == Math.Vector4(0,0,0,0) || this.crop == C_NULL) ? C_NULL : Ref(SDL2.SDL_Rect(this.crop.x,this.crop.y,this.crop.z,this.crop.t)) : srcRect
         dstRect = !this.isFloatPrecision ? Ref(SDL2.SDL_Rect(
-            convert(Int32, round((position.x + this.offset.x) * SCALE_UNITS * zoom - cameraDiff.x - (parentTransform.getScale().x * SCALE_UNITS - SCALE_UNITS) / 2)), # TODO: Center the sprite within the entity
-            convert(Int32, round((position.y + this.offset.y) * SCALE_UNITS * zoom - cameraDiff.y - (parentTransform.getScale().y * SCALE_UNITS - SCALE_UNITS) / 2)),
+            convert(Int32, round((position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - (parentTransform.getScale().x * SCALE_UNITS - SCALE_UNITS) / 2)), # TODO: Center the sprite within the entity
+            convert(Int32, round((position.y + this.offset.y) * SCALE_UNITS - cameraDiff.y - (parentTransform.getScale().y * SCALE_UNITS - SCALE_UNITS) / 2)),
             convert(Int32, round(this.crop == C_NULL ? this.size.x : this.crop.z)),
             convert(Int32, round(this.crop == C_NULL ? this.size.y : this.crop.t))
         )) : dstRect
 
         if this.pixelsPerUnit > 0 || JulGame.PIXELS_PER_UNIT > 0 && !this.isFloatPrecision
             ppu = this.pixelsPerUnit > 0 ? this.pixelsPerUnit : JulGame.PIXELS_PER_UNIT
             dstRect = Ref(SDL2.SDL_Rect(
-                convert(Int32, round((position.x + this.offset.x) * SCALE_UNITS * zoom - cameraDiff.x - ((srcRect == C_NULL ? this.size.x : this.crop.z) * SCALE_UNITS / ppu - SCALE_UNITS) / 2)),
-                convert(Int32, round((position.y + this.offset.y) * SCALE_UNITS * zoom - cameraDiff.y - ((srcRect == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS / ppu - SCALE_UNITS) / 2)),
+                convert(Int32, round((position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - ((srcRect == C_NULL ? this.size.x : this.crop.z) * SCALE_UNITS / ppu - SCALE_UNITS) / 2)),
+                convert(Int32, round((position.y + this.offset.y) * SCALE_UNITS - cameraDiff.y - ((srcRect == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS / ppu - SCALE_UNITS) / 2)),
                 convert(Int32, round((srcRect == C_NULL ? this.size.x : this.crop.z) * SCALE_UNITS/ppu)),
                 convert(Int32, round((srcRect == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS/ppu))
             ))     
@@ -147,7 +148,7 @@ module SpriteModule
             this.texture, 
             srcRect, 
             dstRect,
-            this.rotation, # ROTATION
+            this.rotation,
             C_NULL, # Ref(SDL2.SDL_Point(0,0)) CENTER
             this.isFlipped ? SDL2.SDL_FLIP_HORIZONTAL : SDL2.SDL_FLIP_NONE) != 0
 

src/Entity.jl

@@ -19,15 +19,15 @@
         animator::Union{InternalAnimator, Ptr{Nothing}}
         collider::Union{InternalCollider, Ptr{Nothing}}
         circleCollider::Union{InternalCircleCollider, Ptr{Nothing}}
+        isActive::Bool
+        name::String
+        persistentBetweenScenes::Bool
         rigidbody::Union{InternalRigidbody, Ptr{Nothing}}
+        scripts::Vector{Any}
         shape::Union{InternalShape, Ptr{Nothing}}
         soundSource::Union{InternalSoundSource, Ptr{Nothing}}
         sprite::Union{InternalSprite, Ptr{Nothing}}
         transform::Transform
-        isActive::Bool
-        name::String
-        persistentBetweenScenes::Bool
-        scripts::Vector{Any}
 
         function Entity(name::String = "New entity", transform::Transform = Transform(), scripts::Vector = [])
             this = new()
@@ -79,6 +79,7 @@
         catch e
             println(e)
             Base.show_backtrace(stdout, catch_backtrace())
+            rethrow(e)
         end
     end
 
@@ -89,6 +90,7 @@
             catch e
                 println(e)
                 Base.show_backtrace(stdout, catch_backtrace())
+                rethrow(e)
             end
         end
     end
@@ -156,13 +158,13 @@
         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))
+    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)))
         if this.sprite != C_NULL
             println("Sprite already exists on entity named ", this.name)
             return
         end
 
-        this.sprite = InternalSprite(this::Entity, sprite.imagePath, sprite.crop, sprite.isFlipped, sprite.color, isCreatedInEditor; pixelsPerUnit=sprite.pixelsPerUnit, isWorldEntity=sprite.isWorldEntity, position=sprite.position, rotation=sprite.rotation, layer=sprite.layer)
+        this.sprite = InternalSprite(this::Entity, sprite.imagePath, sprite.crop, sprite.isFlipped, sprite.color, isCreatedInEditor; pixelsPerUnit=sprite.pixelsPerUnit, isWorldEntity=sprite.isWorldEntity, position=sprite.position, rotation=sprite.rotation, layer=sprite.layer, center=sprite.center)
         if this.animator != C_NULL
             Component.set_sprite(this.animator, this.sprite)
         end