ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix object positions in debugger (getting + setting), documentation.

This commit is contained in:
Christian Speckner 2017-08-22 15:15:20 +02:00
parent 11d659e5cc
commit 5661b245c7
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/emucore/tia/Ball.cxx
View File

@ -251,8 +251,16 @@ void Ball::applyColors()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 Ball::getPosition() const
{
// position =
// current playfield x +
// (current counter - 156 (the decode clock of copy 0)) +
// clock count after decode until first pixel +
// 1 (it'll take another cycle after the decode for the rendter counter to start ticking)
//
// The result may be negative, so we add 160 and do the modulus -> 317 = 156 + 160 + 1
//
// Mind the sign of renderCounterOffset: it's defined negative above
return (316 - myCounter - Count::renderCounterOffset + myTIA->getPosition()) % 160;
return (317 - myCounter - Count::renderCounterOffset + myTIA->getPosition()) % 160;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -260,7 +268,8 @@ void Ball::setPosition(uInt8 newPosition)
{
myTIA->flushLineCache();
myCounter = (316 - newPosition - Count::renderCounterOffset + myTIA->getPosition()) % 160;
// See getPosition for an explanation
myCounter = (317 - newPosition - Count::renderCounterOffset + myTIA->getPosition()) % 160;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

14
src/emucore/tia/Missile.cxx
View File

@ -264,15 +264,25 @@ void Missile::applyColors()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 Missile::getPosition() const
{
// position =
// current playfield x +
// (current counter - 156 (the decode clock of copy 0)) +
// clock count after decode until first pixel +
// 1 (it'll take another cycle after the decode for the rendter counter to start ticking)
//
// The result may be negative, so we add 160 and do the modulus
//
// Mind the sign of renderCounterOffset: it's defined negative above
return (316 - myCounter - Count::renderCounterOffset + myTIA->getPosition()) % 160;
return (317 - myCounter - Count::renderCounterOffset + myTIA->getPosition()) % 160;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Missile::setPosition(uInt8 newPosition)
{
myTIA->flushLineCache();
myCounter = (316 - newPosition - Count::renderCounterOffset + myTIA->getPosition()) % 160;
// See getPosition for an explanation
myCounter = (317 - newPosition - Count::renderCounterOffset + myTIA->getPosition()) % 160;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

15
src/emucore/tia/Player.cxx
View File

@ -397,10 +397,20 @@ void Player::applyColors()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 Player::getPosition() const
{
// Wide players are shifted by one pixel to the right
const uInt8 shift = myDivider == 1 ? 0 : 1;
// position =
// current playfield x +
// (current counter - 156 (the decode clock of copy 0)) +
// clock count after decode until first pixel +
// shift (accounts for wide player shift) +
// 1 (it'll take another cycle after the decode for the rendter counter to start ticking)
//
// The result may be negative, so we add 160 and do the modulus -> 317 = 156 + 160 + 1
//
// Mind the sign of renderCounterOffset: it's defined negative above
return (316 - myCounter - Count::renderCounterOffset + shift + myTIA->getPosition()) % 160;
return (317 - myCounter - Count::renderCounterOffset + shift + myTIA->getPosition()) % 160;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -410,7 +420,8 @@ void Player::setPosition(uInt8 newPosition)
const uInt8 shift = myDivider == 1 ? 0 : 1;
myCounter = (316 - newPosition - Count::renderCounterOffset + shift + myTIA->getPosition()) % 160;
// See getPosition for an explanation
myCounter = (317 - newPosition - Count::renderCounterOffset + shift + myTIA->getPosition()) % 160;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -