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

Re-enabled collisions.

Browse Source
This commit is contained in:
Thomas Harte 2016-05-21 13:05:36 -04:00
parent b1c84f5402
commit 4eded9b9d0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Machines/Atari2600/Atari2600.cpp
View File

@ -206,25 +206,25 @@ uint8_t Machine::get_output_pixel()
} }
// accumulate collisions // accumulate collisions
/* if(playerPixels[0] | playerPixels[1]) { if(playerPixels[0] | playerPixels[1]) {
_collisions[0] |= ((missilePixels[0] & playerPixels[1]) << 7) | ((missilePixels[0] & playerPixels[0]) << 6); _collisions[0] |= ((missilePixels[0] & playerPixels[1]) << 7) | ((missilePixels[0] & playerPixels[0]) << 6);
_collisions[1] |= ((missilePixels[1] & playerPixels[0]) << 7) | ((missilePixels[1] & playerPixels[1]) << 6); _collisions[1] |= ((missilePixels[1] & playerPixels[0]) << 7) | ((missilePixels[1] & playerPixels[1]) << 6);
_collisions[2] |= ((playfieldPixel & playerPixels[0]) << 7) | ((ballPixel & playerPixels[0]) << 6); _collisions[2] |= ((_playfieldOutput & playerPixels[0]) << 7) | ((ballPixel & playerPixels[0]) << 6);
_collisions[3] |= ((playfieldPixel & playerPixels[1]) << 7) | ((ballPixel & playerPixels[1]) << 6); _collisions[3] |= ((_playfieldOutput & playerPixels[1]) << 7) | ((ballPixel & playerPixels[1]) << 6);
_collisions[7] |= ((playerPixels[0] & playerPixels[1]) << 7); _collisions[7] |= ((playerPixels[0] & playerPixels[1]) << 7);
} }
if(playfieldPixel | ballPixel) { if(_playfieldOutput | ballPixel) {
_collisions[4] |= ((playfieldPixel & missilePixels[0]) << 7) | ((ballPixel & missilePixels[0]) << 6); _collisions[4] |= ((_playfieldOutput & missilePixels[0]) << 7) | ((ballPixel & missilePixels[0]) << 6);
_collisions[5] |= ((playfieldPixel & missilePixels[1]) << 7) | ((ballPixel & missilePixels[1]) << 6); _collisions[5] |= ((_playfieldOutput & missilePixels[1]) << 7) | ((ballPixel & missilePixels[1]) << 6);
_collisions[6] |= ((playfieldPixel & ballPixel) << 7); _collisions[6] |= ((_playfieldOutput & ballPixel) << 7);
} }
if(missilePixels[0] & missilePixels[1]) if(missilePixels[0] & missilePixels[1])
_collisions[7] |= (1 << 6);*/ _collisions[7] |= (1 << 6);
// apply appropriate priority to pick a colour // apply appropriate priority to pick a colour
uint8_t playfieldPixel = _playfieldOutput | ballPixel; uint8_t playfieldPixel = _playfieldOutput | ballPixel;