Emulation/Gopher2600
1
0
Fork 0
mirror of https://github.com/JetSetIlly/Gopher2600.git synced 2024-06-02 12:08:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplified/corrected string output for player, missile, ball sprites

Browse source
This commit is contained in:
JetSetIlly 2024-04-30 09:01:30 +01:00
parent 2d974cc9c1
commit 505661e3cf
3 changed files with 28 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
hardware/tia/video/ball.go
View file

@ -143,8 +143,6 @@ func (bs *BallSprite) String() string {
s.WriteString("]")
}
notes := false
if int(bs.Size) > len(ballSizesBrief) {
panic("illegal size value for ball")
}
@ -153,37 +151,25 @@ func (bs *BallSprite) String() string {
s.WriteString(" ")
}
s.Write([]byte(sz))
s.WriteString(",")
if bs.MoreHMOVE {
s.WriteString(" hmoving")
s.WriteString(fmt.Sprintf(" [%04b]", bs.Hmove))
notes = true
s.WriteString(fmt.Sprintf(" hmoving [%04b],", bs.Hmove))
}
if bs.Enclockifier.Active {
// add a comma if we've already noted something else
if notes {
s.WriteString(",")
}
s.WriteString(fmt.Sprintf(" drw %s", bs.Enclockifier.String()))
notes = true
s.WriteString(fmt.Sprintf(" drw %s,", bs.Enclockifier.String()))
}
if !bs.Enabled {
if notes {
s.WriteString(",")
}
s.WriteString(" disb")
notes = true
s.WriteString(" disb,")
}
if bs.VerticalDelay {
if notes {
s.WriteString(",")
}
s.WriteString(" vdel")
s.WriteString(" vdel,")
}
return s.String()
return strings.TrimSuffix(s.String(), ",")
}
func (bs *BallSprite) rsync(adjustment int) {

26
hardware/tia/video/missile.go
View file

@ -180,39 +180,23 @@ func (ms *MissileSprite) String() string {
panic("illegal size value for missile")
}
notes := false
if ms.MoreHMOVE {
s.WriteString(" hmoving")
s.WriteString(fmt.Sprintf(" [%04b]", ms.Hmove))
notes = true
s.WriteString(fmt.Sprintf(" hmoving [%04b],", ms.Hmove))
}
if ms.Enclockifier.Active {
// add a comma if we've already noted something else
if notes {
s.WriteString(",")
}
s.WriteString(fmt.Sprintf(" drw %s", ms.Enclockifier.String()))
notes = true
s.WriteString(fmt.Sprintf(" drw %s,", ms.Enclockifier.String()))
}
if !ms.Enabled {
if notes {
s.WriteString(",")
}
s.WriteString(" disb")
notes = true
s.WriteString(" disb,")
}
if ms.ResetToPlayer {
if notes {
s.WriteString(",")
}
s.WriteString(" >pl<")
s.WriteString(" >pl<,")
}
return s.String()
return strings.TrimSuffix(s.String(), ",")
}
func (ms *MissileSprite) rsync(adjustment int) {

54
hardware/tia/video/player.go
View file

@ -188,56 +188,43 @@ func (ps *PlayerSprite) String() string {
s.WriteString(fmt.Sprintf("> %#1x >", normalisedHmove))
s.WriteString(fmt.Sprintf(" %03d", ps.HmovedPixel))
if ps.MoreHMOVE {
s.WriteString("*] ")
s.WriteString("*]")
} else {
s.WriteString("] ")
s.WriteString("]")
}
// add a note to indicate that the nusiz value is about to update
if ps.ScanCounter.IsActive() && ps.SizeAndCopies != ps.ScanCounter.LatchedSizeAndCopies {
s.WriteString("*")
s.WriteString(" *")
}
// nusiz info
s.WriteString(" ")
if int(ps.SizeAndCopies) > len(playerSizesBrief) {
panic("illegal size value for player")
}
sz := playerSizesBrief[ps.SizeAndCopies]
if len(sz) > 0 {
s.WriteString(" ")
playerSize := playerSizesBrief[ps.SizeAndCopies]
if playerSize != "" {
s.WriteString(fmt.Sprintf(" %s", playerSize))
}
s.Write([]byte(sz))
// notes
notes := false
// hmove information
if ps.MoreHMOVE {
s.WriteString(" hmoving")
s.WriteString(fmt.Sprintf(" [%04b]", ps.Hmove))
notes = true
s.WriteString(fmt.Sprintf(" hmoving [%04b],", ps.Hmove))
}
// drawing or latching information
if ps.ScanCounter.IsActive() {
if notes {
s.WriteString(",")
}
s.WriteString(fmt.Sprintf(" drw (px %d", ps.ScanCounter.Pixel))
// add "sub-pixel" information
// add "sub-pixel" information. this happens when the player sprite is
// being stretched by NUSIZ
if ps.ScanCounter.count > 0 {
s.WriteString(fmt.Sprintf(".%d", ps.ScanCounter.count))
}
s.WriteString(")")
notes = true
s.WriteString("),")
} else if ps.ScanCounter.IsLatching() {
if notes {
s.WriteString(",")
}
s.WriteString(fmt.Sprintf(" latch (drw in %d)", ps.ScanCounter.latch))
s.WriteString(fmt.Sprintf(" latch (drw in %d),", ps.ScanCounter.latch))
}
// copy information if drawing or latching and nusiz is a multiple copy
@ -247,31 +234,22 @@ func (ps *PlayerSprite) String() string {
switch ps.ScanCounter.Cpy {
case 0:
case 1:
s.WriteString(" 2nd")
s.WriteString(" 2nd,")
case 2:
s.WriteString(" 3rd")
s.WriteString(" 3rd,")
default:
panic("more than 2 copies of player!?")
}
}
// additional notes
if ps.VerticalDelay {
if notes {
s.WriteString(",")
}
s.WriteString(" vdel")
notes = true
s.WriteString(" vdel,")
}
if ps.Reflected {
if notes {
s.WriteString(",")
}
s.WriteString(" ref")
s.WriteString(" ref,")
}
return s.String()
return strings.TrimSuffix(s.String(), ",")
}
func (ps *PlayerSprite) rsync(adjustment int) {