fix emulation bugs

This commit is contained in:
bunnie 2025-02-28 17:29:43 +08:00
parent e6a85c5573
commit db4d21c54c
2 changed files with 27 additions and 33 deletions

View file

@ -38,7 +38,7 @@ pub enum Mono {
impl From<ColorNative> for Mono {
fn from(value: ColorNative) -> Self {
match value.0 {
1 => Mono::Black,
0 => Mono::Black,
_ => Mono::White,
}
}
@ -46,8 +46,8 @@ impl From<ColorNative> for Mono {
impl Into<ColorNative> for Mono {
fn into(self) -> ColorNative {
match self {
Mono::Black => ColorNative::from(1),
Mono::White => ColorNative::from(0),
Mono::Black => ColorNative::from(0),
Mono::White => ColorNative::from(1),
}
}
}
@ -508,19 +508,16 @@ impl<'a> FrameBuffer for Oled128x128<'a> {
}
fn xor_pixel(&mut self, p: Point) {
if p.x >= COLUMN || p.y >= ROW || p.x < 0 || p.y < 0 {
return;
}
let bitnum = (p.x + p.y * COLUMN) as usize;
let flip: ColorNative = if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 {
Mono::Black.into()
} else {
Mono::White.into()
};
if flip.0 != 0 {
self.buffer[bitnum / 32] |= 1 << (bitnum % 32);
} else {
self.buffer[bitnum / 32] &= !(1 << (bitnum % 32));
if let Some(px) = self.get_pixel(p) {
let mono_px: Mono = px.into();
self.put_pixel(
p,
match mono_px {
Mono::Black => Mono::White,
Mono::White => Mono::Black,
}
.into(),
);
}
}

View file

@ -22,8 +22,8 @@ pub enum Mono {
}
impl From<ColorNative> for Mono {
fn from(value: ColorNative) -> Self {
match value.0 as u32 {
DARK_COLOUR => Mono::Black,
match value.0 {
0 => Mono::Black,
_ => Mono::White,
}
}
@ -31,8 +31,8 @@ impl From<ColorNative> for Mono {
impl Into<ColorNative> for Mono {
fn into(self) -> ColorNative {
match self {
Mono::Black => ColorNative::from(DARK_COLOUR as usize),
Mono::White => ColorNative::from(LIGHT_COLOUR as usize),
Mono::Black => ColorNative::from(0),
Mono::White => ColorNative::from(1),
}
}
}
@ -186,19 +186,16 @@ impl FrameBuffer for Oled128x128 {
}
fn xor_pixel(&mut self, p: Point) {
if p.x >= COLUMN || p.y >= ROW || p.x < 0 || p.y < 0 {
return;
}
let bitnum = (p.x + p.y * COLUMN) as usize;
let flip: ColorNative = if self.buffer[bitnum / 32] & 1 << (bitnum % 32) != 0 {
Mono::Black.into()
} else {
Mono::White.into()
};
if flip.0 != 0 {
self.buffer[bitnum / 32] |= 1 << (bitnum % 32);
} else {
self.buffer[bitnum / 32] &= !(1 << (bitnum % 32));
if let Some(px) = self.get_pixel(p) {
let mono_px: Mono = px.into();
self.put_pixel(
p,
match mono_px {
Mono::Black => Mono::White,
Mono::White => Mono::Black,
}
.into(),
);
}
}