Merge branch 'main' into feature/particle-fx

Author: Kyjor

src/Camera.jl

@@ -1,7 +1,7 @@
 using JulGame
 using .Math
 import JulGame: deprecated_get_property
-import JulGame.Component: get_position, get_scale
+import JulGame.Component
 
 mutable struct Camera
     dimensions::Vector2
@@ -48,9 +48,9 @@ function update(this::Camera, newPosition = C_NULL)
     SDL2.SDL_RenderFillRectF(Renderer, Ref(SDL2.SDL_FRect(this.windowPos.x, this.windowPos.y, this.dimensions.x, this.dimensions.y)))
 
     if this.target != C_NULL && newPosition == C_NULL
-        targetPos = get_position(this.target)
+        targetPos = this.target.position
         center =  Vector2f(this.dimensions.x/SCALE_UNITS/2, this.dimensions.y/SCALE_UNITS/2)
-        targetScale = get_scale(this.target)
+        targetScale = this.target.scale
         this.position = targetPos - center + 0.5 * targetScale + this.offset
         return
     end

src/Component/CircleCollider.jl

@@ -83,7 +83,7 @@ module CircleColliderModule
                 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 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
+                        if this.currentRests[j].getParent().transform.position.y == colliders[i].getParent().transform.position.y && this.currentRests[j].getSize().y == colliders[i].getSize().y
                             push!(this.currentRests, colliders[i])
                             break
                         end
@@ -96,34 +96,34 @@ module CircleColliderModule
                 #         eventToCall()
                 #     end
                 #     #Begin to overlap, correct position
-                #     transform.setPosition(Math.Vector2f(transform.getPosition().x, transform.getPosition().y + collision[2]))
+                #     transform.setPosition(Math.Vector2f(transform.position.x, transform.position.y + collision[2]))
                 # end
                 # if collision[1] == Left::CollisionDirection
                 #     push!(this.currentCollisions, colliders[i])
                 #     for eventToCall in this.collisionEvents
                 #         eventToCall()
                 #     end
                 #     #Begin to overlap, correct position
-                #     transform.setPosition(Math.Vector2f(transform.getPosition().x + collision[2], transform.getPosition().y))
+                #     transform.setPosition(Math.Vector2f(transform.position.x + collision[2], transform.position.y))
                 # end
                 # if collision[1] == Right::CollisionDirection
                 #     push!(this.currentCollisions, colliders[i])
                 #     for eventToCall in this.collisionEvents
                 #         eventToCall()
                 #     end
                 #     #Begin to overlap, correct position
-                #     transform.setPosition(Math.Vector2f(transform.getPosition().x - collision[2], transform.getPosition().y))
+                #     transform.setPosition(Math.Vector2f(transform.position.x - collision[2], transform.position.y))
                 # end
                 # if collision[1] == Bottom::CollisionDirection
                 #this.isGrounded = collision[1]
                 if collision[1] == true
-                    println("Collided with: ", colliders[i].getParent().name, " at ", colliders[i].getParent().transform.getPosition())
+                    println("Collided with: ", colliders[i].getParent().name, " at ", colliders[i].getParent().transform.position)
                     push!(this.currentRests, colliders[i])
                     for eventToCall in this.collisionEvents
                         eventToCall()
                     end
                     #Begin to overlap, correct position
-                    transform.setPosition(Math.Vector2f(transform.getPosition().x, transform.getPosition().y - collision[2]))
+                    transform.setPosition(Math.Vector2f(transform.position.x, transform.position.y - collision[2]))
                     this.isGrounded = true
                 end
                 # end
@@ -178,8 +178,8 @@ module CircleColliderModule
         # Closest point on collision box
         cX, cY = 0, 0
 
-        posA = a.getParent().transform.getPosition() + a.offset
-        posB = b.getParent().transform.getPosition() + b.offset
+        posA = a.getParent().transform.position + a.offset
+        posB = b.getParent().transform.position + b.offset
 
         # Find closest x offset
         if posA.x < posB.x
@@ -214,8 +214,8 @@ module CircleColliderModule
         # Closest point on collision box
         cX = 0
 
-        posA = a.getParent().transform.getPosition() + a.offset
-        posB = b.getParent().transform.getPosition() + b.offset
+        posA = a.getParent().transform.position + a.offset
+        posB = b.getParent().transform.position + b.offset
         radius = a.diameter / 2
 
         # Find closest x offset

src/Component/Collider.jl

@@ -109,8 +109,9 @@ module ColliderModule
         onGround = this.parent.rigidbody.grounded 
         colliderSkipCount = 0
         colliderCheckedCount = 0
-        
+        i = 0
         for collider in colliders
+            i += 1
             #TODO: Skip any out of a certain range of this. This will prevent a bunch of unnecessary collision checks
             if !collider.getParent().isActive || !collider.enabled
                 if this.parent.rigidbody.grounded && i == length(colliders)
