Skip to content

Commit

Permalink
text fixes for vic imagesets
Browse files Browse the repository at this point in the history
  • Loading branch information
@yeastplume
yeastplume committed Sep 26, 2021
1 parent 49b8beb commit ea5d852
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions vera/src/asm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ fn test_assemble() -> Result<(), Error> {
let meta_str = meta_strs.to_string(Some(line_count))?;
line_count += num_lines;

let data_strs = prim.assemble_data(AsmFormat::Basic, false)?;
let data_strs = prim.assemble_data(AsmFormat::Basic, false, false)?;
let data_str = data_strs.to_string(Some(line_count))?;

println!("Meta Basic");
Expand All @@ -397,7 +397,7 @@ fn test_assemble() -> Result<(), Error> {
let meta_strs = prim.assemble_meta(AsmFormat::Ca65, false)?;
let meta_str = meta_strs.to_string(None)?;

let data_strs = prim.assemble_data(AsmFormat::Ca65, false)?;
let data_strs = prim.assemble_data(AsmFormat::Ca65, false, false)?;
let data_str = data_strs.to_string(None)?;

println!("Meta Ca65");
Expand Down
2 changes: 1 addition & 1 deletion vera/src/palette.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ mod test {
println!("palette: {}", palette);
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);
Ok(())
}
Expand Down
4 changes: 2 additions & 2 deletions vera/tests/bitmap.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ fn bitmap_load_8bpp() -> Result<(), Error> {
let code = sprite.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

// assemble BASIC
let line_start = 1000;
let asm = code.assemble_meta(crate::AsmFormat::Basic, false)?;
let len_to_add = asm.line_count();
println!("{}", asm.to_string(Some(line_start))?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(Some(line_start + len_to_add))?);

Ok(())
Expand Down
Binary file modified vera/tests/data/imageset/indexed-vic2-multicolor-tiled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions vera/tests/imageset.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ fn imageset_indexed_8_2_x_8_2bpp() -> Result<(), Error> {
let code = set.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

// assemble 4 BPP
Expand All @@ -253,7 +253,7 @@ fn imageset_indexed_8_2_x_8_2bpp() -> Result<(), Error> {
let code = set.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

// assemble 2 BPP
Expand All @@ -262,7 +262,7 @@ fn imageset_indexed_8_2_x_8_2bpp() -> Result<(), Error> {
let code = set.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

Ok(())
Expand Down Expand Up @@ -299,15 +299,15 @@ fn imageset_text_8_x_8_1bpp() -> Result<(), Error> {
let code = set.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

// assemble BASIC
let line_start = 1000;
let asm = code.assemble_meta(crate::AsmFormat::Basic, false)?;
let len_to_add = asm.line_count();
println!("{}", asm.to_string(Some(line_start))?);
let asm = code.assemble_data(crate::AsmFormat::Basic, false)?;
let asm = code.assemble_data(crate::AsmFormat::Basic, false, false)?;
println!("{}", asm.to_string(Some(line_start + len_to_add))?);

Ok(())
Expand Down Expand Up @@ -401,7 +401,7 @@ fn imageset_vic2_multicolor_bmp_tiled() -> Result<(), Error> {

let mut set = VeraImageSet::new("vic_set_1", 4, 8);
let mut config = VeraImageSetLoadConfig::default();
config.cull_duplicates = true;
config.cull_duplicates = false;
set.load_from_png(test_png.to_vec(), &config)?;
set.constrain_vic_bmp_color_cells = true;
set.format_indices(&palette, VeraPixelDepth::BPP4)?;
Expand Down
4 changes: 2 additions & 2 deletions vera/tests/sprite.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ fn sprite_load_4bpp() -> Result<(), Error> {
let code = sprite.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

// assemble BASIC
let line_start = 1000;
let asm = code.assemble_meta(crate::AsmFormat::Basic, false)?;
let len_to_add = asm.line_count();
println!("{}", asm.to_string(Some(line_start))?);
let asm = code.assemble_data(crate::AsmFormat::Basic, false)?;
let asm = code.assemble_data(crate::AsmFormat::Basic, false, false)?;
println!("{}", asm.to_string(Some(line_start + len_to_add))?);

Ok(())
Expand Down
12 changes: 6 additions & 6 deletions vera/tests/tilemap.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fn tilemap_32_x_32_x_16_8bpp() -> Result<(), Error> {
println!("palette: {}", palette);
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

Ok(())
Expand Down Expand Up @@ -116,7 +116,7 @@ fn tilemap_text_8_x_8() -> Result<(), Error> {
let code = tilemap.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

// Init tilemap again for 1BPP 256 mode
Expand All @@ -136,11 +136,11 @@ fn tilemap_text_8_x_8() -> Result<(), Error> {
let code = tilemap.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

// Conflated
let _asm = code.assemble_data(crate::AsmFormat::Ca65, true)?;
let _asm = code.assemble_data(crate::AsmFormat::Ca65, true, false)?;
//println!("{}", asm.to_string(None)?);

Ok(())
Expand Down Expand Up @@ -208,7 +208,7 @@ fn tilemap_128_x_32_x_16_4bpp() -> Result<(), Error> {
let code = tilemap.assemble()?;
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);
let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

Ok(())
Expand Down Expand Up @@ -274,7 +274,7 @@ fn tilemap_64_x_32_x_8_4bpp() -> Result<(), Error> {
let asm = code.assemble_meta(crate::AsmFormat::Ca65, false)?;
println!("{}", asm.to_string(None)?);

let asm = code.assemble_data(crate::AsmFormat::Ca65, false)?;
let asm = code.assemble_data(crate::AsmFormat::Ca65, false, false)?;
println!("{}", asm.to_string(None)?);

Ok(())
Expand Down

0 comments on commit ea5d852

Please sign in to comment.