Visuals OK

This commit is contained in:
Sylvain PILLOT 2022-03-18 16:13:12 +01:00
parent 1e205b188f
commit 49a55bc86f
19 changed files with 127 additions and 106 deletions

View File

@ -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)

View File

@ -2,19 +2,14 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Release" />
<File name="src/include/drawstuff.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src/fixed.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="622" topLine="0" />
<Cursor1 position="778" topLine="0" />
</Cursor>
</File>
<File name="src/src/segment.cc" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
<File name="src/include/camera.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="230" topLine="30" />
</Cursor>
</File>
<File name="src/include/segment.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="210" topLine="0" />
<Cursor1 position="221" topLine="0" />
</Cursor>
</File>
<File name="src/src/cars.cc" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -22,22 +17,72 @@
<Cursor1 position="1019" topLine="8" />
</Cursor>
</File>
<File name="CMakeLists.txt" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1414" topLine="47" />
</Cursor>
</File>
<File name="src/src/menus.cc" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6008" topLine="75" />
<Cursor1 position="1477" topLine="72" />
</Cursor>
<Folding>
<Collapse line="315" />
<Collapse line="316" />
</Folding>
</File>
<File name="src/include/camera.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src/colors.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="221" topLine="0" />
<Cursor1 position="678" topLine="0" />
</Cursor>
</File>
<File name="src/parameters.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="399" topLine="0" />
</Cursor>
</File>
<File name="src/src/drawstuff.cc" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2516" topLine="0" />
</Cursor>
<Folding>
<Collapse line="33" />
<Collapse line="40" />
<Collapse line="76" />
</Folding>
</File>
<File name="src/src/clouds.cc" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="203" topLine="0" />
</Cursor>
</File>
<File name="CMakeLists.txt" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1699" topLine="35" />
</Cursor>
</File>
<File name="src/include/drawstuff.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="622" topLine="0" />
</Cursor>
</File>
<File name="src/include/segment.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="210" topLine="0" />
</Cursor>
</File>
<File name="TODO.txt" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="251" topLine="0" />
</Cursor>
</File>
<File name="src/include/cars.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="332" topLine="0" />
</Cursor>
</File>
<File name="src/include/clouds.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="306" topLine="0" />
</Cursor>
</File>
<File name="src/include/circuit.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1395" topLine="48" />
</Cursor>
</File>
<File name="src/src/camera.cc" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -45,9 +90,22 @@
<Cursor1 position="370" topLine="0" />
</Cursor>
</File>
<File name="src/main.cc" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="13233" topLine="418" />
</Cursor>
<Folding>
<Collapse line="275" />
</Folding>
</File>
<File name="src/include/menus.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="251" topLine="0" />
</Cursor>
</File>
<File name="src/src/circuit.cc" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="799" topLine="0" />
<Cursor1 position="959" topLine="0" />
</Cursor>
<Folding>
<Collapse line="433" />
@ -56,70 +114,12 @@
<Collapse line="543" />
<Collapse line="588" />
<Collapse line="634" />
<Collapse line="1097" />
</Folding>
</File>
<File name="src/include/cars.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src/src/segment.cc" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
<Cursor>
<Cursor1 position="332" topLine="0" />
</Cursor>
</File>
<File name="TODO.txt" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="251" topLine="0" />
</Cursor>
</File>
<File name="src/fixed.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="778" topLine="0" />
</Cursor>
</File>
<File name="src/parameters.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="399" topLine="0" />
</Cursor>
</File>
<File name="src/src/drawstuff.cc" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2642" topLine="49" />
</Cursor>
<Folding>
<Collapse line="33" />
<Collapse line="40" />
<Collapse line="76" />
</Folding>
</File>
<File name="src/include/circuit.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="865" topLine="48" />
</Cursor>
</File>
<File name="src/main.cc" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="19568" topLine="253" />
</Cursor>
<Folding>
<Collapse line="276" />
<Collapse line="304" />
</Folding>
</File>
<File name="src/src/clouds.cc" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="203" topLine="0" />
</Cursor>
</File>
<File name="src/colors.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="607" topLine="0" />
</Cursor>
</File>
<File name="src/include/menus.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="251" topLine="0" />
</Cursor>
</File>
<File name="src/include/clouds.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="306" topLine="0" />
<Cursor1 position="230" topLine="30" />
</Cursor>
</File>
</CodeBlocks_layout_file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

View File

@ -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;

View File

@ -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" );
}