add heart transitions

res/fx.conf

@@ -1 +1 @@
-RIPPLE
STAR.IN
SOFT.DIAGONAL
STAGGERWHITE.UD
RADIAL
STAGGER.LR
SOFT.UD
CRYSTAL
STAR.RIPPLE
BIT.FIZZLE
MEETINTHEMIDDLE
DIAGONAL
STAR
R.BY.PIXEL
SUNRISE
SOFT.L
SUNSET
SLOW.STAR.IN
IRIS.IN
CORNER.CIRCLE
CENTER.BY.PIXEL
DIAGONAL2
RIPPLE2
PALETTE.FIZZLE
RADIAL2
SPLIT.UD.INTRO
R.BY.2
HALF.FIZZLE
RADIAL3
DIAGONAL3
CORNER4.OUT
LATTICE
BAR.DISSOLVE
R.BY.PALETTE
FOURSPIRAL
SOFT.R
IRIS
CASCADE
AND
CHECKERBOARD
LR.BY.PIXEL
RADIAL4
CHECKER.FIZZLE
STAGGERWHITE.LR
SOFT.UD.OUT
ONESQUARE
FIZZLE
SLOW.STAR
DIAMOND
TWOPASS.LR
HALF.MOSAIC
RADIAL5
ARROW
FOURSQUARE
BLOCK.FIZZLE
DIAGONAL4
STAGGER.UD
INTERLOCK.LR
SOFT.UD.IN
BLOCK.MOSAIC
CORNER4.IN
INTERLOCK.UD
LITTLE.BOXES
SPIRAL
ARROW.WHITE
TRI.FIZZLE

[eof]

#
# transition effects for HGR slideshows
#
# Each Mega-Attract Module that is an HGR slideshow (see attract.conf)
# will use a single transition effect for the length of the module.
# Transition effects are loaded in the order listed in this file. Each line
# of this file is a filename (not including comments, like this one). The
# name of the next transition effect is stored in the global prefs, so this
# file should not contain duplicates.
#
# Transition effects are binary files loaded at $6000 and called with
# hi-res page 1 showing and the next HGR graphic already loaded at $4000.
# A transition effect can use $6000-$BFFF in main memory, zero page, and
# text page if needed (but preserve the screen holes). $800-$1FFF is reserved
# for the slideshow data. LC RAM banks 1 and 2 are reserved for the launcher.
#
# Important: LC RAM bank 1 will be read/write on entry and must be read/write
# on exit. If you need ROM routines, you are responsible for switching to ROM
# then switching back to RAM bank 1 (read/write) before returning.
#
+RIPPLE
STAR.IN
SOFT.DIAGONAL
STAGGERWHITE.UD
RADIAL
STAGGER.LR
SOFT.UD
HEART.IN
CRYSTAL
STAR.RIPPLE
BIT.FIZZLE
MEETINTHEMIDDLE
DIAGONAL
STAR
R.BY.PIXEL
SUNRISE
SOFT.L
HEART.RIPPLE
SUNSET
SLOW.STAR.IN
IRIS.IN
CORNER.CIRCLE
CENTER.BY.PIXEL
DIAGONAL2
RIPPLE2
PALETTE.FIZZLE
RADIAL2
SPLIT.UD.INTRO
R.BY.2
HALF.FIZZLE
RADIAL3
HEART
DIAGONAL3
CORNER4.OUT
LATTICE
BAR.DISSOLVE
R.BY.PALETTE
FOURSPIRAL
SOFT.R
IRIS
CASCADE
AND
CHECKERBOARD
LR.BY.PIXEL
RADIAL4
CHECKER.FIZZLE
STAGGERWHITE.LR
SOFT.UD.OUT
ONESQUARE
FIZZLE
SLOW.STAR
DIAMOND
TWOPASS.LR
HALF.MOSAIC
RADIAL5
ARROW
FOURSQUARE
BLOCK.FIZZLE
DIAGONAL4
STAGGER.UD
INTERLOCK.LR
SOFT.UD.IN
BLOCK.MOSAIC
CORNER4.IN
INTERLOCK.UD
LITTLE.BOXES
SPIRAL
ARROW.WHITE
TRI.FIZZLE

