diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ec8410..3309375 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,8 @@ set(ASSETS_cg assets-cg/bglens3.png assets-cg/bglens4.png assets-cg/fontmatrix.png + assets-cg/SlyVTT.png + assets-cg/Selection.png ) fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} WITH_METADATA) diff --git a/assets-cg/Selection.png b/assets-cg/Selection.png new file mode 100644 index 0000000..6a92dd0 Binary files /dev/null and b/assets-cg/Selection.png differ diff --git a/assets-cg/SlyVTT.png b/assets-cg/SlyVTT.png new file mode 100644 index 0000000..0a1990f Binary files /dev/null and b/assets-cg/SlyVTT.png differ diff --git a/assets-cg/fxconv-metadata.txt b/assets-cg/fxconv-metadata.txt index 75037fc..e4136f5 100644 --- a/assets-cg/fxconv-metadata.txt +++ b/assets-cg/fxconv-metadata.txt @@ -24,4 +24,13 @@ eye.png: profile: p4 name: eye +SlyVTT.png: + type: bopti-image + profile: p8 + name: SlyVTT + +Selection.png: + type: bopti-image + profile: p8 + name: Selection diff --git a/src/main.c b/src/main.c index c28eea0..09591e5 100644 --- a/src/main.c +++ b/src/main.c @@ -13,6 +13,7 @@ bool stop = false; +bool skip_intro = false; uint8_t moduleToRun = 1; uint8_t pagevisible=0; @@ -1064,6 +1065,34 @@ void run_module10( void ) +/********************************\ + * INTRODUCING THE CCJ DEMOS * + * Specific data and structures * +\********************************/ + +extern bopti_image_t SlyVTT, Selection; + +static char text[] = "CHILL CASIO JAM 2022"; + + +void run_intro( void ) +{ + dclear( C_BLACK ); + dimage(0, 12, &SlyVTT ); + + dprint( 175, 25, C_WHITE, "%s", text); + + dimage( 175, 50, &Selection ); + + dprint( 175, 180, C_WHITE, "PRESS EXE TO SELECT" ); + dprint( 175, 200, C_WHITE, "OLDSCHOOL DEMO EFFECTS" ); +} + +/* update movement of scroller */ + + + + static void get_minimum_inputs( void ) { key_event_t ev; @@ -1072,6 +1101,8 @@ static void get_minimum_inputs( void ) } + if(keydown(KEY_EXE)) skip_intro = true; + if(keydown(KEY_EXIT)) stop=true; if(pagevisible==0 && keydown(KEY_F1)) @@ -1147,7 +1178,6 @@ static void get_minimum_inputs( void ) - int main(void) { @@ -1160,45 +1190,50 @@ int main(void) screen->width = DWIDTH; screen->height = MAXHEIGHT; - - - init_module1(); + dfont(&matrix); while(!stop) { dclear(C_BLACK); - if (moduleToRun==1) run_module1(); - else if (moduleToRun==2) run_module2(); - else if (moduleToRun==3) run_module3(); - else if (moduleToRun==4) run_module4(); - else if (moduleToRun==5) run_module5(); - else if (moduleToRun==6) run_module6(); - else if (moduleToRun==7) run_module7(); - else if (moduleToRun==8) run_module8(); - else if (moduleToRun==9) run_module9(); - else if (moduleToRun==10) run_module10(); - - if (pagevisible==0) + if (skip_intro==false) { - dprint_opt(33, 212, moduleToRun==1?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "PLASMA" ); - dprint_opt(99, 212, moduleToRun==2?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "BLOBS" ); - dprint_opt(165, 212, moduleToRun==3?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "LENS" ); - dprint_opt(231, 212, moduleToRun==4?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "STARS" ); - dprint_opt(297, 212, moduleToRun==5?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "RAIN" ); - dprint_opt(363, 212, C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "%c%c%c",'!'+31,'!'+31,'!'+31 ); + run_intro(); } - else if (pagevisible==1) + else { - dprint_opt(33, 212, C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "%c%c%c",'!'-1,'!'-1,'!'-1 ); - dprint_opt(99, 212, moduleToRun==6?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "MATRIX" ); - dprint_opt(165, 212, moduleToRun==7?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "FIRE" ); - dprint_opt(231, 212, moduleToRun==8?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "JULIA" ); - dprint_opt(297, 212, moduleToRun==9?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "MANDEL" ); - dprint_opt(363, 212, moduleToRun==10?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "BOBS" ); + if (moduleToRun==1) run_module1(); + else if (moduleToRun==2) run_module2(); + else if (moduleToRun==3) run_module3(); + else if (moduleToRun==4) run_module4(); + else if (moduleToRun==5) run_module5(); + else if (moduleToRun==6) run_module6(); + else if (moduleToRun==7) run_module7(); + else if (moduleToRun==8) run_module8(); + else if (moduleToRun==9) run_module9(); + else if (moduleToRun==10) run_module10(); + + if (pagevisible==0) + { + dprint_opt(33, 212, moduleToRun==1?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "PLASMA" ); + dprint_opt(99, 212, moduleToRun==2?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "BLOBS" ); + dprint_opt(165, 212, moduleToRun==3?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "LENS" ); + dprint_opt(231, 212, moduleToRun==4?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "STARS" ); + dprint_opt(297, 212, moduleToRun==5?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "RAIN" ); + dprint_opt(363, 212, C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "%c%c%c",'!'+31,'!'+31,'!'+31 ); + } + else if (pagevisible==1) + { + dprint_opt(33, 212, C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "%c%c%c",'!'-1,'!'-1,'!'-1 ); + dprint_opt(99, 212, moduleToRun==6?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "MATRIX" ); + dprint_opt(165, 212, moduleToRun==7?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "FIRE" ); + dprint_opt(231, 212, moduleToRun==8?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "JULIA" ); + dprint_opt(297, 212, moduleToRun==9?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "MANDEL" ); + dprint_opt(363, 212, moduleToRun==10?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "BOBS" ); + } } dupdate();