dev/prometeuc-improvements (#5)
Co-authored-by: Nilton Constantino <nilton.constantino@visma.com> Reviewed-on: #5
This commit was merged in pull request #5.
This commit is contained in:
@@ -133,6 +133,8 @@ impl Gfx {
|
||||
color: Color,
|
||||
mode: BlendMode,
|
||||
) {
|
||||
if color == Color::COLOR_KEY { return; }
|
||||
|
||||
let fw = self.w as i32;
|
||||
let fh = self.h as i32;
|
||||
|
||||
@@ -160,6 +162,7 @@ impl Gfx {
|
||||
|
||||
/// Draws a single pixel.
|
||||
pub fn draw_pixel(&mut self, x: i32, y: i32, color: Color) {
|
||||
if color == Color::COLOR_KEY { return; }
|
||||
if x >= 0 && x < self.w as i32 && y >= 0 && y < self.h as i32 {
|
||||
self.back[y as usize * self.w + x as usize] = color.0;
|
||||
}
|
||||
@@ -167,6 +170,8 @@ impl Gfx {
|
||||
|
||||
/// Draws a line between two points using Bresenham's algorithm.
|
||||
pub fn draw_line(&mut self, x0: i32, y0: i32, x1: i32, y1: i32, color: Color) {
|
||||
if color == Color::COLOR_KEY { return; }
|
||||
|
||||
let dx = (x1 - x0).abs();
|
||||
let sx = if x0 < x1 { 1 } else { -1 };
|
||||
let dy = -(y1 - y0).abs();
|
||||
@@ -193,6 +198,8 @@ impl Gfx {
|
||||
|
||||
/// Draws a circle outline using Midpoint Circle Algorithm.
|
||||
pub fn draw_circle(&mut self, xc: i32, yc: i32, r: i32, color: Color) {
|
||||
if color == Color::COLOR_KEY { return; }
|
||||
|
||||
if r < 0 { return; }
|
||||
let mut x = 0;
|
||||
let mut y = r;
|
||||
@@ -223,6 +230,8 @@ impl Gfx {
|
||||
|
||||
/// Draws a filled circle.
|
||||
pub fn fill_circle(&mut self, xc: i32, yc: i32, r: i32, color: Color) {
|
||||
if color == Color::COLOR_KEY { return; }
|
||||
|
||||
if r < 0 { return; }
|
||||
let mut x = 0;
|
||||
let mut y = r;
|
||||
@@ -255,6 +264,8 @@ impl Gfx {
|
||||
|
||||
/// Draws a rectangle outline.
|
||||
pub fn draw_rect(&mut self, x: i32, y: i32, w: i32, h: i32, color: Color) {
|
||||
if color == Color::COLOR_KEY { return; }
|
||||
|
||||
if w <= 0 || h <= 0 { return; }
|
||||
self.draw_horizontal_line(x, x + w - 1, y, color);
|
||||
self.draw_horizontal_line(x, x + w - 1, y + h - 1, color);
|
||||
@@ -269,6 +280,8 @@ impl Gfx {
|
||||
}
|
||||
|
||||
fn draw_horizontal_line(&mut self, x0: i32, x1: i32, y: i32, color: Color) {
|
||||
if color == Color::COLOR_KEY { return; }
|
||||
|
||||
if y < 0 || y >= self.h as i32 { return; }
|
||||
let start = x0.max(0);
|
||||
let end = x1.min(self.w as i32 - 1);
|
||||
@@ -279,6 +292,8 @@ impl Gfx {
|
||||
}
|
||||
|
||||
fn draw_vertical_line(&mut self, x: i32, y0: i32, y1: i32, color: Color) {
|
||||
if color == Color::COLOR_KEY { return; }
|
||||
|
||||
if x < 0 || x >= self.w as i32 { return; }
|
||||
let start = y0.max(0);
|
||||
let end = y1.min(self.h as i32 - 1);
|
||||
|
||||
@@ -60,4 +60,14 @@ impl Color {
|
||||
pub const fn raw(self) -> u16 {
|
||||
self.0
|
||||
}
|
||||
|
||||
pub const fn hex(self) -> i32 {
|
||||
let (r5, g6, b5) = Self::unpack_to_native(self.0);
|
||||
let r8 = ((r5 as u32) << 3) | ((r5 as u32) >> 2);
|
||||
let g8 = ((g6 as u32) << 2) | ((g6 as u32) >> 4);
|
||||
let b8 = ((b5 as u32) << 3) | ((b5 as u32) >> 2);
|
||||
let hex = r8 << 16 | g8 << 8 | b8;
|
||||
hex as i32
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -325,26 +325,31 @@ impl PrometeuOS {
|
||||
Ok(100)
|
||||
}
|
||||
|
||||
pub fn get_color(&self, index: usize, hw: &mut dyn HardwareBridge) -> Color {
|
||||
if let Some(bank) = hw.gfx().banks[0].as_ref() {
|
||||
bank.palettes[0][index % 16]
|
||||
} else {
|
||||
match index % 16 {
|
||||
0 => Color::BLACK,
|
||||
1 => Color::WHITE,
|
||||
2 => Color::RED,
|
||||
3 => Color::GREEN,
|
||||
4 => Color::BLUE,
|
||||
5 => Color::YELLOW,
|
||||
6 => Color::CYAN,
|
||||
7 => Color::INDIGO,
|
||||
8 => Color::GRAY,
|
||||
_ => Color::BLACK,
|
||||
}
|
||||
}
|
||||
pub fn get_color(&self, value: i64) -> Color {
|
||||
// Agora usamos o valor diretamente como RGB565.
|
||||
Color::from_raw(value as u16)
|
||||
}
|
||||
|
||||
// Helper para syscalls
|
||||
pub fn get_button<'a>(&self, id: u32, hw: &'a dyn HardwareBridge) -> Option<&'a crate::model::Button> {
|
||||
let pad = hw.pad();
|
||||
match id {
|
||||
0 => Some(&pad.up),
|
||||
1 => Some(&pad.down),
|
||||
2 => Some(&pad.left),
|
||||
3 => Some(&pad.right),
|
||||
4 => Some(&pad.a),
|
||||
5 => Some(&pad.b),
|
||||
6 => Some(&pad.x),
|
||||
7 => Some(&pad.y),
|
||||
8 => Some(&pad.l),
|
||||
9 => Some(&pad.r),
|
||||
10 => Some(&pad.start),
|
||||
11 => Some(&pad.select),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_button_down(&self, id: u32, hw: &mut dyn HardwareBridge) -> bool {
|
||||
match id {
|
||||
0 => hw.pad().up.down,
|
||||
@@ -464,6 +469,17 @@ mod tests {
|
||||
assert!(cycles_after_tick_2 > cycles_after_tick_1, "VM should have consumed more cycles because FrameSync reset the budget");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_color_logic() {
|
||||
let os = PrometeuOS::new(None);
|
||||
|
||||
// Deve retornar a cor raw diretamente
|
||||
assert_eq!(os.get_color(0x07E0), Color::GREEN);
|
||||
assert_eq!(os.get_color(0xF800), Color::RED);
|
||||
assert_eq!(os.get_color(0x001F), Color::BLUE);
|
||||
assert_eq!(os.get_color(3), Color::from_raw(3));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_syscall_log_write_and_rate_limit() {
|
||||
let mut os = PrometeuOS::new(None);
|
||||
@@ -575,70 +591,70 @@ impl NativeInterface for PrometeuOS {
|
||||
|
||||
// gfx.clear(color_index) -> null
|
||||
Syscall::GfxClear => {
|
||||
let color_idx = vm.pop_integer()? as usize;
|
||||
let color = self.get_color(color_idx, hw);
|
||||
let color_val = vm.pop_integer()?;
|
||||
let color = self.get_color(color_val);
|
||||
hw.gfx_mut().clear(color);
|
||||
vm.push(Value::Null);
|
||||
Ok(100)
|
||||
}
|
||||
// gfx.draw_rect(x, y, w, h, color_index) -> null
|
||||
Syscall::GfxFillRect => {
|
||||
let color_idx = vm.pop_integer()? as usize;
|
||||
let color_val = vm.pop_integer()?;
|
||||
let h = vm.pop_integer()? as i32;
|
||||
let w = vm.pop_integer()? as i32;
|
||||
let y = vm.pop_integer()? as i32;
|
||||
let x = vm.pop_integer()? as i32;
|
||||
let color = self.get_color(color_idx, hw);
|
||||
let color = self.get_color(color_val);
|
||||
hw.gfx_mut().fill_rect(x, y, w, h, color);
|
||||
vm.push(Value::Null);
|
||||
Ok(200)
|
||||
}
|
||||
// gfx.draw_line(x1, y1, x2, y2, color_index) -> null
|
||||
Syscall::GfxDrawLine => {
|
||||
let color_idx = vm.pop_integer()? as usize;
|
||||
let color_val = vm.pop_integer()?;
|
||||
let y2 = vm.pop_integer()? as i32;
|
||||
let x2 = vm.pop_integer()? as i32;
|
||||
let y1 = vm.pop_integer()? as i32;
|
||||
let x1 = vm.pop_integer()? as i32;
|
||||
let color = self.get_color(color_idx, hw);
|
||||
let color = self.get_color(color_val);
|
||||
hw.gfx_mut().draw_line(x1, y1, x2, y2, color);
|
||||
vm.push(Value::Null);
|
||||
Ok(200)
|
||||
}
|
||||
// gfx.draw_circle(x, y, r, color_index) -> null
|
||||
Syscall::GfxDrawCircle => {
|
||||
let color_idx = vm.pop_integer()? as usize;
|
||||
let color_val = vm.pop_integer()?;
|
||||
let r = vm.pop_integer()? as i32;
|
||||
let y = vm.pop_integer()? as i32;
|
||||
let x = vm.pop_integer()? as i32;
|
||||
let color = self.get_color(color_idx, hw);
|
||||
let color = self.get_color(color_val);
|
||||
hw.gfx_mut().draw_circle(x, y, r, color);
|
||||
vm.push(Value::Null);
|
||||
Ok(200)
|
||||
}
|
||||
// gfx.draw_disc(x, y, r, border_color_idx, fill_color_idx) -> null
|
||||
Syscall::GfxDrawDisc => {
|
||||
let fill_color_idx = vm.pop_integer()? as usize;
|
||||
let border_color_idx = vm.pop_integer()? as usize;
|
||||
let fill_color_val = vm.pop_integer()?;
|
||||
let border_color_val = vm.pop_integer()?;
|
||||
let r = vm.pop_integer()? as i32;
|
||||
let y = vm.pop_integer()? as i32;
|
||||
let x = vm.pop_integer()? as i32;
|
||||
let fill_color = self.get_color(fill_color_idx, hw);
|
||||
let border_color = self.get_color(border_color_idx, hw);
|
||||
let fill_color = self.get_color(fill_color_val);
|
||||
let border_color = self.get_color(border_color_val);
|
||||
hw.gfx_mut().draw_disc(x, y, r, border_color, fill_color);
|
||||
vm.push(Value::Null);
|
||||
Ok(300)
|
||||
}
|
||||
// gfx.draw_square(x, y, w, h, border_color_idx, fill_color_idx) -> null
|
||||
Syscall::GfxDrawSquare => {
|
||||
let fill_color_idx = vm.pop_integer()? as usize;
|
||||
let border_color_idx = vm.pop_integer()? as usize;
|
||||
let fill_color_val = vm.pop_integer()?;
|
||||
let border_color_val = vm.pop_integer()?;
|
||||
let h = vm.pop_integer()? as i32;
|
||||
let w = vm.pop_integer()? as i32;
|
||||
let y = vm.pop_integer()? as i32;
|
||||
let x = vm.pop_integer()? as i32;
|
||||
let fill_color = self.get_color(fill_color_idx, hw);
|
||||
let border_color = self.get_color(border_color_idx, hw);
|
||||
let fill_color = self.get_color(fill_color_val);
|
||||
let border_color = self.get_color(border_color_val);
|
||||
hw.gfx_mut().draw_square(x, y, w, h, border_color, fill_color);
|
||||
vm.push(Value::Null);
|
||||
Ok(200)
|
||||
@@ -653,6 +669,49 @@ impl NativeInterface for PrometeuOS {
|
||||
vm.push(Value::Boolean(is_down));
|
||||
Ok(50)
|
||||
}
|
||||
Syscall::InputGetPadPressed => {
|
||||
let button_id = vm.pop_integer()? as u32;
|
||||
let val = self.get_button(button_id, hw).map(|b| b.pressed).unwrap_or(false);
|
||||
vm.push(Value::Boolean(val));
|
||||
Ok(50)
|
||||
}
|
||||
Syscall::InputGetPadReleased => {
|
||||
let button_id = vm.pop_integer()? as u32;
|
||||
let val = self.get_button(button_id, hw).map(|b| b.released).unwrap_or(false);
|
||||
vm.push(Value::Boolean(val));
|
||||
Ok(50)
|
||||
}
|
||||
Syscall::InputGetPadHold => {
|
||||
let button_id = vm.pop_integer()? as u32;
|
||||
let val = self.get_button(button_id, hw).map(|b| b.hold_frames).unwrap_or(0);
|
||||
vm.push(Value::Int32(val as i32));
|
||||
Ok(50)
|
||||
}
|
||||
|
||||
Syscall::TouchGetX => {
|
||||
vm.push(Value::Int32(hw.touch().x));
|
||||
Ok(50)
|
||||
}
|
||||
Syscall::TouchGetY => {
|
||||
vm.push(Value::Int32(hw.touch().y));
|
||||
Ok(50)
|
||||
}
|
||||
Syscall::TouchIsDown => {
|
||||
vm.push(Value::Boolean(hw.touch().f.down));
|
||||
Ok(50)
|
||||
}
|
||||
Syscall::TouchIsPressed => {
|
||||
vm.push(Value::Boolean(hw.touch().f.pressed));
|
||||
Ok(50)
|
||||
}
|
||||
Syscall::TouchIsReleased => {
|
||||
vm.push(Value::Boolean(hw.touch().f.released));
|
||||
Ok(50)
|
||||
}
|
||||
Syscall::TouchGetHold => {
|
||||
vm.push(Value::Int32(hw.touch().f.hold_frames as i32));
|
||||
Ok(50)
|
||||
}
|
||||
|
||||
// --- Audio Syscalls ---
|
||||
|
||||
|
||||
@@ -15,6 +15,16 @@ pub enum Syscall {
|
||||
|
||||
// Input
|
||||
InputGetPad = 0x2001,
|
||||
InputGetPadPressed = 0x2002,
|
||||
InputGetPadReleased = 0x2003,
|
||||
InputGetPadHold = 0x2004,
|
||||
|
||||
TouchGetX = 0x2101,
|
||||
TouchGetY = 0x2102,
|
||||
TouchIsDown = 0x2103,
|
||||
TouchIsPressed = 0x2104,
|
||||
TouchIsReleased = 0x2105,
|
||||
TouchGetHold = 0x2106,
|
||||
|
||||
// Audio
|
||||
AudioPlaySample = 0x3001,
|
||||
@@ -45,6 +55,15 @@ impl Syscall {
|
||||
0x1005 => Some(Self::GfxDrawDisc),
|
||||
0x1006 => Some(Self::GfxDrawSquare),
|
||||
0x2001 => Some(Self::InputGetPad),
|
||||
0x2002 => Some(Self::InputGetPadPressed),
|
||||
0x2003 => Some(Self::InputGetPadReleased),
|
||||
0x2004 => Some(Self::InputGetPadHold),
|
||||
0x2101 => Some(Self::TouchGetX),
|
||||
0x2102 => Some(Self::TouchGetY),
|
||||
0x2103 => Some(Self::TouchIsDown),
|
||||
0x2104 => Some(Self::TouchIsPressed),
|
||||
0x2105 => Some(Self::TouchIsReleased),
|
||||
0x2106 => Some(Self::TouchGetHold),
|
||||
0x3001 => Some(Self::AudioPlaySample),
|
||||
0x4001 => Some(Self::FsOpen),
|
||||
0x4002 => Some(Self::FsRead),
|
||||
@@ -59,52 +78,71 @@ impl Syscall {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn as_str(&self) -> &'static str {
|
||||
match self {
|
||||
Self::SystemHasCart => "system.has_cart",
|
||||
Self::SystemRunCart => "system.run_cart",
|
||||
Self::GfxClear => "gfx.clear",
|
||||
Self::GfxFillRect => "gfx.fillRect",
|
||||
Self::GfxDrawLine => "gfx.drawLine",
|
||||
Self::GfxDrawCircle => "gfx.drawCircle",
|
||||
Self::GfxDrawDisc => "gfx.drawDisc",
|
||||
Self::GfxDrawSquare => "gfx.drawSquare",
|
||||
Self::InputGetPad => "input.get_pad",
|
||||
Self::AudioPlaySample => "audio.playSample",
|
||||
Self::FsOpen => "fs.open",
|
||||
Self::FsRead => "fs.read",
|
||||
Self::FsWrite => "fs.write",
|
||||
Self::FsClose => "fs.close",
|
||||
Self::FsListDir => "fs.listDir",
|
||||
Self::FsExists => "fs.exists",
|
||||
Self::FsDelete => "fs.delete",
|
||||
Self::LogWrite => "log.write",
|
||||
Self::LogWriteTag => "log.writeTag",
|
||||
}
|
||||
}
|
||||
// pub fn as_str(&self) -> &'static str {
|
||||
// match self {
|
||||
// Self::SystemHasCart => "system.has_cart",
|
||||
// Self::SystemRunCart => "system.run_cart",
|
||||
// Self::GfxClear => "gfx.clear",
|
||||
// Self::GfxFillRect => "gfx.fillRect",
|
||||
// Self::GfxDrawLine => "gfx.drawLine",
|
||||
// Self::GfxDrawCircle => "gfx.drawCircle",
|
||||
// Self::GfxDrawDisc => "gfx.drawDisc",
|
||||
// Self::GfxDrawSquare => "gfx.drawSquare",
|
||||
// Self::InputGetPad => "input.get_pad",
|
||||
// Self::InputGetPadPressed => "input.get_pad_pressed",
|
||||
// Self::InputGetPadReleased => "input.get_pad_released",
|
||||
// Self::InputGetPadHold => "input.get_pad_hold",
|
||||
// Self::TouchGetX => "touch.getX",
|
||||
// Self::TouchGetY => "touch.getY",
|
||||
// Self::TouchIsDown => "touch.isDown",
|
||||
// Self::TouchIsPressed => "touch.isPressed",
|
||||
// Self::TouchIsReleased => "touch.isReleased",
|
||||
// Self::TouchGetHold => "touch.getHold",
|
||||
// Self::AudioPlaySample => "audio.playSample",
|
||||
// Self::FsOpen => "fs.open",
|
||||
// Self::FsRead => "fs.read",
|
||||
// Self::FsWrite => "fs.write",
|
||||
// Self::FsClose => "fs.close",
|
||||
// Self::FsListDir => "fs.listDir",
|
||||
// Self::FsExists => "fs.exists",
|
||||
// Self::FsDelete => "fs.delete",
|
||||
// Self::LogWrite => "log.write",
|
||||
// Self::LogWriteTag => "log.writeTag",
|
||||
// }
|
||||
// }
|
||||
|
||||
pub fn from_name(name: &str) -> Option<Self> {
|
||||
match name {
|
||||
"system.has_cart" => Some(Self::SystemHasCart),
|
||||
"system.run_cart" => Some(Self::SystemRunCart),
|
||||
"system.hasCart" | "system.has_cart" => Some(Self::SystemHasCart),
|
||||
"gfx.clear" => Some(Self::GfxClear),
|
||||
"gfx.fillRect" | "gfx.draw_rect" => Some(Self::GfxFillRect),
|
||||
"gfx.drawLine" | "gfx.draw_line" => Some(Self::GfxDrawLine),
|
||||
"gfx.drawCircle" | "gfx.draw_circle" => Some(Self::GfxDrawCircle),
|
||||
"gfx.drawDisc" | "gfx.draw_disc" => Some(Self::GfxDrawDisc),
|
||||
"gfx.drawSquare" | "gfx.draw_square" => Some(Self::GfxDrawSquare),
|
||||
"input.get_pad" => Some(Self::InputGetPad),
|
||||
"input.getPad" => Some(Self::InputGetPad),
|
||||
"input.getPadPressed" | "input.get_pad_pressed" => Some(Self::InputGetPadPressed),
|
||||
"input.getPadReleased" | "input.get_pad_released" => Some(Self::InputGetPadReleased),
|
||||
"input.getPadHold" | "input.get_pad_hold" => Some(Self::InputGetPadHold),
|
||||
"touch.getX" | "touch.get_x" => Some(Self::TouchGetX),
|
||||
"touch.getY" | "touch.get_y" => Some(Self::TouchGetY),
|
||||
"touch.isDown" | "touch.is_down" => Some(Self::TouchIsDown),
|
||||
"touch.isPressed" | "touch.is_pressed" => Some(Self::TouchIsPressed),
|
||||
"touch.isReleased" | "touch.is_released" => Some(Self::TouchIsReleased),
|
||||
"touch.getHold" | "touch.get_hold" => Some(Self::TouchGetHold),
|
||||
"audio.playSample" | "audio.play_sample" => Some(Self::AudioPlaySample),
|
||||
"fs.open" => Some(Self::FsOpen),
|
||||
"fs.read" => Some(Self::FsRead),
|
||||
"fs.write" => Some(Self::FsWrite),
|
||||
"fs.close" => Some(Self::FsClose),
|
||||
"fs.listDir" => Some(Self::FsListDir),
|
||||
"fs.listDir" | "fs.list_dir" => Some(Self::FsListDir),
|
||||
"fs.exists" => Some(Self::FsExists),
|
||||
"fs.delete" => Some(Self::FsDelete),
|
||||
"log.write" => Some(Self::LogWrite),
|
||||
"log.writeTag" => Some(Self::LogWriteTag),
|
||||
_ => None,
|
||||
"log.writeTag" | "log.write_tag" => Some(Self::LogWriteTag),
|
||||
_ => {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user