add SHR soft iris effects

res/SFX.CONF

@@ -48,17 +48,19 @@ SHR.RIPPLE
 SHR.TWOPASS.LR
 SHR.RADIAL
 SHR.80.SNAKE
+SHR.SOFT.IRIS
 SHR.DIAGONAL
 SHR.80.DOWN
-SHR.IRIS
+SHR.IRIS.IN
 SHR.LR
 SHR.RADIAL2
 SHR.80.SPIRAL
 SHR.FADEIN
-SHR.IRIS.IN
+SHR.SOFTIRIS.IN
 SHR.80.SIDE2
 SHR.LR2
 SHR.80.ARROW
+SHR.IRIS
 SHR.UD
 
 [eof]

res/notes/transitions/shr_softiris.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+from math import sqrt, sin, cos, acos, pi
+import util
+
+max_x = 320
+max_y = 200
+
+def f(t, k, a):
+    r = k/cos(0.4*acos(sin(2.5*(t+pi/2))))
+    return r*cos(t+a),r*sin(t+a)
+
+coords = []
+for k_mul in range(1000):
+    a = float(k_mul*pi/1000)
+    for t_mul in range(int(pi*1000+1)):
+        a, b = f(float(t_mul/100), float(k_mul)/10.0, a)
+        x = round(max_x//2+a*1.2)
+        y = round(max_y//2+b)
+        if (y % 2 != 0):
+            continue
+        if x < 0 or x >= max_x//2 or y < 0 or y >= max_y//2:
+            continue
+        coords.append((y,x//2))
+
+unique_coords = util.unique(coords)
+
+util.write("../../../src/fx/fx.shr.soft.iris.data.a", unique_coords, header="""!cpu 6502
+!to "build/FX/SHR.SFIRIS.DATA",plain
+*=$9F00
+""", footer="""         !byte 128
+""")

src/fx/fx.shr.soft.iris.a

@@ -0,0 +1,37 @@
+;license:MIT
+;(c) 2021 by 4am
+;
+!cpu 6502
+!to "build/FX.INDEXED/SHR.SOFT.IRIS",plain
+*=$A000
+
+shrlo    = $201           ; $C8 bytes
+CoordinatesFileCopy = $2C8; $11 bytes
+shrhi    = $301           ; $C8 bytes
+mirror_cols = $1E29       ; $A0 bytes but clobbers $28 bytes before
+mirror_rows = $1F01       ; $C7 bytes
+coords   = $9F00          ; $1F41 bytes
+
+         !source "src/fx/macros.a"
+         !source "src/fx/fx.shr.common.a"
+
+         +SHR_STAGE_1 shrlo, shrhi, mirror_rows, mirror_cols
+         jmp   stage2
+
+!pseudopc *-$300 {
+stage2
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +SHR_STAGE_2 startzp, endzp
+         rts
+
+startzp
+!pseudopc 0 {
+stage3
+         +SHR_STAGE_3 coords, shrlo, shrhi, mirror_rows, mirror_cols
+}
+endzp
+}
+
+CoordinatesFile
+         !byte 18
+         !text "FX/SHR.SFIRIS.DATA"

src/fx/fx.shr.soft.iris.in.a

@@ -0,0 +1,38 @@
+;license:MIT
+;(c) 2021 by 4am
+;
+!cpu 6502
+!to "build/FX.INDEXED/SHR.SOFTIRIS.IN",plain
+*=$A000
+
+shrlo    = $201           ; $C8 bytes
+CoordinatesFileCopy = $2C8; $11 bytes
+shrhi    = $301           ; $C8 bytes
+mirror_cols = $1E29       ; $A0 bytes but clobbers $28 bytes before
+mirror_rows = $1F01       ; $C7 bytes
+coords   = $9F00          ; $1F41 bytes
+
+         !source "src/fx/macros.a"
+         !source "src/fx/fx.shr.common.a"
+
+         +SHR_STAGE_1 shrlo, shrhi, mirror_rows, mirror_cols
+         jmp   stage2
+
+!pseudopc *-$300 {
+stage2
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +SHR_REVERSE coords
+         +SHR_STAGE_2 startzp, endzp
+         rts
+
+startzp
+!pseudopc 0 {
+stage3
+         +SHR_STAGE_3 coords, shrlo, shrhi, mirror_rows, mirror_cols
+}
+endzp
+}
+
+CoordinatesFile
+         !byte 18
+         !text "FX/SHR.SFIRIS.DATA"

src/index/artwork.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10963039
+         !be24  10963693
          !le16     4281

src/index/attract.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10915740
+         !be24  10916352
          !le16     5239

src/index/cache00.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10858599
+         !be24  10859211
          !le16     3586

src/index/cache01.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10870969
+         !be24  10871581
          !le16     3946

src/index/cache10.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10886368
+         !be24  10886980
          !le16     4998

src/index/cache11.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10904020
+         !be24  10904632
          !le16     5571

src/index/coverfade.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10967320
+         !be24  10967974
          !le16      410

src/index/credits.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10968074
+         !be24  10968728
          !le16      448

src/index/decrunch.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10968522
+         !be24  10969176
          !le16      303

src/index/dfx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10923125
+         !be24  10923737
          !le16     1242

src/index/dgr.fizzle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10967806
+         !be24  10968460
          !le16       67

src/index/dgr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10962980
+         !be24  10963634
          !le16       59

src/index/dhgr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10961650
+         !be24  10962304
          !le16     1249

src/index/dtitle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10947640
+         !be24  10948294
          !le16      464

src/index/fx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10920979
+         !be24  10921591
          !le16     2146

src/index/gamehelp.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10924683
+         !be24  10925337
          !le16     6149

src/index/gr.fizzle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10967730
+         !be24  10968384
          !le16       76

src/index/gr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10962899
+         !be24  10963553
          !le16       81

src/index/helptext.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10967873
+         !be24  10968527
          !le16      201

src/index/hgr0.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10948104
+         !be24  10948758
          !le16     4407

src/index/hgr1.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10952511
+         !be24  10953165
          !le16     1533

src/index/hgr2.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10954044
+         !be24  10954698
          !le16     1040

src/index/hgr3.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10955084
+         !be24  10955738
          !le16     3237

src/index/hgr4.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10958321
+         !be24  10958975
          !le16     2764

src/index/hgr5.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10961085
+         !be24  10961739
          !le16      460

src/index/hgr6.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10961545
+         !be24  10962199
          !le16      105

src/index/joystick.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10968825
+         !be24  10969479
          !le16     2370

src/index/miniattract.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10935745
+         !be24  10936399
          !le16     6149

src/index/prelaunch.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10909591
+         !be24  10910203
          !le16     6149

src/index/search00.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10850567
+         !be24  10851179
          !le16     8032

src/index/search01.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10862185
+         !be24  10862797
          !le16     8784

src/index/search10.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10874915
+         !be24  10875527
          !le16    11453

src/index/search11.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10891366
+         !be24  10891978
          !le16    12654

src/index/sfx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10924367
+         !be24  10924979
-         !le16      316
+         !le16      358

src/index/slideshow.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10930832
+         !be24  10931486
          !le16     4913

src/index/title.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10941894
+         !be24  10942548
          !le16     5746