From 8ed667fe5c7455415a81341a926ac67d3ce8f5d0 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 18 Oct 2023 01:10:30 -0400 Subject: [PATCH] second: moving more things into place --- demos/second/NOTES | 39 ++++++++++++++ demos/second/graphics/icekngdm.hgr | Bin 8192 -> 0 bytes demos/second/music.s | 4 +- demos/second/part08_gorilla/graphics/Makefile | 17 ++++++ .../graphics/mntscrl3.hgr | Bin demos/second/part09_leaves/graphics/Makefile | 17 ++++++ .../{ => part09_leaves}/graphics/final3.hgr | Bin demos/second/part16_ocean/graphics/Makefile | 50 ++++++++++++++++++ .../part16_ocean/graphics/frame00000018.png | Bin 0 -> 5403 bytes .../part16_ocean/graphics/frame00000019.png | Bin 0 -> 5203 bytes .../part16_ocean/graphics/frame00000020.png | Bin 0 -> 5356 bytes .../part16_ocean/graphics/frame00000021.png | Bin 0 -> 5449 bytes .../part16_ocean/graphics/frame00000022.png | Bin 0 -> 5242 bytes .../part16_ocean/graphics/frame00000023.png | Bin 0 -> 5484 bytes demos/second/part16_ocean/ocean.s | 31 ++++++++--- demos/second/part17_polar/graphics/Makefile | 29 ++++++++++ .../second/part17_polar/graphics/icekngdm.png | Bin 0 -> 7491 bytes demos/second/part17_polar/graphics/polar2.png | Bin 0 -> 7008 bytes demos/second/qload.s | 2 +- demos/second/start.s | 7 +++ 20 files changed, 187 insertions(+), 9 deletions(-) create mode 100644 demos/second/NOTES delete mode 100644 demos/second/graphics/icekngdm.hgr create mode 100644 demos/second/part08_gorilla/graphics/Makefile rename demos/second/{ => part08_gorilla}/graphics/mntscrl3.hgr (100%) create mode 100644 demos/second/part09_leaves/graphics/Makefile rename demos/second/{ => part09_leaves}/graphics/final3.hgr (100%) create mode 100644 demos/second/part16_ocean/graphics/frame00000018.png create mode 100644 demos/second/part16_ocean/graphics/frame00000019.png create mode 100644 demos/second/part16_ocean/graphics/frame00000020.png create mode 100644 demos/second/part16_ocean/graphics/frame00000021.png create mode 100644 demos/second/part16_ocean/graphics/frame00000022.png create mode 100644 demos/second/part16_ocean/graphics/frame00000023.png create mode 100644 demos/second/part17_polar/graphics/Makefile create mode 100644 demos/second/part17_polar/graphics/icekngdm.png create mode 100644 demos/second/part17_polar/graphics/polar2.png diff --git a/demos/second/NOTES b/demos/second/NOTES new file mode 100644 index 00000000..54ad20bc --- /dev/null +++ b/demos/second/NOTES @@ -0,0 +1,39 @@ +Disk Usage: + +fake_bios: 4k 90% +intro_pan: 10k 33% +chess_shapes: 12k 5% +tunnel: 1k 25% +circles/lines: 4k? 0% +gorilla: 5k 50% +leaves: 5k 25% +lens/rotozoom: 4k 50% +plasma: 4k? 25% +plasmacube: 4k? 10% +dotbounce: 4k? 0% +transmission: 8k? 0% +ocean: 24k 90% +polar: 5k 50% +3d: 32k 75% +nuts: 5k 90% +credits: 8k 0% + ============== + 139k + + +RAM usage: + MAIN AUX + ---- --- +$00 ZP ZP +$01 Stack Stack +$02-$03 +$04-$07 Lores page1 ??? 1k +$08-$0B Lores page2 ??? 1k +$0C-$0F ?? ??? 1k +$10-$1F library code ??? 4k +$20-$3F hires page1 ??? 8k +$40-$5F hires page2 ??? 8k +$60-$BF current code ??? 24k +$C0-$CF I/O I/O +$D0-$FF music ??? 12k +$D0-$DF ?? ??? 4k diff --git a/demos/second/graphics/icekngdm.hgr b/demos/second/graphics/icekngdm.hgr deleted file mode 100644 index 5b80a73dfbdd047e74313f888c82367ac907d237..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8192 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 P7({LzALOUW?-c(Bx^~SQ diff --git a/demos/second/music.s b/demos/second/music.s index d018540b..3e7be828 100644 --- a/demos/second/music.s +++ b/demos/second/music.s @@ -28,6 +28,6 @@ PT3_ENABLE_APPLE_IIC = 1 .align $100 PT3_LOC: ;.incbin "music/z00m_unreal2_part1.pt3" -;.incbin "music/z00m_unreal2_part2.pt3" -.incbin "music/second_3d.pt3" +.incbin "music/z00m_unreal2_part2.pt3" +;.incbin "music/second_3d.pt3" diff --git a/demos/second/part08_gorilla/graphics/Makefile b/demos/second/part08_gorilla/graphics/Makefile new file mode 100644 index 00000000..3ed9ac99 --- /dev/null +++ b/demos/second/part08_gorilla/graphics/Makefile @@ -0,0 +1,17 @@ +include ../../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 +PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr +PNG2GR = ../../../../utils/gr-utils/png2gr + +all: mntscrl3.hgr.zx02 + +#### + +mntscrl3.hgr.zx02: mntscrl3.hgr + $(ZX02) mntscrl3.hgr mntscrl3.hgr.zx02 + +#### + +clean: + rm -f *~ diff --git a/demos/second/graphics/mntscrl3.hgr b/demos/second/part08_gorilla/graphics/mntscrl3.hgr similarity index 100% rename from demos/second/graphics/mntscrl3.hgr rename to demos/second/part08_gorilla/graphics/mntscrl3.hgr diff --git a/demos/second/part09_leaves/graphics/Makefile b/demos/second/part09_leaves/graphics/Makefile new file mode 100644 index 00000000..63f4dbf5 --- /dev/null +++ b/demos/second/part09_leaves/graphics/Makefile @@ -0,0 +1,17 @@ +include ../../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 +PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr +PNG2GR = ../../../../utils/gr-utils/png2gr + +all: final3.hgr.zx02 + +#### + +final3.hgr.zx02: final3.hgr + $(ZX02) final3.hgr final3.hgr.zx02 + +#### + +clean: + rm -f *~ diff --git a/demos/second/graphics/final3.hgr b/demos/second/part09_leaves/graphics/final3.hgr similarity index 100% rename from demos/second/graphics/final3.hgr rename to demos/second/part09_leaves/graphics/final3.hgr diff --git a/demos/second/part16_ocean/graphics/Makefile b/demos/second/part16_ocean/graphics/Makefile index 1e931e3b..c17e2380 100644 --- a/demos/second/part16_ocean/graphics/Makefile +++ b/demos/second/part16_ocean/graphics/Makefile @@ -7,6 +7,9 @@ PNG2GR = ../../../../utils/gr-utils/png2gr all: frame00000002.hgr.zx02 frame00000003.hgr.zx02 \ frame00000004.hgr.zx02 frame00000005.hgr.zx02 \ frame00000006.hgr.zx02 frame00000007.hgr.zx02 \ + frame00000018.hgr.zx02 frame00000019.hgr.zx02 \ + frame00000020.hgr.zx02 frame00000021.hgr.zx02 \ + frame00000022.hgr.zx02 frame00000023.hgr.zx02 \ frame00000024.hgr.zx02 frame00000025.hgr.zx02 \ frame00000026.hgr.zx02 frame00000027.hgr.zx02 \ frame00000028.hgr.zx02 frame00000029.hgr.zx02 \ @@ -61,6 +64,53 @@ frame00000007.hgr.zx02: frame00000007.hgr frame00000007.hgr: frame00000007.png $(PNG_TO_HGR) frame00000007.png > frame00000007.hgr +#### + +frame00000018.hgr.zx02: frame00000018.hgr + $(ZX02) frame00000018.hgr frame00000018.hgr.zx02 + +frame00000018.hgr: frame00000018.png + $(PNG_TO_HGR) frame00000018.png > frame00000018.hgr + +#### + +frame00000019.hgr.zx02: frame00000019.hgr + $(ZX02) frame00000019.hgr frame00000019.hgr.zx02 + +frame00000019.hgr: frame00000019.png + $(PNG_TO_HGR) frame00000019.png > frame00000019.hgr + +#### + +frame00000020.hgr.zx02: frame00000020.hgr + $(ZX02) frame00000020.hgr frame00000020.hgr.zx02 + +frame00000020.hgr: frame00000020.png + $(PNG_TO_HGR) frame00000020.png > frame00000020.hgr + +#### + +frame00000021.hgr.zx02: frame00000021.hgr + $(ZX02) frame00000021.hgr frame00000021.hgr.zx02 + +frame00000021.hgr: frame00000021.png + $(PNG_TO_HGR) frame00000021.png > frame00000021.hgr + +#### + +frame00000022.hgr.zx02: frame00000022.hgr + $(ZX02) frame00000022.hgr frame00000022.hgr.zx02 + +frame00000022.hgr: frame00000022.png + $(PNG_TO_HGR) frame00000022.png > frame00000022.hgr + +#### + +frame00000023.hgr.zx02: frame00000023.hgr + $(ZX02) frame00000023.hgr frame00000023.hgr.zx02 + +frame00000023.hgr: frame00000023.png + $(PNG_TO_HGR) frame00000023.png > frame00000023.hgr #### diff --git a/demos/second/part16_ocean/graphics/frame00000018.png b/demos/second/part16_ocean/graphics/frame00000018.png new file mode 100644 index 0000000000000000000000000000000000000000..40730ee4704edc3d34b7da9fafbb4ed4e9e2ddbf GIT binary patch literal 5403 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 literal 0 HcmV?d00001 diff --git a/demos/second/part16_ocean/graphics/frame00000019.png b/demos/second/part16_ocean/graphics/frame00000019.png new file mode 100644 index 0000000000000000000000000000000000000000..0acab7faac6e2ab87e215b144968162ce1dcddef GIT binary patch literal 5203 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 L=5u^W)TaLeaP{D; literal 0 HcmV?d00001 diff --git a/demos/second/part16_ocean/graphics/frame00000023.png b/demos/second/part16_ocean/graphics/frame00000023.png new file mode 100644 index 0000000000000000000000000000000000000000..5837227781c8d11265223e6aa2b832f16418d2ed GIT binary patch literal 5484 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 NJL@f0zgc+g|2Nobg=PQ% literal 0 HcmV?d00001 diff --git a/demos/second/part16_ocean/ocean.s b/demos/second/part16_ocean/ocean.s index eab42b93..0ed27787 100644 --- a/demos/second/part16_ocean/ocean.s +++ b/demos/second/part16_ocean/ocean.s @@ -62,7 +62,7 @@ ocean_loop: inc COUNT lda COUNT - cmp #20 + cmp #32 bne no_count_oflo lda #6 @@ -79,21 +79,29 @@ frame_data_l: .byte frame02_data,>frame03_data,>frame04_data,>frame05_data .byte >frame06_data,>frame07_data + .byte >frame18_data,>frame19_data + .byte >frame20_data,>frame21_data,>frame22_data,>frame23_data .byte >frame24_data,>frame25_data,>frame26_data,>frame27_data .byte >frame28_data,>frame29_data,>frame30_data,>frame31_data - .byte >frame30_data,>frame29_data,>frame28_data - .byte >frame27_data,>frame26_data,>frame25_data;,>frame24_data + .byte >frame30_data,>frame29_data + .byte >frame28_data,>frame27_data,>frame26_data,>frame25_data + .byte >frame24_data,>frame23_data,>frame22_data,>frame21_data + .byte >frame20_data,>frame19_data frame02_data: .incbin "graphics/frame00000002.hgr.zx02" @@ -108,7 +116,18 @@ frame06_data: frame07_data: .incbin "graphics/frame00000007.hgr.zx02" - +frame18_data: + .incbin "graphics/frame00000018.hgr.zx02" +frame19_data: + .incbin "graphics/frame00000019.hgr.zx02" +frame20_data: + .incbin "graphics/frame00000020.hgr.zx02" +frame21_data: + .incbin "graphics/frame00000021.hgr.zx02" +frame22_data: + .incbin "graphics/frame00000022.hgr.zx02" +frame23_data: + .incbin "graphics/frame00000023.hgr.zx02" frame24_data: .incbin "graphics/frame00000024.hgr.zx02" frame25_data: diff --git a/demos/second/part17_polar/graphics/Makefile b/demos/second/part17_polar/graphics/Makefile new file mode 100644 index 00000000..96074483 --- /dev/null +++ b/demos/second/part17_polar/graphics/Makefile @@ -0,0 +1,29 @@ +include ../../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 +PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr +PNG2GR = ../../../../utils/gr-utils/png2gr + +all: icekngdm.hgr.zx02 polar2.hgr.zx02 + + +#### + +icekngdm.hgr: icekngdm.png + $(PNG_TO_HGR) icekngdm.png > icekngdm.hgr + +icekngdm.hgr.zx02: icekngdm.hgr + $(ZX02) icekngdm.hgr icekngdm.hgr.zx02 + +#### + +polar2.hgr: polar2.png + $(PNG_TO_HGR) polar2.png > polar2.hgr + +polar2.hgr.zx02: polar2.hgr + $(ZX02) polar2.hgr polar2.hgr.zx02 + +#### + +clean: + rm -f *~ diff --git a/demos/second/part17_polar/graphics/icekngdm.png b/demos/second/part17_polar/graphics/icekngdm.png new file mode 100644 index 0000000000000000000000000000000000000000..1d6522778c88a65f90e06ff477acde36001c2566 GIT binary patch literal 7491 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 literal 0 HcmV?d00001 diff --git a/demos/second/qload.s b/demos/second/qload.s index e99261f6..2a13803d 100644 --- a/demos/second/qload.s +++ b/demos/second/qload.s @@ -177,7 +177,7 @@ sector_array: length_array: .byte 16, 32, 84, 16 ; SECOND, MUSIC, INTRO, TUNNEL - .byte 128,64 ; 3D, OCEAN + .byte 128,96 ; 3D, OCEAN .include "lc_detect.s" .include "wait.s" diff --git a/demos/second/start.s b/demos/second/start.s index d7a0f842..c1d34bc1 100644 --- a/demos/second/start.s +++ b/demos/second/start.s @@ -249,6 +249,13 @@ load_loop: jsr load_file + ; setup music + ; ocean=pattern24 (3:07) pattern#43 + + lda #43 + sta $55A+$D000 ;current_pattern_smc+1 + jsr $559+$D000 ; pt3_set_pattern + cli ; jmp $4000