logo_demo: update

demos/logo_demo/Makefile

@@ -5,10 +5,13 @@ TEXT_TO_PRODOS = ../../utils/prodos-utils/text_to_prodos
 EMPTY_DISK = ../../empty_disk/empty.po
 HGR2PNG = ../../utils/hgr-utils/png2hgr
 LINKER_SCRIPTS = ../../linker_scripts
+PNG2HGR = ../../utils/hgr-utils/png2hgr
+LZSA = ~/research/lzsa/lzsa/lzsa
+
 
 all:	logo_demo.dsk
 
-logo_demo.dsk:	LOGO3 MUSIC DEMO
+logo_demo.dsk:	LOGO3 MUSIC DEMO map.lzsa
 	cp ../../logo/dsks/apple_logo_ii.dsk ./logo_demo.dsk
 	$(PRODOS) -y logo_demo.dsk -t BIN -a 0x2000 SAVE LOGO3
 	$(PRODOS) -y logo_demo.dsk DELETE FORMAT
@@ -49,6 +52,14 @@ DEMO:	demo.logo
 
 ####
 
+map.lzsa:	map.hgr
+	$(LZSA) -r -f2 map.hgr map.lzsa
+
+map.hgr:	map.png
+	$(PNG2HGR) map.png > map.hgr
+
+####
+
 clean:
 	rm -f *~ *.o *.lst LOGO3 MUSIC DEMO
 

demos/logo_demo/demo.logo

@@ -1,32 +1,18 @@
 TO TTREE :N
-TPAIR :N
-RT 45
-TPAIR :N
-BK :N * 3
+TPAIR :N RT 45 TPAIR :N BK :N * 3
 END
 
 TO TPAIR :N
-TREE :N
-RT 180
-TREE :N
-SETH 0
+TREE :N RT 180 TREE :N SETH 0
 END
 
 TO TREE :LENGTH
 IF :LENGTH < 2 [STOP]
-LEFT 45
-FORWARD :LENGTH
+LT 45 FD :LENGTH
 TREE :LENGTH / 2
-BACK :LENGTH
-RIGHT 90
-FORWARD :LENGTH
+BK :LENGTH RT 90 FD :LENGTH
 TREE :LENGTH / 2
-BACK :LENGTH
-LEFT 45
-END
-
-TO SETUP :REF
-PU SETPOS :REF PD
+BK :LENGTH LT 45
 END
 
 TO CTREE
@@ -42,24 +28,17 @@ END
 
 TO DSR
 CS
-PU
-SETPOS [-45 75]
-PD
-SETHEADING 180
+PU SETPOS [-45 75]
+PD SETH 180
 FD 100 RT 90 FD 50 RT 90 FD 50 RT 90 FD 50
-PU
-SETPOS [25 25]
-LT 180
-PD
-FD 50 LT 90 FD 25 LT 90 FD 50 RT 90 FD 25 RT 90 FD 50
-PU
-SETPOS [45 -25]
-PD
-RT 90 FD 50 RT 90 FD 50
-PU
-SETPOS [-110 -45]
-PD
-FD 220
+PU SETPOS [25 25] LT 180
+PD FD 50 LT 90 FD 25 LT 90 FD 50 RT 90 FD 25 RT 90 FD 50
+PU SETPOS [45 -25]
+PD RT 90 FD 50 RT 90 FD 50
+PU SETPOS [-110 -45]
+PD FD 220
+LT 90 PU FD 10 LT 45
+REPEAT 8 [WAIT 15 RT 90 WAIT 15 LT 90]
 END
 
 TO SUN
@@ -72,25 +51,22 @@ REPEAT 9 [RT 40 PU SETPOS [-100 80] FD 25 PD BK 10]
 END
 
 TO WATER
-PU
-SETPC 5
-SETPOS [140 0]
-PD
-SETHEADING 180
-FD 119 RT 90 FD 280 RT 90 FD 119
+PU SETPC 5 SETPOS [140 0]
+PD SETH 180 FD 119 RT 90 FD 280 RT 90 FD 119
 RT 45
 REPEAT 20 [FD 10 RT 90 FD 10 LT 90]
-SETPOS 10 10
-FILL
+BK 10 FILL
 END
 
 TO BOAT
 PU
 SETPC 3
-SETHEADING 90
+SETH 90
 SETPOS [0 20]
 PD
-FD 50 RT 135 FD 35 RT 45 FD 50 RT 45 FD 35 RT 135 FD 50
+FD 50 RT 135 FD 35 RT 45
+PU FD 50 PD
+RT 45 FD 35 RT 135 FD 50
 LT 90
 FD 75 RT 30
 SETPC 1
@@ -98,25 +74,25 @@ REPEAT 3 [RT 120 FD 70]
 END
 
 TO FISH
-PU
-SETPOS [0 -50]
-SETHEADING 45
-PD
-REPEAT 40 [FD 1 RT 3]
-PU
-SETPOS [0 -50]
-PD
-SETHEADING 135
-REPEAT 40 [FD 1 LT 3]
+PU SETPOS [0 -50]
+PD SETPC 1 REPEAT 40 [FD 1 RT 3] RT 90
+REPEAT 40 [FD 1 RT 3] HT
 END
 
 TO OCEAN
+CS
 SUN
 BOAT
 WATER
 FISH
+WAIT 300
 END
 
+TO WARGAMES
+END
+
+TO PLASMA
+END
 
 TO POLYSPI4 :S :A :D :L
 IF :SIZE < :L [STOP]
@@ -124,15 +100,29 @@ FD :S RT :A
 POLYSPI4 (:S - :D) :A :D
 END
 
+TO POLY
+END
+
+TO MYST
+END
+
+TO CREDITS
+END
+
 TO DEMO
-CS
+CS FS
 .BLOAD "MA2E.PT3 4096
 .BLOAD "MUSIC 19456
 .CALL 19456
 DSR
 OCEAN
-REPEAT 100 [ CTREE ]
+WARGAMES
+PLASMA
+POLY
+MYST
+CS
+REPEAT 5 [ CTREE ]
+CREDITS
 END
 
 MAKE "STARTUP [DEMO]
-