@@ -121,7 +122,7 @@ module ColliderModule
 
             if this != collider
                 # check if other collider is within range of this collider, if it isn't then skip it
-                if collider.getParent().transform.getPosition().x > this.getParent().transform.getPosition().x + this.getSize().x || collider.getParent().transform.getPosition().x + collider.getSize().x < this.getParent().transform.getPosition().x && MAIN.optimizeSpriteRendering
+                if collider.getParent().transform.position.x > this.getParent().transform.position.x + this.getSize().x || collider.getParent().transform.position.x + collider.getSize().x < this.getParent().transform.position.x && MAIN.optimizeSpriteRendering
                     colliderSkipCount += 1
                     continue
                 end
@@ -131,7 +132,7 @@ module ColliderModule
                 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 eachindex(this.currentRests)
-                        if this.currentRests[j].getParent().transform.getPosition().y == collider.getParent().transform.getPosition().y && this.currentRests[j].getSize().y == collider.getSize().y
+                        if this.currentRests[j].getParent().transform.position.y == collider.getParent().transform.position.y && this.currentRests[j].getSize().y == collider.getSize().y
                             push!(this.currentRests, collider)
                             break
                         end
@@ -145,23 +146,23 @@ module ColliderModule
                         eventToCall(collider)
                     end
                     #Begin to overlap, correct position
-                    transform.setPosition(Math.Vector2f(transform.getPosition().x, transform.getPosition().y + collision[2]))
+                    transform.setPosition(Math.Vector2f(transform.position.x, transform.position.y + collision[2]))
                 end
                 if collision[1] == Left::CollisionDirection
                     push!(this.currentCollisions, collider)
                     for eventToCall in this.collisionEvents
                         eventToCall(collider)
                     end
                     #Begin to overlap, correct position
-                    transform.setPosition(Math.Vector2f(transform.getPosition().x + collision[2], transform.getPosition().y))
+                    transform.setPosition(Math.Vector2f(transform.position.x + collision[2], transform.position.y))
                 end
                 if collision[1] == Right::CollisionDirection
                     push!(this.currentCollisions, collider)
                     for eventToCall in this.collisionEvents
                         eventToCall(collider)
                     end
                     #Begin to overlap, correct position
-                    transform.setPosition(Math.Vector2f(transform.getPosition().x - collision[2], transform.getPosition().y))
+                    transform.setPosition(Math.Vector2f(transform.position.x - collision[2], transform.position.y))
                 end
                 if collision[1] == Bottom::CollisionDirection && this.parent.rigidbody.getVelocity().y >= 0
                     push!(this.currentCollisions, collider)
@@ -178,7 +179,7 @@ module ColliderModule
                         end
                     end
                     #Begin to overlap, correct position
-                    transform.setPosition(Math.Vector2f(transform.getPosition().x, transform.getPosition().y - collision[2]))
+                    transform.setPosition(Math.Vector2f(transform.position.x, transform.position.y - collision[2]))
                     if !collider.isTrigger
                         onGround = true
                     end
@@ -224,8 +225,8 @@ module ColliderModule
     function CheckCollision(colliderA::InternalCollider, colliderB::InternalCollider)
         # nameA = colliderA.getParent().name
         # nameB = colliderB.getParent().name
-        posA = colliderA.getParent().transform.getPosition() * SCALE_UNITS - ((colliderA.getParent().transform.getScale() * SCALE_UNITS - SCALE_UNITS) / 2) - ((colliderA.getSize() * SCALE_UNITS - SCALE_UNITS) / 2)
-        posB = colliderB.getParent().transform.getPosition() * SCALE_UNITS - ((colliderB.getParent().transform.getScale() * SCALE_UNITS - SCALE_UNITS) / 2) - ((colliderB.getSize() * SCALE_UNITS - SCALE_UNITS) / 2)
+        posA = colliderA.getParent().transform.position * SCALE_UNITS - ((colliderA.getParent().transform.scale * SCALE_UNITS - SCALE_UNITS) / 2) - ((colliderA.getSize() * SCALE_UNITS - SCALE_UNITS) / 2)
+        posB = colliderB.getParent().transform.position * SCALE_UNITS - ((colliderB.getParent().transform.scale * SCALE_UNITS - SCALE_UNITS) / 2) - ((colliderB.getSize() * SCALE_UNITS - SCALE_UNITS) / 2)
         offsetAX = colliderA.offset.x * SCALE_UNITS
         offsetAY = colliderA.offset.y * SCALE_UNITS
         offsetBX = colliderB.offset.x * SCALE_UNITS
@@ -311,8 +312,8 @@ module ColliderModule
             return (false, 0.0)
         end
 
