From bc546a22c896eab65d2dc43827f644fc80210bca Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Wed, 16 Feb 2022 01:21:52 +0100
Subject: [PATCH 1/2] update(screen): bigger screen
---
src/main.rs | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index 67308cc..0baf4d5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,6 +23,7 @@ use sdl2::pixels::Color;
use sdl2::event::Event;
use sdl2::keyboard::Keycode;
use sdl2::rect::Point;
+use sdl2::rect::Rect;
use machine::HEIGHT;
use machine::WIDTH;
@@ -48,8 +49,8 @@ fn main() {
let sdl_context = sdl2::init().unwrap();
let video_subsystem = sdl_context.video().unwrap();
- let window = video_subsystem.window("Chip8 Emulator", WIDTH as u32, HEIGHT as u32)
- //let window = video_subsystem.window("Chip8 Emulator", 100 + 10 * WIDTH as u32, 10 * HEIGHT as u32)
+ //let window = video_subsystem.window("Chip8 Emulator", 200 + 11 * WIDTH as u32, 11 * HEIGHT as u32)
+ let window = video_subsystem.window("Chip8 Emulator", 11 * WIDTH as u32, 11 * HEIGHT as u32)
.position_centered()
.build()
.unwrap();
@@ -58,6 +59,10 @@ fn main() {
canvas.set_draw_color(Color::RGB(0, 0, 0));
canvas.clear();
canvas.present();
+ //canvas.set_draw_color(Color::RGB(255, 255, 255));
+ //canvas.draw_line(Point::new(74 + 10 * WIDTH as i32, 0),
+ // Point::new(74 + 10 * WIDTH as i32, 42 + 10 * HEIGHT as i32));
+ canvas.present();
let mut event_pump = sdl_context.event_pump().unwrap();
@@ -66,12 +71,14 @@ fn main() {
for i in 0..t.display_buffer.len() {
for j in 0..t.display_buffer[i].len() {
+ let ti = i * 10 + i;
+ let tj = j * 10 + j;
if t.display_buffer[i][j] == 1 {
canvas.set_draw_color(Color::RGB(255, 255, 255));
- canvas.draw_point(Point::new(j as i32, i as i32)).unwrap();
+ canvas.fill_rect(Rect::new(tj as i32, ti as i32, 10, 10)).unwrap();
} else {
canvas.set_draw_color(Color::RGB(0, 0, 0));
- canvas.draw_point(Point::new(j as i32, i as i32)).unwrap();
+ canvas.fill_rect(Rect::new(tj as i32, ti as i32, 10, 10)).unwrap();
}
}
}
From 065be393570c8af03ec41dfd046582b5e475f705 Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Wed, 16 Feb 2022 01:32:55 +0100
Subject: [PATCH 2/2] fix(ui): black lines between blocks
---
src/main.rs | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index 0baf4d5..0c1bc4a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -35,8 +35,6 @@ use std::env;
fn main() {
let name_file = &env::args().collect::<Vec<String>>()[1];
- //read_file(Path::new("15PUZZLE"));
- //return;
let mut t: Machine = Machine::new();
t.init();
match t.load_rom(Path::new(name_file)) {
@@ -49,8 +47,7 @@ fn main() {
let sdl_context = sdl2::init().unwrap();
let video_subsystem = sdl_context.video().unwrap();
- //let window = video_subsystem.window("Chip8 Emulator", 200 + 11 * WIDTH as u32, 11 * HEIGHT as u32)
- let window = video_subsystem.window("Chip8 Emulator", 11 * WIDTH as u32, 11 * HEIGHT as u32)
+ let window = video_subsystem.window("Chip8 Emulator", 200 + 11 * WIDTH as u32, 11 * HEIGHT as u32)
.position_centered()
.build()
.unwrap();
@@ -59,9 +56,9 @@ fn main() {
canvas.set_draw_color(Color::RGB(0, 0, 0));
canvas.clear();
canvas.present();
- //canvas.set_draw_color(Color::RGB(255, 255, 255));
- //canvas.draw_line(Point::new(74 + 10 * WIDTH as i32, 0),
- // Point::new(74 + 10 * WIDTH as i32, 42 + 10 * HEIGHT as i32));
+ canvas.set_draw_color(Color::RGB(255, 255, 255));
+ canvas.draw_line(Point::new(11 * WIDTH as i32, 0),
+ Point::new(11 * WIDTH as i32, 11 * HEIGHT as i32)).unwrap();
canvas.present();
let mut event_pump = sdl_context.event_pump().unwrap();
@@ -71,8 +68,8 @@ fn main() {
for i in 0..t.display_buffer.len() {
for j in 0..t.display_buffer[i].len() {
- let ti = i * 10 + i;
- let tj = j * 10 + j;
+ let ti = i * 10 + 10;
+ let tj = j * 10 + 10;
if t.display_buffer[i][j] == 1 {
canvas.set_draw_color(Color::RGB(255, 255, 255));
canvas.fill_rect(Rect::new(tj as i32, ti as i32, 10, 10)).unwrap();