[eof]

#
# transition effects for HGR slideshows
#
# Each Mega-Attract Module that is an HGR slideshow (see attract.conf)
# will use a single transition effect for the length of the module.
# Transition effects are loaded in the order listed in this file. Each line
# of this file is a filename (not including comments, like this one). The
# name of the next transition effect is stored in the global prefs, so this
# file should not contain duplicates.
#
# Transition effects are binary files loaded at $6000 and called with
# hi-res page 1 showing and the next HGR graphic already loaded at $4000.
# A transition effect can use $6000-$BFFF in main memory, zero page, and
# text page if needed (but preserve the screen holes). $800-$1FFF is reserved
# for the slideshow data. LC RAM banks 1 and 2 are reserved for the launcher.
#
# Important: LC RAM bank 1 will be read/write on entry and must be read/write
# on exit. If you need ROM routines, you are responsible for switching to ROM
# then switching back to RAM bank 1 (read/write) before returning.
#

res/notes/transitions/slowheart.py

@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+
+from math import sqrt, sin, cos, acos, pi
+
+# Graph is plotted across the entire HGR screen, but only coordinates
+#  - in the left half of the screen, AND
+#  - on even rows, AND
+#  - on even columns
+# are included. It is assumed that the graph is symmetrical across
+# the left and half sides of the screen (along an axis at X=140).
+#
+# X coordinates are converted to byte+bitmask (but see notes below).
+# Y coordinates are incremented by 1 so that 0 can terminate the loop.
+#
+# 6502 code will be responsible for plotting each of these coordinates
+# in a 2x2 block. The bitmask usually includes 2 adjacent pixels;
+# the code will also plot the same 2 adjacent pixels in the adjacent row,
+# AND mirror both of those plots in the right half of the screen.
+#
+# Unfortunately, since bytes are 7 bits across, some blocks will cross a
+# byte boundary. To simplify the 6502 code, those are simply listed as
+# separate coordinate pairs, each with a bitmask that includes 1 pixel
+# instead of 2.
+
+max_x = 280
+max_y = 192
+radius_x = max_x//2
+radius_y = max_y//2
+
+def f(t, k):
+    return (k*16*sin(t)*sin(t)*sin(t), k*(13*cos(t)-5*cos(2*t)-2*cos(3*t)-cos(4*t)))
+
+coords = []
+for k_mul in range(2000):
+    for t_mul in range(int(2*pi*1000+1)):
+        a, b = f(float(t_mul)/1000.0, float(k_mul)/100.0)
+        x = round(radius_x+a*1.2)
+        y = round(radius_y+b)
+        if (x % 2 != 0) or (y % 2 != 0):
+            continue
+        if x < 0 or x >= max_x//2 or y < 0 or y >= max_y:
+            continue
+        coords.append((x,y))
+
+d = {}
+unique_coords = []
+for c in coords:
+    if not d.get(c):
+        unique_coords.append(c)
+        d[c] = 1
+
+unique_vals = []
+even_byte_bitmask = (0, 0, 1, 1, 2, 2, 3)
+odd_byte_bitmask = (5, 5, 6, 6, 7, 7, 4)
+for x, y in unique_coords:
+    y = 191 - y
+    aval = "$" + hex(y)[2:].rjust(2, "0").upper()
+    byte = x//7
+    if byte % 2 == 0:
+        # high 3 bits are 0-3, low 5 bits are 0-39
+        bval = "%" + bin(even_byte_bitmask[x % 7])[2:].rjust(3, "0") + bin(byte)[2:].rjust(5, "0")
+        unique_vals.append((aval, bval))
+        if x % 7 == 6:
+            # this 2x2 block will be split across bytes, so add an extra coordinate pair with the adjacent byte and high 3 bits = 4
+            bval = "%100" + bin(byte+1)[2:].rjust(5, "0") + ";"
+            unique_vals.append((aval, bval))
+    else:
+        # high 3 bits are 5-7 or 4, low 5 bits are 0-39
+        bval = "%" + bin(odd_byte_bitmask[x % 7])[2:].rjust(3, "0") + bin(byte)[2:].rjust(5, "0")
+        unique_vals.append((aval, bval))
+        if x % 7 == 6:
+            # this 2x2 block will be split across bytes, so add an extra coordinate pair with the adjacent byte and high 3 bits = 3
+            bval = "%011" + bin(byte+1)[2:].rjust(5, "0") + ";"
+            unique_vals.append((aval, bval))
+
+with open("../../../src/fx/fx.hgr.heart.data.a", "w") as f:
+    for aval, bval in unique_vals:
+        f.write("         !byte %s,%s\n" % (aval, bval))
+
+ripple_vals = []
+for i, j, k, l in zip(range(1920), range(1920,3840), range(3840,5760), range(5760,7680)):
+    ripple_vals.append(unique_vals[i])
+    ripple_vals.append(unique_vals[j])
+    ripple_vals.append(unique_vals[k])
+    ripple_vals.append(unique_vals[l])
+with open("../../../src/fx/fx.hgr.heart.ripple.data.a", "w") as f:
+    for aval, bval in ripple_vals:
+        f.write("         !byte %s,%s\n" % (aval, bval))
+
+unique_vals.reverse()
+with open("../../../src/fx/fx.hgr.heart.in.data.a", "w") as f:
+    for aval, bval in unique_vals:
+        f.write("         !byte %s,%s\n" % (aval, bval))

