randrews/vulcan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Ross Andrews
2022-03-12 15:39:29 -06:00
parent 90f2177e5b
commit 19eb4d57f3
14 changed files with 444 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vemu/src/display.rs
+5 -9
View File
@@ -211,7 +211,7 @@ fn draw_paletted_low_text<P: PeekPoke>(machine: &P, reg: DisplayRegisters, frame
let char_byte = machine.peek(reg.font + (char_idx << 3) + char_row);
let color_addr = addr + (reg.width * reg.height);
let color_byte = machine.peek(Word::from(color_addr));
let color_byte = machine.peek(color_addr);
let (fg_color_idx, bg_color_idx) = (color_byte & 0xf, color_byte >> 4);
let fg_color = machine.peek(reg.palette + fg_color_idx);
@@ -231,10 +231,8 @@ fn draw_direct_low_gfx<P: PeekPoke>(machine: &P, reg: DisplayRegisters, frame: &
for (i, pixel) in frame.chunks_exact_mut(4).enumerate() {
let (display_row, display_col) = (i / 640, i % 640);
if display_row >= (240 - 64 * 3)
&& display_row < (240 + 64 * 3)
&& display_col >= (320 - 64 * 3)
&& display_col < (320 + 64 * 3)
if ((240 - 64 * 3)..(240 + 64 * 3)).contains(&display_row)
&& ((320 - 64 * 3)..(320 + 64 * 3)).contains(&display_col)
{
let (vulcan_row, vulcan_col) = (
Word::from((display_row - (240 - 64 * 3)) / 3),
@@ -253,10 +251,8 @@ fn draw_paletted_low_gfx<P: PeekPoke>(machine: &P, reg: DisplayRegisters, frame:
for (i, pixel) in frame.chunks_exact_mut(4).enumerate() {
let (display_row, display_col) = (i / 640, i % 640);
if display_row >= (240 - 64 * 3)
&& display_row < (240 + 64 * 3)
&& display_col >= (320 - 64 * 3)
&& display_col < (320 + 64 * 3)
if ((240 - 64 * 3)..(240 + 64 * 3)).contains(&display_row)
&& ((320 - 64 * 3)..(320 + 64 * 3)).contains(&display_col)
{
let (vulcan_row, vulcan_col) = (
Word::from((display_row - (240 - 64 * 3)) / 3),
vemu/src/main.rs
+2 -2
View File
@@ -59,10 +59,10 @@ fn window_loop(event_loop: EventLoop<()>, window: Window, mut pixels: Pixels, mu
} if window_id == window.id() => *control_flow = ControlFlow::Exit,
Event::WindowEvent {
event: WindowEvent::Resized(newSize),
event: WindowEvent::Resized(new_size),
window_id
} if window_id == window.id() => {
pixels.resize_surface(newSize.width, newSize.height);
pixels.resize_surface(new_size.width, new_size.height);
}
Event::MainEventsCleared => {