diff --git a/demos/second/part13_plasmacube/graphics/Makefile b/demos/second/part13_plasmacube/graphics/Makefile index b19a5689..3c04b626 100644 --- a/demos/second/part13_plasmacube/graphics/Makefile +++ b/demos/second/part13_plasmacube/graphics/Makefile @@ -1,6 +1,6 @@ include ../../../../Makefile.inc -ZX02 = ~/research/6502_compression/zx02.git/build/zx02 +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr PNG2GR = ../../../../utils/gr-utils/png2gr @@ -114,4 +114,4 @@ cube2_mask8.gr: cube2_mask8.png #### clean: - rm -f *~ + rm -f *~ *.zx02 diff --git a/demos/second/part13_plasmacube/graphics/cube2_mask1.png b/demos/second/part13_plasmacube/graphics/cube2_mask1.png index 595bed09..569ae62e 100644 Binary files a/demos/second/part13_plasmacube/graphics/cube2_mask1.png and b/demos/second/part13_plasmacube/graphics/cube2_mask1.png differ diff --git a/demos/second/part13_plasmacube/graphics/cube2_mask2.png b/demos/second/part13_plasmacube/graphics/cube2_mask2.png index 2d49ae70..dcb8c6e5 100644 Binary files a/demos/second/part13_plasmacube/graphics/cube2_mask2.png and b/demos/second/part13_plasmacube/graphics/cube2_mask2.png differ diff --git a/demos/second/part13_plasmacube/graphics/cube2_mask3.png b/demos/second/part13_plasmacube/graphics/cube2_mask3.png index 128c8d41..c6334883 100644 Binary files a/demos/second/part13_plasmacube/graphics/cube2_mask3.png and b/demos/second/part13_plasmacube/graphics/cube2_mask3.png differ diff --git a/demos/second/part13_plasmacube/graphics/cube2_mask4.png b/demos/second/part13_plasmacube/graphics/cube2_mask4.png index 90baeb0c..8d78510c 100644 Binary files a/demos/second/part13_plasmacube/graphics/cube2_mask4.png and b/demos/second/part13_plasmacube/graphics/cube2_mask4.png differ diff --git a/demos/second/part13_plasmacube/graphics/cube2_mask5.png b/demos/second/part13_plasmacube/graphics/cube2_mask5.png index a9c89dd0..ae6d482d 100644 Binary files a/demos/second/part13_plasmacube/graphics/cube2_mask5.png and b/demos/second/part13_plasmacube/graphics/cube2_mask5.png differ diff --git a/demos/second/part13_plasmacube/graphics/cube2_mask6.png b/demos/second/part13_plasmacube/graphics/cube2_mask6.png index 322b31bc..f91a9f75 100644 Binary files a/demos/second/part13_plasmacube/graphics/cube2_mask6.png and b/demos/second/part13_plasmacube/graphics/cube2_mask6.png differ diff --git a/demos/second/part13_plasmacube/graphics/cube2_mask7.png b/demos/second/part13_plasmacube/graphics/cube2_mask7.png index 74f25fcd..99bf44e0 100644 Binary files a/demos/second/part13_plasmacube/graphics/cube2_mask7.png and b/demos/second/part13_plasmacube/graphics/cube2_mask7.png differ diff --git a/demos/second/part13_plasmacube/graphics/cube2_mask8.png b/demos/second/part13_plasmacube/graphics/cube2_mask8.png index 7ca72731..0aa989bd 100644 Binary files a/demos/second/part13_plasmacube/graphics/cube2_mask8.png and b/demos/second/part13_plasmacube/graphics/cube2_mask8.png differ diff --git a/demos/second/part13_plasmacube/plasmacube.s b/demos/second/part13_plasmacube/plasmacube.s index b48c3bca..ae701859 100644 --- a/demos/second/part13_plasmacube/plasmacube.s +++ b/demos/second/part13_plasmacube/plasmacube.s @@ -259,6 +259,7 @@ VBLANK: lsr lsr lsr + lsr and #$f tax lda mask_src_table,X @@ -344,6 +345,16 @@ lores_colors_rgb: ; 256 ; $00, $11, $33, $BB, $FF, $BB, $33, $11 ; red +.byte $11,$11,$11,$11,$11,$33,$33,$33 +.byte $33,$33,$bb,$bb,$bb,$bb,$bb,$ff +.byte $ff,$ff,$ff,$ff,$ff,$bb,$bb,$bb +.byte $bb,$bb,$33,$33,$33,$33,$33,$11 +.byte $11,$11,$11,$11,$33,$33,$33,$33 +.byte $bb,$bb,$bb,$bb,$bb,$ff,$ff,$ff +.byte $ff,$ff,$ff,$bb,$bb,$bb,$bb,$bb +.byte $33,$33,$33,$33,$33,$33,$11,$11 +.if 0 + .byte $00,$00,$00,$00,$00,$00,$00,$00 .byte $11,$11,$11,$11,$11,$11,$11,$11 .byte $33,$33,$33,$33,$33,$33,$33,$33 @@ -352,10 +363,24 @@ lores_colors_rgb: ; 256 .byte $bb,$bb,$bb,$bb,$bb,$bb,$bb,$bb .byte $33,$33,$33,$33,$33,$33,$33,$33 .byte $11,$11,$11,$11,$11,$11,$11,$11 +.endif ; $00, $22, $66, $77, $FF, $77, $66, $22 +; 22 66 77 ff 77 66 + ; blue + +.byte $22,$22,$22,$22,$22,$66,$66,$66 +.byte $66,$66,$77,$77,$77,$77,$77,$ff +.byte $ff,$ff,$ff,$ff,$ff,$77,$77,$77 +.byte $77,$77,$66,$66,$66,$66,$66,$22 +.byte $22,$22,$22,$22,$66,$66,$66,$66 +.byte $77,$77,$77,$77,$77,$ff,$ff,$ff +.byte $ff,$ff,$ff,$77,$77,$77,$77,$77 +.byte $66,$66,$66,$66,$66,$66,$22,$22 + +.if 0 .byte $00,$00,$00,$00,$00,$00,$00,$00 .byte $22,$22,$22,$22,$22,$22,$22,$22 .byte $66,$66,$66,$66,$66,$66,$66,$66 @@ -364,10 +389,21 @@ lores_colors_rgb: ; 256 .byte $77,$77,$77,$77,$77,$77,$77,$77 .byte $66,$66,$66,$66,$66,$66,$66,$66 .byte $22,$22,$22,$22,$22,$22,$22,$22 +.endif + ; $00, $44, $CC, $DD, $FF, $DD, $CC, $44 ; green +.byte $44,$44,$44,$44,$44,$cc,$cc,$cc +.byte $cc,$cc,$dd,$dd,$dd,$dd,$dd,$ff +.byte $ff,$ff,$ff,$ff,$ff,$dd,$dd,$dd +.byte $dd,$dd,$cc,$cc,$cc,$cc,$cc,$44 +.byte $44,$44,$44,$44,$cc,$cc,$cc,$cc +.byte $dd,$dd,$dd,$dd,$dd,$ff,$ff,$ff +.byte $ff,$ff,$ff,$dd,$dd,$dd,$dd,$dd +.byte $cc,$cc,$cc,$cc,$cc,$cc,$44,$44 +.if 0 .byte $00,$00,$00,$00,$00,$00,$00,$00 .byte $44,$44,$44,$44,$44,$44,$44,$44 .byte $CC,$CC,$CC,$CC,$CC,$CC,$CC,$CC @@ -376,7 +412,7 @@ lores_colors_rgb: ; 256 .byte $DD,$DD,$DD,$DD,$DD,$DD,$DD,$DD .byte $CC,$CC,$CC,$CC,$CC,$CC,$CC,$CC .byte $44,$44,$44,$44,$44,$44,$44,$44 - +.endif ; This table has relatively fine color bands .if 0