6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-10-31 05:16:08 +00:00
Code Issues Projects Releases Wiki Activity

Groups background fetches and experimentally seeks to daub sprites as white.

Browse Source
This commit is contained in:
Thomas Harte
2018-10-06 22:07:04 -04:00
parent e6510dc87b
commit 338aec2930
2 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Components/9918/9918.cpp
View File

@@ -779,6 +779,14 @@ void Base::draw_sms(int start, int end) {
pixel_origin_[0] = pixel_origin_[1] = pixel_origin_[2] = pixel_origin_[3] = pixel_origin_[0] = pixel_origin_[1] = pixel_origin_[2] = pixel_origin_[3] =
pixel_origin_[4] = pixel_origin_[5] = pixel_origin_[6] = pixel_origin_[7] = pixel_origin_[4] = pixel_origin_[5] = pixel_origin_[6] = pixel_origin_[7] =
master_system_.colour_ram[16 + background_colour_]; master_system_.colour_ram[16 + background_colour_];
// EXPERIMENTAL: chuck sprite outlines on as a post-fix.
for(int c = 0; c < sprite_set_.fetched_sprite_slot; ++c) {
int x = -sprite_set_.active_sprites[c].shift_position;
for(int ox = x; ox < x+8; ox++) {
if(ox >= 0 && ox < 256) pixel_origin_[ox] = 0xffffffff;
}
}
} }
// const int pixels_left = pixels_end - output_column_; // const int pixels_left = pixels_end - output_column_;
// const int pixel_location = output_column_ - first_pixel_column_; // const int pixel_location = output_column_ - first_pixel_column_;

56
Components/9918/Implementation/9918Base.hpp
View File

@@ -213,9 +213,7 @@ class Base {
int index = 0; int index = 0;
int row = 0; int row = 0;
uint8_t info[4]; uint8_t image[4];
uint8_t image[2];
int shift_position = 0; int shift_position = 0;
} active_sprites[8]; } active_sprites[8];
@@ -582,13 +580,25 @@ class Base {
************************************************/ ************************************************/
template<bool use_end> void fetch_sms(int start, int end) { template<bool use_end> void fetch_sms(int start, int end) {
#define sprite_fetch(sprite) {\
sprite_set_.active_sprites[sprite].shift_position = -ram_[sprite_attribute_table_address_ + 128 + (sprite_set_.active_sprites[sprite].index << 1)] + (master_system_.shift_sprites_8px_left ? 8 : 0); \
sprite_set_.active_sprites[sprite].image[0] = \
sprite_set_.active_sprites[sprite].image[1] = \
sprite_set_.active_sprites[sprite].image[2] = \
sprite_set_.active_sprites[sprite].image[3] = 0xff; \
}
// size_t graphic_location = sprite_generator_table_address_; \
#define sprite_fetch_block(location, sprite) \ #define sprite_fetch_block(location, sprite) \
slot(location): \ slot(location): \
slot(location+1): \ slot(location+1): \
slot(location+2): \ slot(location+2): \
slot(location+3): \ slot(location+3): \
slot(location+4): \ slot(location+4): \
slot(location+5): slot(location+5): \
sprite_fetch(sprite);\
sprite_fetch(sprite+1);
/* /*
TODO: sprite_render_block should fetch: TODO: sprite_render_block should fetch:
@@ -614,32 +624,36 @@ class Base {
) + sub_row[(master_system_.names[column].flags&4) >> 2]; \ ) + sub_row[(master_system_.names[column].flags&4) >> 2]; \
} }
#define fetch_tile(column) {\ #define fetch_tile(column) \
master_system_.tile_graphics[column][0] = ram_[master_system_.names[column].offset]; \ master_system_.tile_graphics[column][0] = ram_[master_system_.names[column].offset]; \
master_system_.tile_graphics[column][1] = ram_[master_system_.names[column].offset+1]; \ master_system_.tile_graphics[column][1] = ram_[master_system_.names[column].offset+1]; \
master_system_.tile_graphics[column][2] = ram_[master_system_.names[column].offset+2]; \ master_system_.tile_graphics[column][2] = ram_[master_system_.names[column].offset+2]; \
master_system_.tile_graphics[column][3] = ram_[master_system_.names[column].offset+3]; \ master_system_.tile_graphics[column][3] = ram_[master_system_.names[column].offset+3];
}
#define background_render_block(location, column, sprite) \ #define background_render_block(location, column, sprite) \
slot(location): fetch_tile_name(column) \ slot(location): fetch_tile_name(column) \
external_slot(location+1); \ external_slot(location+1); \
slot(location+2): \ slot(location+2): \
slot(location+3): fetch_tile(column) \ slot(location+3): \
slot(location+4): fetch_tile_name(column+1) \ slot(location+4): \
sprite_y_read(location+5, sprite); \ fetch_tile(column) \
fetch_tile_name(column+1) \
sprite_y_read(location+5, sprite); \
slot(location+6): \ slot(location+6): \
slot(location+7): fetch_tile(column+1) \ slot(location+7): \
slot(location+8): fetch_tile_name(column+2) \ slot(location+8): \
sprite_y_read(location+9, sprite+2); \ fetch_tile(column+1) \
fetch_tile_name(column+2) \
sprite_y_read(location+9, sprite+2); \
slot(location+10): \ slot(location+10): \
slot(location+11): fetch_tile(column+2) \ slot(location+11): \
slot(location+12): fetch_tile_name(column+3) \ slot(location+12): \
sprite_y_read(location+13, sprite+4); \ fetch_tile(column+2) \
fetch_tile_name(column+3) \
sprite_y_read(location+13, sprite+4); \
slot(location+14): \ slot(location+14): \
slot(location+15): fetch_tile(column+3) slot(location+15): fetch_tile(column+3)
const int scrolled_row = (row_ + master_system_.vertical_scroll) % 224; const int scrolled_row = (row_ + master_system_.vertical_scroll) % 224;
const size_t pattern_address_base = (pattern_name_address_ | size_t(0x3ff)) & static_cast<size_t>(((scrolled_row & ~7) << 3) | 0x3800); const size_t pattern_address_base = (pattern_name_address_ | size_t(0x3ff)) & static_cast<size_t>(((scrolled_row & ~7) << 3) | 0x3800);
const size_t sub_row[2] = {static_cast<size_t>((scrolled_row & 7) << 2), 28 ^ static_cast<size_t>((scrolled_row & 7) << 2)}; const size_t sub_row[2] = {static_cast<size_t>((scrolled_row & 7) << 2), 28 ^ static_cast<size_t>((scrolled_row & 7) << 2)};