From 189f68b27a352db4b93701eccea9c46be99dba48 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 29 Sep 2023 00:37:05 -0400 Subject: [PATCH] second: move roto code --- .../part10_lens_rotozoom/graphics/Makefile | 21 ++++++++++++++++++ .../graphics/lenspic.png | Bin .../second/{ => part10_lens_rotozoom}/roto.s | 12 +++++----- .../{ => part10_lens_rotozoom}/rotozoom.s | 0 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 demos/second/part10_lens_rotozoom/graphics/Makefile rename demos/second/{ => part10_lens_rotozoom}/graphics/lenspic.png (100%) rename demos/second/{ => part10_lens_rotozoom}/roto.s (93%) rename demos/second/{ => part10_lens_rotozoom}/rotozoom.s (100%) diff --git a/demos/second/part10_lens_rotozoom/graphics/Makefile b/demos/second/part10_lens_rotozoom/graphics/Makefile new file mode 100644 index 00000000..f7b823b1 --- /dev/null +++ b/demos/second/part10_lens_rotozoom/graphics/Makefile @@ -0,0 +1,21 @@ +include ../../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 +PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr +PNG2GR = ../../../../utils/gr-utils/png2gr + +all: lenspic.gr.zx02 + +#### + +lenspic.gr.zx02: lenspic.gr + $(ZX02) lenspic.gr lenspic.gr.zx02 + +lenspic.gr: lenspic.png + $(PNG2GR) lenspic.png lenspic.gr + + +#### + +clean: + rm -f *~ diff --git a/demos/second/graphics/lenspic.png b/demos/second/part10_lens_rotozoom/graphics/lenspic.png similarity index 100% rename from demos/second/graphics/lenspic.png rename to demos/second/part10_lens_rotozoom/graphics/lenspic.png diff --git a/demos/second/roto.s b/demos/second/part10_lens_rotozoom/roto.s similarity index 93% rename from demos/second/roto.s rename to demos/second/part10_lens_rotozoom/roto.s index f12a88bf..d03b0c81 100644 --- a/demos/second/roto.s +++ b/demos/second/part10_lens_rotozoom/roto.s @@ -168,15 +168,15 @@ scaleaddh: .byte $00 .include "rotozoom.s" -.include "gr_pageflip.s" -;.include "gr_fast_clear.s" -.include "gr_copy.s" +.include "../gr_pageflip.s" +.include "../gr_fast_clear.s" +.include "../gr_copy.s" -.include "gr_offsets.s" -.include "c00_scrn_offsets.s" +.include "../gr_offsets.s" +.include "../c00_scrn_offsets.s" -.include "multiply_fast.s" +.include "../multiply_fast.s" ;=============================================== ; Data diff --git a/demos/second/rotozoom.s b/demos/second/part10_lens_rotozoom/rotozoom.s similarity index 100% rename from demos/second/rotozoom.s rename to demos/second/part10_lens_rotozoom/rotozoom.s