diff --git a/Publish/tutorials/AGON/tutorials/06_disk_anim.ras b/Publish/tutorials/AGON/tutorials/06_disk_anim.ras index 18c948a6b..520d10d57 100755 --- a/Publish/tutorials/AGON/tutorials/06_disk_anim.ras +++ b/Publish/tutorials/AGON/tutorials/06_disk_anim.ras @@ -5,6 +5,7 @@ program Bitmap_image; @use "system/screen" +// Include all the images as incbins @macro "include_images" 1 @@ -15,6 +16,8 @@ program Bitmap_image; @endmacro +// Load all bitmaps + @macro "load_images" 1 i = 1; @@ -26,12 +29,12 @@ program Bitmap_image; @endmacro var + //64 frames (1-65) @include_images(65) -// image : incbin("data/disksprite1.bin"); zp:^byte; - sinx : array[256] of byte = buildsinetable(240); - siny : array[256] of byte = buildsinetable(180); + sinx : array[256] of integer = buildsinetable(560); + siny : array[256] of byte = buildsinetable(200); time,frame,t2,i,f,t3 : byte; delta : byte = 64; x,y : integer; @@ -39,14 +42,17 @@ var const img1 : byte = 0; // ID begin - Screen::SetMode(Screen::mode_320_200_64); + Screen::SetMode(Screen::mode_640_240_64); Screen::DisableCursor(); + // Load 64 frames (1-65) into bitmap data @load_images(65); while(true) do begin t2:=time; t3:=time; f:=frame; + + Screen::ClearScreen(); for i:=0 to 24 offpage do begin x:=sinx[t2]+32; @@ -62,8 +68,9 @@ begin delta+=1; if (time&3=0) then frame+=1; - for x:=0 to 400 do - wait(100); - Screen::ClearScreen(); + + for x:=0 to 350 do + wait(119); + end; end. diff --git a/Publish/tutorials/AGON/tutorials/fjong/disk.fjo b/Publish/tutorials/AGON/tutorials/fjong/disk.fjo index 95ce45d9e..3ab0e583b 100644 --- a/Publish/tutorials/AGON/tutorials/fjong/disk.fjo +++ b/Publish/tutorials/AGON/tutorials/fjong/disk.fjo @@ -16,9 +16,7 @@ globals = { } output = { - -- resolution of 2x2 multicolor sprites (12x21 each) - resolution = { width = 32, height=28}, --- resolution = { width = 320, height=200}, + resolution = { width = 48, height=28}, aspect = 1.0, output_type = 0, -- c64 image type dither = 2,