paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(window): proper inRange impl for window 

window wrap now works (it's pretty slow though?)
This commit is contained in:
Rekai Nyangadzayi Musuka 2022-11-03 03:34:07 -03:00
parent dda533f557
commit 102eb0c1e6
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/ppu.zig
View File

@ -962,24 +962,35 @@ const Window = struct {
} }
fn inRange(self: *const Self, comptime id: u1, x: u9, y: u8) bool { fn inRange(self: *const Self, comptime id: u1, x: u9, y: u8) bool {
const h = self.h[id]; const winh = self.h[id];
const v = self.v[id]; const winv = self.v[id];
const y1 = v.y1.read(); if (isYInRange(winv, y)) {
const y2 = if (y1 > v.y2.read()) 160 else std.math.min(160, v.y2.read()); const x1 = winh.x1.read();
const x2 = winh.x2.read();
if (y1 <= y and y < y2) {
// Within Y bounds
const x1 = h.x1.read();
const x2 = if (x1 > h.x2.read()) 240 else std.math.min(240, h.x2.read());
// Within X Bounds // Within X Bounds
return x1 <= x and x < x2; return if (x1 < x2) blk: {
break :blk x >= x1 and x < x2;
} else blk: {
break :blk x >= x1 or x < x2;
};
} }
return false; return false;
} }
inline fn isYInRange(winv: io.WinV, y: u9) bool {
const y1 = winv.y1.read();
const y2 = winv.y2.read();
if (y1 < y2) {
return y >= y1 and y < y2;
} else {
return y >= y1 or y < y2;
}
}
pub fn setH(self: *Self, value: u32) void { pub fn setH(self: *Self, value: u32) void {
self.h[0].raw = @truncate(u16, value); self.h[0].raw = @truncate(u16, value);
self.h[1].raw = @truncate(u16, value >> 16); self.h[1].raw = @truncate(u16, value >> 16);