6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 01:30:56 +00:00
Code Issues Projects Releases Wiki Activity

Made first attempt at missile display. In Enduro, at least, one seems to work but the other seems to be absent.

Browse Source
This commit is contained in:
Thomas Harte 2015-07-30 21:09:18 -04:00
parent 1b7846f09b
commit a95b36a53d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Machines/Atari2600.cpp
View File

@ -62,10 +62,11 @@ void Machine::get_output_pixel(uint8_t *pixel, int offset)
// TODO: almost everything! // TODO: almost everything!
uint8_t playfieldColour = ((_playfieldControl&6) == 2) ? _playerColour[x / 20] : _playfieldColour; uint8_t playfieldColour = ((_playfieldControl&6) == 2) ? _playerColour[x / 20] : _playfieldColour;
uint8_t playerPixels[2]; uint8_t playerPixels[2], missilePixels[2];
for(int c = 0; c < 2; c++) for(int c = 0; c < 2; c++)
{ {
// figure out sprite colour
int flipMask = (_playerReflection[c]&0x8) ? 0 : 7; int flipMask = (_playerReflection[c]&0x8) ? 0 : 7;
int relativeTimer = _playerPosition[c] - _horizontalTimer; int relativeTimer = _playerPosition[c] - _horizontalTimer;
@ -101,13 +102,18 @@ void Machine::get_output_pixel(uint8_t *pixel, int offset)
playerPixels[c] = (_playerGraphics[c] >> (relativeTimer ^ flipMask)) &1; playerPixels[c] = (_playerGraphics[c] >> (relativeTimer ^ flipMask)) &1;
else else
playerPixels[c] = 0; playerPixels[c] = 0;
// figure out missile colour
int missileIndex = _missilePosition[c] - _horizontalTimer;
int missileSize = 1 << ((_playerAndMissileSize[c] >> 4)&3);
missilePixels[c] = (missileIndex >= 0 && missileIndex < missileSize && (_missileGraphicsEnable[c]&2)) ? 1 : 0;
} }
uint8_t outputColour = playfieldPixel ? playfieldColour : _backgroundColour; uint8_t outputColour = playfieldPixel ? playfieldColour : _backgroundColour;
if(!(_playfieldControl&0x04) || !playfieldPixel) { if(!(_playfieldControl&0x04) || !playfieldPixel) {
if (playerPixels[1]) outputColour = _playerColour[1]; if (playerPixels[1] || missilePixels[1]) outputColour = _playerColour[1];
if (playerPixels[0]) outputColour = _playerColour[0]; if (playerPixels[0] || missilePixels[0]) outputColour = _playerColour[0];
} }
pixel[0] = palette[outputColour >> 4][0]; pixel[0] = palette[outputColour >> 4][0];
@ -118,6 +124,7 @@ void Machine::get_output_pixel(uint8_t *pixel, int offset)
void Machine::output_pixels(int count) void Machine::output_pixels(int count)
{ {
_timestamp += count;
while(count--) while(count--)
{ {
OutputState state; OutputState state;
@ -181,8 +188,6 @@ int Machine::perform_bus_operation(CPU6502::BusOperation operation, uint16_t add
output_pixels(3); output_pixels(3);
_timestamp++;
// check for a ROM access // check for a ROM access
if ((address&0x1000) && isReadOperation(operation)) { if ((address&0x1000) && isReadOperation(operation)) {
// if(operation == CPU6502::BusOperation::ReadOpcode) printf("[%04x]\n", address); // if(operation == CPU6502::BusOperation::ReadOpcode) printf("[%04x]\n", address);
@ -267,6 +272,8 @@ int Machine::perform_bus_operation(CPU6502::BusOperation operation, uint16_t add
case 0x26: _playerGraphicsLatchEnable[1] = *value; break; case 0x26: _playerGraphicsLatchEnable[1] = *value; break;
case 0x27: _ballGraphicsEnableDelay = *value; break; case 0x27: _ballGraphicsEnableDelay = *value; break;
// case 0x28: _missilePosition[0] = _playerPosition[0]; break;
case 0x2a: case 0x2a:
_playerPosition[0] += (int8_t)_playerMotion[0] >> 4; _playerPosition[0] += (int8_t)_playerMotion[0] >> 4;
_playerPosition[1] += (int8_t)_playerMotion[1] >> 4; _playerPosition[1] += (int8_t)_playerMotion[1] >> 4;