PVB/lemur
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Support hypothetical big-endian users

Browse Source
This commit is contained in:
SonicSwordcane
2025-02-15 18:33:18 -05:00
parent b888d1140a
commit f7cf960b62
5 changed files with 100 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/window/vram/bgmap.rs
+10 -14
View File
@@ -239,30 +239,26 @@ impl BgMapRenderer {
let brightness = self.brightness.borrow();
let palettes = self.palettes.borrow();
let brts = brightness.range::<u8>(0, 8);
let brts = brightness.read::<[u8; 8]>(0);
let colors = if generic_palette {
[utils::generic_palette(Color32::RED); 4]
} else {
[0, 2, 4, 6].map(|i| utils::parse_palette(palettes.read(i), brts, Color32::RED))
[0, 2, 4, 6].map(|i| utils::parse_palette(palettes.read(i), &brts, Color32::RED))
};
for (i, cell) in bgmaps
.range::<u16>(bgmap_index * 4096, 4096)
.iter()
.enumerate()
{
for (i, cell) in bgmaps.range::<u16>(bgmap_index * 4096, 4096).enumerate() {
let CellData {
char_index,
vflip,
hflip,
palette_index,
} = CellData::parse(*cell);
let char = chardata.range::<u16>(char_index * 8, 8);
} = CellData::parse(cell);
let char = chardata.read::<[u16; 8]>(char_index);
let palette = &colors[palette_index];
for row in 0..8 {
let y = row + (i / 64) * 8;
for (col, pixel) in utils::read_char_row(char, hflip, vflip, row).enumerate() {
for (col, pixel) in utils::read_char_row(&char, hflip, vflip, row).enumerate() {
let x = col + (i % 64) * 8;
image.write((x, y), palette[pixel as usize]);
}
@@ -276,7 +272,7 @@ impl BgMapRenderer {
let brightness = self.brightness.borrow();
let palettes = self.palettes.borrow();
let brts = brightness.range::<u8>(0, 8);
let brts = brightness.read::<[u8; 8]>(0);
let cell = bgmaps.read::<u16>(index);
@@ -286,15 +282,15 @@ impl BgMapRenderer {
hflip,
palette_index,
} = CellData::parse(cell);
let char = chardata.range::<u16>(char_index * 8, 8);
let char = chardata.read::<[u16; 8]>(char_index);
let palette = if generic_palette {
utils::generic_palette(Color32::RED)
} else {
utils::parse_palette(palettes.read(palette_index * 2), brts, Color32::RED)
utils::parse_palette(palettes.read(palette_index * 2), &brts, Color32::RED)
};
for row in 0..8 {
for (col, pixel) in utils::read_char_row(char, hflip, vflip, row).enumerate() {
for (col, pixel) in utils::read_char_row(&char, hflip, vflip, row).enumerate() {
image.write((col, row), palette[pixel as usize]);
}
}
src/window/vram/chardata.rs
+6 -6
View File
@@ -221,8 +221,8 @@ impl CharacterDataWindow {
};
let palette = self.palettes.borrow().read(offset);
let brightnesses = self.brightness.borrow();
let brts = brightnesses.range(0, 8);
utils::parse_palette(palette, brts, Color32::RED)
let brts = brightnesses.read(0);
utils::parse_palette(palette, &brts, Color32::RED)
}
fn show_chardata(&mut self, ui: &mut Ui) {
@@ -321,7 +321,7 @@ impl CharDataRenderer {
let palette = self.load_palette(palette);
let chardata = self.chardata.borrow();
let character = chardata.range::<u16>(index * 8, 8);
for (row, pixels) in character.iter().enumerate() {
for (row, pixels) in character.enumerate() {
for col in 0..8 {
let char = (pixels >> (col * 2)) & 0x03;
image.write((col, row), palette[char as usize]);
@@ -332,7 +332,7 @@ impl CharDataRenderer {
fn render_character_data(&self, image: &mut VramImage, palette: VramPalette) {
let palette = self.load_palette(palette);
let chardata = self.chardata.borrow();
for (row, pixels) in chardata.range::<u16>(0, 8 * 2048).iter().enumerate() {
for (row, pixels) in chardata.range::<u16>(0, 8 * 2048).enumerate() {
let char_index = row / 8;
let row_index = row % 8;
let x = (char_index % 16) * 8;
@@ -350,7 +350,7 @@ impl CharDataRenderer {
};
let palette = self.palettes.borrow().read(offset);
let brightnesses = self.brightness.borrow();
let brts = brightnesses.range(0, 8);
utils::parse_palette(palette, brts, Color32::RED)
let brts = brightnesses.read(0);
utils::parse_palette(palette, &brts, Color32::RED)
}
}
src/window/vram/object.rs
+4 -4
View File
@@ -282,7 +282,7 @@ impl ObjectRenderer {
return;
}
let brts = brightness.range::<u8>(0, 8);
let brts = brightness.read::<[u8; 8]>(0);
let (x, y) = if use_pos {
let x = match eye {
Eye::Left => obj.x - obj.parallax,
@@ -298,11 +298,11 @@ impl ObjectRenderer {
Eye::Right => params.right_color,
};
let char = chardata.range::<u16>(obj.data.char_index * 8, 8);
let char = chardata.read::<[u16; 8]>(obj.data.char_index);
let palette = if params.generic_palette {
utils::generic_palette(color)
} else {
utils::parse_palette(palettes.read(8 + obj.data.palette_index * 2), brts, color)
utils::parse_palette(palettes.read(8 + obj.data.palette_index * 2), &brts, color)
};
for row in 0..8 {
@@ -311,7 +311,7 @@ impl ObjectRenderer {
continue;
}
for (col, pixel) in
utils::read_char_row(char, obj.data.hflip, obj.data.vflip, row).enumerate()
utils::read_char_row(&char, obj.data.hflip, obj.data.vflip, row).enumerate()
{
let real_x = x + col as i16;
if !(0..384).contains(&real_x) {
src/window/vram/utils.rs
+2 -2
View File
@@ -10,7 +10,7 @@ pub fn generic_palette(color: Color32) -> [Color32; 4] {
GENERIC_PALETTE.map(|brt| shade(brt, color))
}
pub fn parse_palette(palette: u8, brts: &[u8], color: Color32) -> [Color32; 4] {
pub fn parse_palette(palette: u8, brts: &[u8; 8], color: Color32) -> [Color32; 4] {
let shades = [
Color32::BLACK,
shade(brts[0], color),
@@ -117,7 +117,7 @@ impl CellData {
}
pub fn read_char_row(
char: &[u16],
char: &[u16; 8],
hflip: bool,
vflip: bool,
row: usize,