Skip to content

Commit

Permalink
Scale sprites with transform
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kyjor
Kyjor committed Aug 17, 2024
1 parent 99e0a1b commit bce4b00
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 25 deletions.
40 changes: 20 additions & 20 deletions src/Component/Sprite.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,38 +112,38 @@ module SpriteModule
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 - 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,
(position.x + this.offset.x) * SCALE_UNITS - cameraDiff.x - ((srcRect == C_NULL ? this.size.x : this.crop.z) * parentTransform.scale.x * SCALE_UNITS / ppu - SCALE_UNITS) / 2,
(position.y + this.offset.y) * SCALE_UNITS - cameraDiff.y - ((srcRect == C_NULL ? this.size.y : this.crop.t) * parentTransform.scale.y * 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 - 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
if this.center != Math.Vector2(0,0)
calculatedCenter = Math.Vector2f(-this.size.x/2 + this.center.x, -this.size.y/2 + this.center.y)
end
if this.pixelsPerUnit > 0 || JulGame.PIXELS_PER_UNIT > 0 && !this.isFloatPrecision
ppu = this.pixelsPerUnit > 0 ? this.pixelsPerUnit : JulGame.PIXELS_PER_UNIT
if !this.isFloatPrecision
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_Rect(
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))
))
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))
))
if (this.pixelsPerUnit > 0 || JulGame.PIXELS_PER_UNIT > 0) && this.pixelsPerUnit != -1
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 - 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*parentTransform.scale.x)),
convert(Int32, round((srcRect == C_NULL ? this.size.y : this.crop.t) * SCALE_UNITS/ppu*parentTransform.scale.y))
))
end
end

# Calculate center position on sprite using the center property.
# 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 = Ref(SDL2.SDL_Point(round(dstRect[].w/2 + this.center.x), round(dstRect[].h/2 + this.center.y)))
calculatedCenter = Math.Vector2f(dstRect[].w/2 + this.center.x, dstRect[].h/2 + this.center.y)
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(
JulGame.Renderer::Ptr{SDL2.SDL_Renderer},
Expand Down
2 changes: 1 addition & 1 deletion src/Main.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ function game_loop(this::Main, startTime::Ref{UInt64} = Ref(UInt64(0)), lastPhys
rendercount += 1
Component.draw(renderOrder[i][2])
catch e
println(sprite.parent.name, " with id: ", sprite.parent.id, " has a problem with it's sprite")
println(renderOrder[i][2].parent.name, " with id: ", renderOrder[i][2].parent.id, " has a problem with it's sprite")
@error string(e)
Base.show_backtrace(stdout, catch_backtrace())
rethrow(e)
Expand Down
6 changes: 3 additions & 3 deletions src/SceneManagement/SceneBuilder.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module SceneBuilderModule
using ...ScreenButtonModule
using ..SceneReaderModule

#function __init__()
function __init__()
# if end of path is "test", then we are running tests
if endswith(pwd(), "test")
println("Loading scripts in test folder...")
Expand Down Expand Up @@ -37,7 +37,7 @@ module SceneBuilderModule
end
end
end
#end
end

export Scene
mutable struct Scene
Expand Down Expand Up @@ -136,7 +136,7 @@ module SceneBuilderModule
try
newScript = eval(Symbol(script.name))(params...)
catch e
@error string(e)
@error string(e)
Base.show_backtrace(stdout, catch_backtrace())
rethrow(e)
end
Expand Down
1 change: 0 additions & 1 deletion src/Utils.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ function CallSDLFunction(func::Function, args...)
ret = func(args...)
if (isa(ret, Number) && ret < 0) || ret == C_NULL
@error "$(unsafe_string(SDL2.SDL_GetError())) $(@__FILE__):$(@__LINE__)"
@info "Check Utils.jl"
Base.show_backtrace(stdout, catch_backtrace())
end

Expand Down

0 comments on commit bce4b00

Please sign in to comment.