[???] Fix program execution

This commit is contained in:
2024-02-19 22:38:09 +05:30
parent 8f9f50b50d
commit 58e732f581
9 changed files with 120 additions and 58 deletions

View File

@@ -48,6 +48,16 @@ impl Color {
let b = gb_byte_remainder % Self::GREEN_MULT;
(r * Self::COLOR_FACTOR_8_BIT, g * Self::COLOR_FACTOR_8_BIT, b * Self::COLOR_FACTOR_8_BIT)
}
pub fn to_rgb_555(&self)->u16{
let r = (self.0 / Self::RED_MULT) as u16;
let gb_byte_remainder = self.0 % Self::RED_MULT;
let g = (gb_byte_remainder / Self::GREEN_MULT) as u16;
let b = gb_byte_remainder % Self::GREEN_MULT;
(r*25)<<10 + (g*25)<<5 + b
}
}

View File

@@ -1,7 +1,10 @@
use std::cell::Ref;
use std::fmt::{Debug, Formatter};
use std::mem::size_of;
use sdl2::pixels::PixelFormatEnum;
use sdl2::rect::Rect;
use sdl2::render::WindowCanvas;
use crate::emu::graphics::GraphicsProcessor;
use sdl2::render::{TextureAccess, WindowCanvas};
use crate::emu::graphics::{DEVICE_FRAMEBUFFER_SIZE, GraphicsProcessor};
use crate::graphics::color::Color;
use crate::misc::error::EmulatorError;
use crate::misc::result::EmulatorResult;
@@ -9,6 +12,7 @@ use crate::misc::result::EmulatorResult;
#[derive(Clone)]
pub struct SDLGraphicsAdapter<'a> {
color_fb: Box<[u8; DEVICE_FRAMEBUFFER_SIZE * 3]>,
graphics_processor: &'a GraphicsProcessor<'a>,
}
@@ -20,33 +24,36 @@ impl<'a> Debug for SDLGraphicsAdapter<'a> {
impl<'a> SDLGraphicsAdapter<'a> {
pub fn new(graphics_processor: &'a GraphicsProcessor) -> SDLGraphicsAdapter<'a> {
let color_fb_vec = vec![0u8; DEVICE_FRAMEBUFFER_SIZE * 3].into_boxed_slice().try_into().expect("???");
SDLGraphicsAdapter {
graphics_processor
color_fb: color_fb_vec,
graphics_processor,
}
}
pub fn draw(&self, canvas: &mut WindowCanvas, draw_factor: u32) -> EmulatorResult<()> {
pub fn draw(&mut self, canvas: &mut WindowCanvas) -> EmulatorResult<()> {
let fb = self.graphics_processor.get_framebuffer();
self.fill_my_texture(fb);
let texture_creator = canvas.texture_creator();
let mut texture = texture_creator.create_texture(PixelFormatEnum::RGB24, TextureAccess::Streaming, 256, 256).expect("Failed to make texture");
texture.with_lock(None, |f, _i| {
f.copy_from_slice(self.color_fb.as_ref())
}).expect("TODO: panic message");
canvas.copy(&texture, None, None).expect("Failed to write texture");
let xyc = fb.iter().enumerate().map(|(i, e)| {
let i = i as u32;
let y_coord = (i & 0xff00) >> 8;
let x_coord = i & 0x00ff;
let color = Color::new(*e);
(x_coord, y_coord, color)
});
for (x, y, c) in xyc {
canvas.set_draw_color(c.get_rgb());
let coordinates = (x as i32, y as i32);
let draw_result = Self::draw_scaled_point(canvas, coordinates, draw_factor);
draw_result?;
}
Ok(())
}
fn draw_scaled_point(canvas: &mut WindowCanvas, coordinates: (i32, i32), draw_factor: u32) -> Result<(), EmulatorError> {
canvas
.fill_rect(Rect::new(coordinates.0 * draw_factor as i32, coordinates.1 * draw_factor as i32, draw_factor, draw_factor))
.map_err(|str| EmulatorError::OtherError(str))
fn fill_my_texture(&mut self, dev_fb_ref: Ref<Box<[u8; DEVICE_FRAMEBUFFER_SIZE]>>) {
for (i, e) in dev_fb_ref.iter().enumerate() {
let color = Color::new(*e).get_rgb();
self.color_fb[3 * i] = color.0;
self.color_fb[3 * i + 1] = color.1;
self.color_fb[3 * i + 2] = color.2;
}
}
}