kistaro/chameleonic
1
0
Fork 0
forked from pyrex/chameleonic
Code Pull Requests Packages Projects Releases Activity

Compare commits

base: kistaro:b7ce1fe85edb2f374bb86f8c9d503de4315d81bf
Branches Tags
kistaro:main
kistaro:more_levels
kistaro:rope_golf
kistaro:animate-blocked-moves
kistaro:better_debug_mouse
kistaro:sprintf
kistaro:level_design
kistaro:golf
pyrex:main
pyrex:rope_associated_with_rewrite
pyrex:tiles
pyrex:simplified_anchors_broken
pyrex:level-29
pyrex:intro_sequence
pyrex:music_fork
pyrex:nyeo_levels
pyrex:rewrite_rope
..
compare: kistaro:0d3b0e4dac9b50543673f810cdca6814dede4213
Branches Tags
kistaro:main
kistaro:more_levels
kistaro:rope_golf
kistaro:animate-blocked-moves
kistaro:better_debug_mouse
kistaro:sprintf
kistaro:level_design
kistaro:golf
pyrex:main
pyrex:rope_associated_with_rewrite
pyrex:tiles
pyrex:simplified_anchors_broken
pyrex:level-29
pyrex:intro_sequence
pyrex:music_fork
pyrex:nyeo_levels
pyrex:rewrite_rope

3 Commits
b7ce1fe85e ... 0d3b0e4dac

Author SHA1 Message Date
Kistaro Windrider
0d3b0e4dac
fmt in debugmouse:draw3. 
This is literally the reason I implemented fmt in the first place
 2023-01-01 13:31:34 -08:00
Kistaro Windrider
ec98554c78
use fmt in a commented-out debug logging block 2023-01-01 13:29:52 -08:00
Kistaro Windrider
4363f2ed43
golf recollide_reanchor 
Uses fmt in recollide_reanchor. This has a performance impact in code that is already slow so this might need to be reverted; I think that should be part of a comprehensive optimization pass, however, and making it worse for now as part of a general code cleanup is probably better.
 2023-01-01 13:27:32 -08:00
1 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

10
chameleonic.p8
View File

@ -470,8 +470,7 @@ function level:recollide_reanchor()
not self:mcoll(mx1,my0) and not self:mcoll(mx1,my0) and
not self:mcoll(mx1,my1) not self:mcoll(mx1,my1)
) then ) then
local key="GEOM"..mx0..","..my0..","..dx..","..dy anch_new[fmt("GEOM%v,%v,%v,%v",mx0,my0,dx,dy)]= {
anch_new[key]= {
max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy
} }
end end
@ -479,10 +478,9 @@ function level:recollide_reanchor()
end end
for _,cr in pairs(self._crates) do for _,cr in pairs(self._crates) do
local key="CRATE"..cr.id..","..dx..","..dy
local mx0,my0=cr.mx,cr.my local mx0,my0=cr.mx,cr.my
local mx1,my1=mx0+dx,my0+dy local mx1,my1=mx0+dx,my0+dy
anch_new[key]={ anch_new[fmt("CRATE%v,%v,%v",cr.id,dx,dy)]={
max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy
} }
end end
@ -1090,7 +1088,7 @@ function rope:draw(artificial_px,artificial_py)
if (anch.ady>0) y-=1 if (anch.ady>0) y-=1
end end
rectfill(x-1,y-1,x+1,y+1,12) rectfill(x-1,y-1,x+1,y+1,12)
print("ax="..n1.ax..",ay="..n1.ay,72,sy) print(fmt("ax=%v,ay=%v",n1.ax,n1.ay),72,sy)
sy+=7 sy+=7
local n0=n1.prev local n0=n1.prev
@ -1839,7 +1837,7 @@ function debugmouse:draw3()
if (c == " ") spr(50,x,y) if (c == " ") spr(50,x,y)
print(c,x,y,15) print(c,x,y,15)
local px, py = mid(0,x,89), mid(0, y > 111 and y - 12 or y + 6, 117) local px, py = mid(0,x,89), mid(0, y > 111 and y - 12 or y + 6, 117)
print("("..x..", "..y..")\n["..(x\8)..", "..(y\8).."]",px,py,15) print(fmt("(%v, %v)\n[%v, %v]",x,y,x\8,y\8),px,py,15)
pal() pal()
end end