Fix color bug

This commit is contained in:
2022-02-22 21:46:26 -06:00
parent ef6d87f617
commit 9ea478d6f4
7 changed files with 442 additions and 256 deletions
+18 -21
View File
@@ -1,23 +1,23 @@
mod memory;
mod word;
mod opcodes;
mod cpu;
mod bus;
mod cpu;
mod display;
mod memory;
mod opcodes;
mod word;
use winit::{
event::{ Event, WindowEvent },
event_loop::{ EventLoop, ControlFlow },
dpi::LogicalSize,
event::{Event, WindowEvent},
event_loop::{ControlFlow, EventLoop},
window::WindowBuilder,
dpi::LogicalSize
};
use crate::cpu::CPU;
use crate::memory::{Memory, PeekPoke};
use crate::word::Word;
use pixels::{Pixels, SurfaceTexture};
use std::time::Instant;
use winit::window::Window;
use crate::cpu::CPU;
use crate::memory::{ Memory, PeekPoke };
use crate::word::Word;
fn main() {
let event_loop = EventLoop::new();
@@ -47,11 +47,6 @@ fn main() {
cpu.poke(Word::from(0x10000 + n), 0xff);
cpu.poke(Word::from(0x10000 + 128 * n + 127), 0b00000011);
cpu.poke(Word::from(0x10000 + 128 * 127 + n), 0b00011100);
cpu.poke(Word::from(0x10000 + 128 * n), 1);
cpu.poke(Word::from(0x10000 + n), 2);
cpu.poke(Word::from(0x10000 + 128 * n + 127), 3);
cpu.poke(Word::from(0x10000 + 128 * 127 + n), 4);
}
window_loop(event_loop, window, pixels, cpu)
}
@@ -63,17 +58,19 @@ fn window_loop(event_loop: EventLoop<()>, window: Window, mut pixels: Pixels, mu
match event {
Event::WindowEvent {
event: WindowEvent::CloseRequested,
window_id
} if window_id == window.id() => {
*control_flow = ControlFlow::Exit
}
window_id,
} if window_id == window.id() => *control_flow = ControlFlow::Exit,
Event::MainEventsCleared => {
let start = Instant::now();
draw(pixels.get_frame(), &mut cpu);
let draw_time = Instant::now() - start;
pixels.render().expect("Problem displaying framebuffer");
let total_time = Instant::now() - start;
println!("Tick took {} total, {} to draw", total_time.as_micros(), draw_time.as_micros());
println!(
"Tick took {} total, {} to draw",
total_time.as_micros(),
draw_time.as_micros()
);
}
_ => {}
}
@@ -84,4 +81,4 @@ fn draw(frame: &mut [u8], cpu: &mut CPU) {
assert_eq!(frame.len(), 640 * 480 * 4);
display::draw(cpu, frame);
}
}