6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-19 08:31:11 +00:00
Code Issues Projects Releases Wiki Activity

Attempt full implementation of collisions.

Browse Source
This commit is contained in:
Thomas Harte 2021-11-29 18:39:33 -05:00
parent cd0148e0bc
commit eb3a0eb3c7
2 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Machines/Amiga/Bitplanes.hpp
View File

@ -46,6 +46,15 @@ class Bitplanes: public DMADevice<6, 2> {
BitplaneData next; BitplaneData next;
}; };
template <typename SourceT> constexpr SourceT bitplane_swizzle(SourceT value) {
return
(value&0x21) |
((value&0x02) << 2) |
((value&0x04) >> 1) |
((value&0x08) << 1) |
((value&0x10) >> 2);
}
class BitplaneShifter { class BitplaneShifter {
public: public:
/// Installs a new set of output pixels. /// Installs a new set of output pixels.

69
Machines/Amiga/Chipset.cpp
View File

@ -185,19 +185,6 @@ void Chipset::output_pixels(int cycles_until_sync) {
} }
} }
// Compute masks to test against sprites for collisions.
// TODO: there must be a better way than this?
// const uint32_t playfield_collisions = (playfield & playfield_collision_mask_) ^ playfield_collision_complement_;
// const int playfield_collisions_mask =
// (((playfield_collisions >> 22) | (playfield_collisions >> 24) | (playfield_collisions >> 26)) & 8) |
// (((playfield_collisions >> 15) | (playfield_collisions >> 17) | (playfield_collisions >> 19)) & 4) |
// (((playfield_collisions >> 14) | (playfield_collisions >> 16) | (playfield_collisions >> 18)) & 4) |
// (((playfield_collisions >> 21) | (playfield_collisions >> 23) | (playfield_collisions >> 25)) & 8) |
// (((playfield_collisions >> 8) | (playfield_collisions >> 10) | (playfield_collisions >> 12)) & 2) |
// (((playfield_collisions >> 7) | (playfield_collisions >> 9) | (playfield_collisions >> 11)) & 2) |
// (((playfield_collisions >> 1) | (playfield_collisions >> 3) | (playfield_collisions >> 5)) & 1) |
// (((playfield_collisions >> 0) | (playfield_collisions >> 2) | (playfield_collisions >> 4)) & 1);
// Compute masks potentially to obscure sprites. // Compute masks potentially to obscure sprites.
int playfield_odd_pixel_mask = int playfield_odd_pixel_mask =
(((playfield >> 22) | (playfield >> 24) | (playfield >> 26)) & 8) | (((playfield >> 22) | (playfield >> 24) | (playfield >> 26)) & 8) |
@ -218,6 +205,7 @@ void Chipset::output_pixels(int cycles_until_sync) {
} }
// Process sprites. // Process sprites.
int collision_masks[4] = {0, 0, 0, 0};
int index = int(sprite_shifters_.size()); int index = int(sprite_shifters_.size());
for(auto shifter = sprite_shifters_.rbegin(); shifter != sprite_shifters_.rend(); ++shifter) { for(auto shifter = sprite_shifters_.rbegin(); shifter != sprite_shifters_.rend(); ++shifter) {
// Update the index, and skip this shifter entirely if it's empty. // Update the index, and skip this shifter entirely if it's empty.
@ -225,8 +213,12 @@ void Chipset::output_pixels(int cycles_until_sync) {
const uint8_t data = shifter->get(); const uint8_t data = shifter->get();
if(!data) continue; if(!data) continue;
// Determine the collision mask, and mask out anything that's behind the playfield. // Determine the collision mask.
// const int collision_masks[index] = data | (data >> 1);
if(collisions_flags_ & (0x1000 << index)) {
collision_masks[index] |= (data >> 2) | (data >> 3);
}
collision_masks[index] = (collision_masks[index] & 0x01) | ((collision_masks[index] & 0x10) >> 3);
// Get the specific pixel mask. // Get the specific pixel mask.
const int pixel_mask = const int pixel_mask =
@ -274,6 +266,40 @@ void Chipset::output_pixels(int cycles_until_sync) {
} }
} }
// Compute playfield collision mask and populate collisions register.
const uint32_t playfield_collisions = (playfield & playfield_collision_mask_) ^ playfield_collision_complement_;
int playfield_collisions_mask =
(playfield_collisions | (playfield_collisions >> 1) | (playfield_collisions >> 2)) & 0x09090909;
playfield_collisions_mask =
playfield_collisions_mask | (playfield_collisions_mask >> 8) | (playfield_collisions_mask >> 15) | (playfield_collisions_mask >> 22);
const int playfield_collision_masks[2] = {
playfield_collisions_mask,
playfield_collisions_mask >> 3
};
// TODO: as below, but without conditionals...
collisions_ |=
((collision_masks[2] & collision_masks[3]) ? 0x4000 : 0x0000) |
((collision_masks[1] & collision_masks[3]) ? 0x2000 : 0x0000) |
((collision_masks[1] & collision_masks[2]) ? 0x1000 : 0x0000) |
((collision_masks[0] & collision_masks[3]) ? 0x0800 : 0x0000) |
((collision_masks[0] & collision_masks[2]) ? 0x0400 : 0x0000) |
((collision_masks[0] & collision_masks[1]) ? 0x0200 : 0x0000) |
((playfield_collision_masks[1] & collision_masks[3]) ? 0x0100 : 0x0000) |
((playfield_collision_masks[1] & collision_masks[2]) ? 0x0080 : 0x0000) |
((playfield_collision_masks[1] & collision_masks[1]) ? 0x0040 : 0x0000) |
((playfield_collision_masks[1] & collision_masks[0]) ? 0x0020 : 0x0000) |
((playfield_collision_masks[0] & collision_masks[3]) ? 0x0010 : 0x0000) |
((playfield_collision_masks[0] & collision_masks[2]) ? 0x0008 : 0x0000) |
((playfield_collision_masks[0] & collision_masks[1]) ? 0x0004 : 0x0000) |
((playfield_collision_masks[0] & collision_masks[0]) ? 0x0002 : 0x0000) |
((playfield_collision_masks[0] & playfield_collision_masks[1]) ? 0x0001 : 0x0000);
// Advance pixel pointer (if applicable). // Advance pixel pointer (if applicable).
if(pixels_) { if(pixels_) {
pixels_ += 4; pixels_ += 4;
@ -776,9 +802,9 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
case Write(0x098): // CLXCON case Write(0x098): // CLXCON
collisions_flags_ = cycle.value16(); collisions_flags_ = cycle.value16();
// Produce appropriate bitfield manipulation values. // Produce appropriate bitfield manipulation values, including shuffling the bits.
playfield_collision_mask_ = (collisions_flags_ & 0xfc0) >> 6; playfield_collision_mask_ = bitplane_swizzle(uint32_t((collisions_flags_ & 0xfc0) >> 6));
playfield_collision_complement_ = (collisions_flags_ & 0x3f) ^ 0x3f; playfield_collision_complement_ = bitplane_swizzle(uint32_t((collisions_flags_ & 0x3f) ^ 0x3f));
playfield_collision_mask_ |= (playfield_collision_mask_ << 8) | (playfield_collision_mask_ << 16) | (playfield_collision_mask_ << 24); playfield_collision_mask_ |= (playfield_collision_mask_ << 8) | (playfield_collision_mask_ << 16) | (playfield_collision_mask_ << 24);
playfield_collision_complement_ |= (playfield_collision_complement_ << 8) | (playfield_collision_complement_ << 16) | (playfield_collision_complement_ << 24); playfield_collision_complement_ |= (playfield_collision_complement_ << 8) | (playfield_collision_complement_ << 16) | (playfield_collision_complement_ << 24);
@ -1073,12 +1099,7 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
// instead of being indexed as [b4 b3 b2 b1 b0], index // instead of being indexed as [b4 b3 b2 b1 b0], index
// as [b3 b1 b4 b2 b0], and include a second set of the // as [b3 b1 b4 b2 b0], and include a second set of the
// 32 colours, stored as half-bright. // 32 colours, stored as half-bright.
const auto swizzled_address = const auto swizzled_address = bitplane_swizzle(entry_address & 0x1f);
(entry_address&0x01) |
((entry_address&0x02) << 2) |
((entry_address&0x04) >> 1) |
((entry_address&0x08) << 1) |
((entry_address&0x10) >> 2);
uint8_t *const swizzled_entry = reinterpret_cast<uint8_t *>(&swizzled_palette_[swizzled_address]); uint8_t *const swizzled_entry = reinterpret_cast<uint8_t *>(&swizzled_palette_[swizzled_address]);
swizzled_entry[0] = cycle.value8_high(); swizzled_entry[0] = cycle.value8_high();
swizzled_entry[1] = cycle.value8_low(); swizzled_entry[1] = cycle.value8_low();