res/notes/transitions/slowripple.py

@@ -2,8 +2,8 @@
 
 from math import sqrt, sin, cos, pi
 
-radius_x = 280/2
-radius_y = 192/2
+radius_x = 280//2
+radius_y = 192//2
 
 def f(t):
     return (sqrt(t)*cos(2*pi*sqrt(t)), 0.87*sqrt(t)*sin(2*pi*sqrt(t)))

res/notes/transitions/slowstar2.py

@@ -26,7 +26,6 @@ max_x = 280
 max_y = 192
 
 def f(t, k):
-    t = float(t)
     r = k/cos(0.4*acos(sin(2.5*(t+pi/2))))
     return r*cos(t),r*sin(t)
 

src/fx/fx.hgr.heart.a

@@ -0,0 +1,14 @@
+;license:MIT
+;(c) 2019 by 4am
+;
+!cpu 6502
+!to "build/FX/HEART",plain
+*=$6000
+
+         !source "src/fx/fx.hgr.precomputed.2bit.a"
+
+         +FX_PRECOMPUTED_2BIT Coordinates
+
+Coordinates
+         !source "src/fx/fx.hgr.heart.data.a"
+         !byte $00

src/fx/fx.hgr.heart.in.a

@@ -0,0 +1,14 @@
+;license:MIT
+;(c) 2019 by 4am
+;
+!cpu 6502
+!to "build/FX/HEART.IN",plain
+*=$6000
+
+         !source "src/fx/fx.hgr.precomputed.2bit.a"
+
+         +FX_PRECOMPUTED_2BIT Coordinates
+
+Coordinates
+         !source "src/fx/fx.hgr.heart.in.data.a"
+         !byte $00

src/fx/fx.hgr.heart.ripple.a

@@ -0,0 +1,14 @@
+;license:MIT
+;(c) 2019 by 4am
+;
+!cpu 6502
+!to "build/FX/HEART.RIPPLE",plain
+*=$6000
+
+         !source "src/fx/fx.hgr.precomputed.2bit.a"
+
+         +FX_PRECOMPUTED_2BIT Coordinates
+
+Coordinates
+         !source "src/fx/fx.hgr.heart.ripple.data.a"
+         !byte $00