-        posA = colliderA.getParent().transform.getPosition() * SCALE_UNITS - ((colliderA.getParent().transform.getScale() * SCALE_UNITS - SCALE_UNITS) / 2) - ((colliderA.getSize() * SCALE_UNITS - SCALE_UNITS) / 2)
-        posB = colliderB.getParent().transform.getPosition() * SCALE_UNITS - ((colliderB.getParent().transform.getScale() * SCALE_UNITS - SCALE_UNITS) / 2) - ((colliderB.getSize() * SCALE_UNITS - SCALE_UNITS) / 2)
+        posA = colliderA.getParent().transform.position * SCALE_UNITS - ((colliderA.getParent().transform.scale * SCALE_UNITS - SCALE_UNITS) / 2) - ((colliderA.getSize() * SCALE_UNITS - SCALE_UNITS) / 2)
+        posB = colliderB.getParent().transform.position * SCALE_UNITS - ((colliderB.getParent().transform.scale * SCALE_UNITS - SCALE_UNITS) / 2) - ((colliderB.getSize() * SCALE_UNITS - SCALE_UNITS) / 2)
         offsetAX = colliderA.offset.x * SCALE_UNITS
         offsetBX = colliderB.offset.x * SCALE_UNITS
         colliderAXSize = colliderA.getSize().x * SCALE_UNITS

src/Component/Rigidbody.jl

@@ -54,9 +54,9 @@
     function Component.update(this::InternalRigidbody, dt)
         velocityMultiplier = Math.Vector2f(1.0, 1.0)
         transform = this.parent.transform
-        currentPosition = transform.getPosition()
+        currentPosition = transform.position
 
-        newPosition = transform.getPosition() + this.velocity*dt + this.acceleration*(dt*dt*0.5)
+        newPosition = transform.position + this.velocity*dt + this.acceleration*(dt*dt*0.5)
         if this.grounded
             newPosition = Math.Vector2f(newPosition.x, currentPosition.y)
             velocityMultiplier = Math.Vector2f(1.0, 0.0)

src/Component/Shape.jl

@@ -58,13 +58,13 @@ module ShapeModule
         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() :
+        parentTransform.position :
         this.position
 
-        outlineRect = Ref(SDL2.SDL_FRect(convert(Int32,round((position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - (parentTransform.getScale().x * SCALE_UNITS - SCALE_UNITS) / 2)), 
-        convert(Int32,round((position.y + this.offset.y) * SCALE_UNITS - cameraDiff.y - (parentTransform.getScale().y * SCALE_UNITS - SCALE_UNITS) / 2)),
-        convert(Int32,round(1 * parentTransform.getScale().x * SCALE_UNITS)), 
-        convert(Int32,round(1 * parentTransform.getScale().y * SCALE_UNITS))))
+        outlineRect = Ref(SDL2.SDL_FRect(convert(Int32,round((position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - (parentTransform.scale.x * SCALE_UNITS - SCALE_UNITS) / 2)), 
+        convert(Int32,round((position.y + this.offset.y) * SCALE_UNITS - cameraDiff.y - (parentTransform.scale.y * SCALE_UNITS - SCALE_UNITS) / 2)),
+        convert(Int32,round(1 * parentTransform.scale.x * SCALE_UNITS)), 
+        convert(Int32,round(1 * parentTransform.scale.y * SCALE_UNITS))))
         SDL2.SDL_SetRenderDrawColor(JulGame.Renderer, this.color.x, this.color.y, this.color.z, SDL2.SDL_ALPHA_OPAQUE );      
 
         this.isFilled ? SDL2.SDL_RenderFillRectF( JulGame.Renderer, outlineRect) : SDL2.SDL_RenderDrawRectF( JulGame.Renderer, outlineRect);

src/Component/Sprite.jl

@@ -37,7 +37,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(), 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.Vector2 = Math.Vector2(0,0))
             this = new()
 
             this.offset = Math.Vector2f()
@@ -110,13 +110,13 @@ module SpriteModule
         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() :
+        parentTransform.position :
         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 - 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,
+            (position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - (parentTransform.scale.x * SCALE_UNITS - SCALE_UNITS) / 2, # TODO: Center the sprite within the entity
+            (position.y + this.offset.y) * SCALE_UNITS - cameraDiff.y - (parentTransform.scale.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
         ))
@@ -133,8 +133,8 @@ module SpriteModule
 
         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 - 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((position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - (parentTransform.scale.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.scale.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

src/Component/Transform.jl

@@ -20,33 +20,17 @@ module TransformModule
 
     function Base.getproperty(this::Transform, s::Symbol)
         method_props = (
-            getPosition = Component.get_position,
             setPosition = Component.set_position,
-            getScale = Component.get_scale,
-            setScale = Component.set_scale,
             update = Component.update,
             setVector2fValue = Component.set_vector2f_value
         )
         deprecated_get_property(method_props, this, s)
     end
 
-
-    function Component.get_position(this::Transform)
-        return this.position
-    end
-
     function Component.set_position(this::Transform, position::Math.Vector2f)
         this.position = position
     end
 
-    function Component.get_scale(this::Transform)
-        return this.scale
-    end
-
-    function Component.set_scale(this::Transform, scale::Math.Vector2f)
-        this.scale = scale
-    end
-
     function Component.update(this::Transform)
         #println(this.position)
     end