diff --git a/CMakeLists.txt b/CMakeLists.txt index e17b026..bf4215f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,13 +41,20 @@ set(ASSETS_cg assets-cg/decos/desert/dt_tree4.png assets-cg/decos/desert/dt_smallleaf.png + assets-cg/decos/usa/us_tree1.png + assets-cg/decos/usa/us_tree2.png assets-cg/decos/usa/us_tree4.png + assets-cg/decos/usa/us_bigleaf.png + assets-cg/decos/usa/us_smallleaf.png assets-cg/decos/finland/fi_tree1.png assets-cg/decos/finland/fi_tree2.png assets-cg/decos/finland/fi_tree4.png assets-cg/decos/finland/fi_rocks.png + assets-cg/decos/africa/af_tree1.png + assets-cg/decos/africa/af_tree2.png + assets-cg/decos/africa/af_tree3.png assets-cg/decos/africa/af_bigleaf.png assets-cg/decos/common/cc_bigleaf.png @@ -65,6 +72,7 @@ set(ASSETS_cg assets-cg/backgrnd/canyon.png assets-cg/backgrnd/rockline.png assets-cg/backgrnd/snowmount.png + assets-cg/backgrnd/kilimandjaro.png assets-cg/billboard/leftturn.png assets-cg/billboard/rightturn.png @@ -90,7 +98,8 @@ set(ASSETS_cg assets-cg/miniscreen/finland1.png assets-cg/miniscreen/plains1.png assets-cg/miniscreen/usa1.png - + assets-cg/miniscreen/linear.png + assets-cg/miniscreen/circular.png ) fxconv_declare_assets(${ASSETS_cg} WITH_METADATA) diff --git a/CppOutRun.layout b/CppOutRun.layout index b096a7d..86e163c 100644 --- a/CppOutRun.layout +++ b/CppOutRun.layout @@ -2,19 +2,14 @@ - + - + - + - - - - - - + @@ -22,22 +17,72 @@ - - - - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,9 +90,22 @@ + + + + + + + + + + + + + - + @@ -56,70 +114,12 @@ + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/assets-cg/backgrnd/kilimandjaro.png b/assets-cg/backgrnd/kilimandjaro.png new file mode 100644 index 0000000..b1c76a8 Binary files /dev/null and b/assets-cg/backgrnd/kilimandjaro.png differ diff --git a/assets-cg/decos/africa/af_tree1.png b/assets-cg/decos/africa/af_tree1.png new file mode 100644 index 0000000..109b1a8 Binary files /dev/null and b/assets-cg/decos/africa/af_tree1.png differ diff --git a/assets-cg/decos/africa/af_tree2.png b/assets-cg/decos/africa/af_tree2.png new file mode 100644 index 0000000..cdad9c1 Binary files /dev/null and b/assets-cg/decos/africa/af_tree2.png differ diff --git a/assets-cg/decos/africa/af_tree3.png b/assets-cg/decos/africa/af_tree3.png new file mode 100644 index 0000000..3e35253 Binary files /dev/null and b/assets-cg/decos/africa/af_tree3.png differ diff --git a/assets-cg/decos/usa/us_bigleaf.png b/assets-cg/decos/usa/us_bigleaf.png new file mode 100644 index 0000000..70f52af Binary files /dev/null and b/assets-cg/decos/usa/us_bigleaf.png differ diff --git a/assets-cg/decos/usa/us_smallleaf.png b/assets-cg/decos/usa/us_smallleaf.png new file mode 100644 index 0000000..06418c0 Binary files /dev/null and b/assets-cg/decos/usa/us_smallleaf.png differ diff --git a/assets-cg/decos/usa/us_tree1.png b/assets-cg/decos/usa/us_tree1.png new file mode 100644 index 0000000..13eecd4 Binary files /dev/null and b/assets-cg/decos/usa/us_tree1.png differ diff --git a/assets-cg/decos/usa/us_tree2.png b/assets-cg/decos/usa/us_tree2.png new file mode 100644 index 0000000..a078573 Binary files /dev/null and b/assets-cg/decos/usa/us_tree2.png differ diff --git a/assets-cg/miniscreen/circular.png b/assets-cg/miniscreen/circular.png new file mode 100644 index 0000000..68adf81 Binary files /dev/null and b/assets-cg/miniscreen/circular.png differ diff --git a/assets-cg/miniscreen/linear.png b/assets-cg/miniscreen/linear.png new file mode 100644 index 0000000..ee2c74d Binary files /dev/null and b/assets-cg/miniscreen/linear.png differ diff --git a/fxlink-image-2022.02.17-21h40-1.png b/fxlink-image-2022.02.17-21h40-1.png deleted file mode 100644 index dc661ab..0000000 Binary files a/fxlink-image-2022.02.17-21h40-1.png and /dev/null differ diff --git a/fxlink-image-2022.02.17-21h40-2.png b/fxlink-image-2022.02.17-21h40-2.png deleted file mode 100644 index 5fe6128..0000000 Binary files a/fxlink-image-2022.02.17-21h40-2.png and /dev/null differ diff --git a/fxlink-image-2022.02.17-21h40-3.png b/fxlink-image-2022.02.17-21h40-3.png deleted file mode 100644 index 0c5bdf5..0000000 Binary files a/fxlink-image-2022.02.17-21h40-3.png and /dev/null differ diff --git a/fxlink-image-2022.02.17-21h40-4.png b/fxlink-image-2022.02.17-21h40-4.png deleted file mode 100644 index 49a6e6d..0000000 Binary files a/fxlink-image-2022.02.17-21h40-4.png and /dev/null differ diff --git a/fxlink-image-2022.02.17-21h41-1.png b/fxlink-image-2022.02.17-21h41-1.png deleted file mode 100644 index 8ed45c3..0000000 Binary files a/fxlink-image-2022.02.17-21h41-1.png and /dev/null differ diff --git a/src/src/circuit.cc b/src/src/circuit.cc index 2ae8d94..37b6e6a 100644 --- a/src/src/circuit.cc +++ b/src/src/circuit.cc @@ -27,11 +27,11 @@ extern bool ShowDebug1; extern bopti_image_t car1, car2, car3, car4, car5, car6, car7, car8; -extern bopti_image_t pl_tree1, pl_tree2, pl_tree3, pl_tree4, dt_tree1, dt_tree2, dt_tree3, dt_tree4, us_tree4, fi_tree1, fi_tree2, fi_tree4; -extern bopti_image_t cc_void, cc_bigleaf, cc_smallleaf, cc_rocks, af_bigleaf, dt_smallleaf, fi_rocks; +extern bopti_image_t pl_tree1, pl_tree2, pl_tree3, pl_tree4, dt_tree1, dt_tree2, dt_tree3, dt_tree4, us_tree1, us_tree2, us_tree4, fi_tree1, fi_tree2, fi_tree4, af_tree1, af_tree2, af_tree3; +extern bopti_image_t cc_void, us_bigleaf, us_smallleaf, cc_bigleaf, cc_smallleaf, cc_rocks, af_bigleaf, dt_smallleaf, fi_rocks; extern bopti_image_t sky1, sky2, sky3; -extern bopti_image_t mountain, canyon, snowmount; +extern bopti_image_t mountain, canyon, snowmount, kilimandjaro; extern bopti_image_t treeline, rockline; extern bopti_image_t leftturn, rightturn, uphill, downhill; extern bopti_image_t checkpoint, startlights, stoplights, waitlights; @@ -1004,7 +1004,6 @@ void drawCircuitSegment( uint16_t index ) drawPolygon( X2+W2/2+W2/12+currentcurve, X2+W2/2+W2/12+W2/25+currentcurve, Y2, X1+W1/2+W1/12+currentcurve, X1+W1/2+W1/12+W1/25+currentcurve, Y1, DARK_EARTH ); drawPolygon( X2+W2-W2/12-W2/25+currentcurve, X2+W2-W2/12+currentcurve, Y2, X1+W1-W1/12-W1/25+currentcurve, X1+W1-W1/12+currentcurve, Y1, DARK_EARTH ); - drawPolygon( X2-W2/50+currentcurve, X2+W2/50+currentcurve, Y2, X1-W1/50+currentcurve, X1+W1/50+currentcurve, Y1, LIGHT_GREEN_GRASS ); drawPolygon( X2+W2+currentcurve, 396, Y2, X1+W1+currentcurve, 396, Y1, DARK_EARTH ); } else @@ -1024,7 +1023,6 @@ void drawCircuitSegment( uint16_t index ) drawPolygon( X2+W2/2+W2/12+currentcurve, X2+W2/2+W2/12+W2/25+currentcurve, Y2, X1+W1/2+W1/12+currentcurve, X1+W1/2+W1/12+W1/25+currentcurve, Y1, DARK_EARTH ); drawPolygon( X2+W2-W2/12-W2/25+currentcurve, X2+W2-W2/12+currentcurve, Y2, X1+W1-W1/12-W1/25+currentcurve, X1+W1-W1/12+currentcurve, Y1, DARK_EARTH ); - drawPolygon( X2-W2/50+currentcurve, X2+W2/50+currentcurve, Y2, X1-W1/50+currentcurve, X1+W1/50+currentcurve, Y1, LIGHT_GREEN_GRASS ); drawPolygon( X2+W2+currentcurve, 396, Y2, X1+W1+currentcurve, 396, Y1, LIGHT_EARTH ); } } @@ -1116,12 +1114,12 @@ void prepareDecoration( int biometoload ) } else if (biometoload==USA) { - if(k==0) src = &cc_void; //&pl_tree1; - else if (k==1) src = &cc_smallleaf; //&pl_tree2; - else if (k==2) src = &cc_void; //&pl_tree3; + if(k==0) src = &us_tree1; //&pl_tree1; + else if (k==1) src = &us_tree2; //&pl_tree2; + else if (k==2) src = &dt_smallleaf; //&pl_tree3; else if (k==3) src = &us_tree4; - else if (k==4) src = &af_bigleaf; - else if (k==5) src = &dt_smallleaf; + else if (k==4) src = &us_bigleaf; + else if (k==5) src = &us_smallleaf; else if (k==6) src = &cc_rocks; } else if (biometoload==FINLAND) @@ -1136,12 +1134,12 @@ void prepareDecoration( int biometoload ) } else if (biometoload==AFRICA) { - if(k==0) src = &cc_void; //&pl_tree1; - else if (k==1) src = &cc_void; //&pl_tree2; - else if (k==2) src = &cc_void; //&pl_tree3; - else if (k==3) src = &cc_void; //&pl_tree4; + if(k==0) src = &af_tree1; //&pl_tree1; + else if (k==1) src = &af_tree2; //&pl_tree2; + else if (k==2) src = &af_tree3; //&pl_tree3; + else if (k==3) src = &us_tree4; //&pl_tree4; else if (k==4) src = &af_bigleaf; - else if (k==5) src = &cc_void; //&cc_smallleaf; + else if (k==5) src = &cc_smallleaf; else if (k==6) src = &cc_rocks; } @@ -1303,7 +1301,7 @@ void drawFarBackground( int offset, int currentbiome ) else if (currentbiome==DESERT) image=&cc_void; else if (currentbiome==USA) image=&canyon; else if (currentbiome==FINLAND) image=&snowmount; - else if (currentbiome==AFRICA) image=&cc_void; + else if (currentbiome==AFRICA) image=&kilimandjaro; int X = offset; int DX = image->width; @@ -1330,7 +1328,7 @@ void drawNearBackground( int offset, int currentbiome ) else if (currentbiome==DESERT) image=&rockline; else if (currentbiome==USA) image=&rockline; else if (currentbiome==FINLAND) image=&cc_void; - else if (currentbiome==AFRICA) image=&rockline; + else if (currentbiome==AFRICA) image=&cc_void; int X = offset; diff --git a/src/src/menus.cc b/src/src/menus.cc index a972679..b04a567 100644 --- a/src/src/menus.cc +++ b/src/src/menus.cc @@ -5,7 +5,7 @@ extern bopti_image_t mainscreen; extern bopti_image_t africa1, desert1, finland1, plains1, usa1; -extern bopti_image_t flag; +extern bopti_image_t flag, linear, circular; extern font_t autofont, autofontsmall; @@ -177,6 +177,7 @@ int drawMenuCircuitSelect( void ) dprint_opt(198, 2, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_TOP, "SELECT A CIRCUIT" ); dimage( 16, 45, &plains1 ); + dimage( 16, 45, &linear ); if (CircuitSelection!=0) drawRectangle( 16, 45, 60, 60, C_WHITE, 3 ); else { @@ -185,6 +186,7 @@ int drawMenuCircuitSelect( void ) } dimage( 92, 45, &desert1 ); + dimage( 92, 45, &linear ); if (CircuitSelection!=1) drawRectangle( 92, 45, 60, 60, C_WHITE, 3 ); else { @@ -193,6 +195,7 @@ int drawMenuCircuitSelect( void ) } dimage( 168, 45, &usa1 ); + dimage( 168, 45, &linear ); if (CircuitSelection!=2) drawRectangle( 168, 45, 60, 60, C_WHITE, 3 ); else { @@ -201,14 +204,16 @@ int drawMenuCircuitSelect( void ) } dimage( 244, 45, &finland1 ); + dimage( 244, 45, &linear ); if (CircuitSelection!=3) drawRectangle( 244, 45, 60, 60, C_WHITE, 3 ); else { drawRectangle( 244, 45, 60, 60, C_RGB(pulse%256,0,pulse%256), 3 ); - dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">FINLAND" ); + dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">SNOW IN FINLAND" ); } dimage( 320, 45, &africa1 ); + dimage( 320, 45, &linear ); if (CircuitSelection!=4) drawRectangle( 320, 45, 60, 60, C_WHITE, 3 ); else { @@ -216,40 +221,49 @@ int drawMenuCircuitSelect( void ) dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">KENYAN SAVANAH" ); } - + dimage( 16, 120, &plains1 ); + dimage( 16, 120, &circular ); if (CircuitSelection!=5) drawRectangle( 16, 120, 60, 60, C_WHITE, 3 ); else { drawRectangle( 16, 120, 60, 60, C_RGB(pulse%256,0,pulse%256), 3 ); - dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">> CIRCUIT #6" ); + dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">EUROPEAN PLAINS" ); } + dimage( 92, 120, &desert1 ); + dimage( 92, 120, &circular ); if (CircuitSelection!=6) drawRectangle( 92, 120, 60, 60, C_WHITE, 3 ); else { drawRectangle( 92, 120, 60, 60, C_RGB(pulse%256,0,pulse%256), 3 ); - dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">> CIRCUIT #7" ); + dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">ATACAMA DESERT" ); } + dimage( 168, 120, &usa1 ); + dimage( 168, 120, &circular ); if (CircuitSelection!=7) drawRectangle( 168, 120, 60, 60, C_WHITE, 3 ); else { drawRectangle( 168, 120, 60, 60, C_RGB(pulse%256,0,pulse%256), 3 ); - dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">> CIRCUIT #8" ); + dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">US ROAD 66" ); } + dimage( 244, 120, &finland1 ); + dimage( 244, 120, &circular ); if (CircuitSelection!=8) drawRectangle( 244, 120, 60, 60, C_WHITE, 3 ); else { drawRectangle( 244, 120, 60, 60, C_RGB(pulse%256,0,pulse%256), 3 ); - dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">> CIRCUIT #9" ); + dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">SNOW IN FINLAND" ); } + dimage( 320, 120, &africa1 ); + dimage( 320, 120, &circular ); if (CircuitSelection!=9) drawRectangle( 320, 120, 60, 60, C_WHITE, 3 ); else { drawRectangle( 320, 120, 60, 60, C_RGB(pulse%256,0,pulse%256), 3 ); - dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">> CIRCUIT #10" ); + dprint_opt(198, 222, C_RGB(pulse%256,0,pulse%256), C_NONE, DTEXT_CENTER, DTEXT_BOTTOM, ">KENYAN SAVANAH" ); }