big tileset and support multi-layer map from Tiled
This commit is contained in:
parent
2b6f492419
commit
bcea8d061d
3
TODO.txt
3
TODO.txt
|
|
@ -2,13 +2,14 @@ The SHMUP Todo list :
|
|||
|
||||
|
||||
# Engine
|
||||
- better keyboard management engine for keypressed() and keyreleased() events
|
||||
- [DONE] better keyboard management engine for keypressed() and keyreleased() events
|
||||
|
||||
|
||||
# Partie décors :
|
||||
- [WIP] - animer le décors avec le parallaxe (glissement de la droite vers la gauche pour donner l'avancement du vaisseau).
|
||||
- animer des éléments du décors (clignotements, sprites animés, ...)
|
||||
- interaction avec le décors (collisions possibles avec certaines tiles) qui imposent donc de suivre un "chemin" dans le niveau
|
||||
- multiple layers de tiles pour avoir des niveaux plus beaux
|
||||
|
||||
Partie mouvement :
|
||||
- améliorer le système de trajectoires sur base de Splines pour rendre la vitesse des ennemis plus constante.
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,25 +1,40 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="102" height="14" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
|
||||
<editorsettings>
|
||||
<export target="Level1.json" format="json"/>
|
||||
</editorsettings>
|
||||
<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="90" height="14" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
|
||||
<tileset firstgid="1" source="Tileset_Space.tsx"/>
|
||||
<layer id="1" name="Calque de Tuiles 1" width="102" height="14">
|
||||
<layer id="2" name="Background" width="90" height="14">
|
||||
<data encoding="csv">
|
||||
52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,
|
||||
23,19,94,93,22,23,122,124,23,19,20,21,22,23,122,124,23,19,94,93,22,23,122,124,23,19,20,21,22,23,122,124,23,19,94,93,22,23,122,124,23,19,20,21,22,23,122,124,23,19,94,93,22,23,122,124,23,19,20,21,22,23,122,124,23,19,94,93,22,23,122,124,23,19,20,21,22,23,122,124,23,19,94,93,22,23,122,124,23,19,20,21,22,23,122,124,23,19,94,93,22,23,
|
||||
50,102,82,83,103,50,0,0,50,28,29,30,31,50,0,0,50,102,82,83,103,50,0,0,50,28,29,30,31,50,0,0,50,102,82,83,103,50,0,0,50,28,29,30,31,50,0,0,50,102,82,83,103,50,0,0,50,28,29,30,31,50,0,0,50,102,82,83,103,50,0,0,50,28,29,30,31,50,0,0,50,102,82,83,103,50,0,0,50,28,29,30,31,50,0,0,50,102,82,83,103,50,
|
||||
134,0,0,0,0,116,0,0,116,0,0,0,0,116,0,0,116,0,0,0,0,134,0,0,134,0,0,0,0,116,0,0,116,0,0,0,0,116,0,0,116,0,0,0,0,134,0,0,9,0,0,0,0,9,0,0,134,0,0,0,0,116,0,0,116,0,0,0,0,116,0,0,116,0,0,0,0,134,0,0,134,0,0,0,0,116,0,0,116,0,0,0,0,116,0,0,116,0,0,0,0,134,
|
||||
134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,0,0,18,0,0,0,0,18,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
|
||||
24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,9,0,0,0,0,9,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
|
||||
33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,18,0,0,0,0,18,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
|
||||
33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,9,0,0,0,0,9,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
|
||||
42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,18,0,0,0,0,18,0,0,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
|
||||
134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,0,0,9,0,0,0,0,9,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
|
||||
134,0,0,0,0,116,0,0,116,0,0,0,0,116,0,0,116,0,0,0,0,134,0,0,134,0,0,0,0,116,0,0,116,0,0,0,0,116,0,0,116,0,0,0,0,134,0,0,18,0,0,0,0,18,0,0,134,0,0,0,0,116,0,0,116,0,0,0,0,116,0,0,116,0,0,0,0,134,0,0,134,0,0,0,0,116,0,0,116,0,0,0,0,116,0,0,116,0,0,0,0,134,
|
||||
23,93,82,83,94,23,0,0,23,37,38,39,40,23,0,0,23,93,82,83,94,23,0,0,23,37,38,39,40,23,0,0,23,93,82,83,94,23,0,0,23,37,38,39,40,23,0,0,23,93,82,83,94,23,0,0,23,37,38,39,40,23,0,0,23,93,82,83,94,23,0,0,23,37,38,39,40,23,0,0,23,93,82,83,94,23,0,0,23,37,38,39,40,23,0,0,23,93,82,83,94,23,
|
||||
50,46,103,102,49,50,122,124,50,46,47,48,49,50,122,124,50,46,103,102,49,50,122,124,50,46,47,48,49,50,122,124,50,46,103,102,49,50,122,124,50,46,47,48,49,50,122,124,50,46,103,102,49,50,122,124,50,46,47,48,49,50,122,124,50,46,103,102,49,50,122,124,50,46,47,48,49,50,122,124,50,46,103,102,49,50,122,124,50,46,47,48,49,50,122,124,50,46,103,102,49,50,
|
||||
52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53,52,53
|
||||
0,0,0,0,1310,0,1310,0,0,0,0,1310,0,1310,0,0,0,0,1310,0,1310,0,0,0,759,760,759,760,759,760,0,0,0,0,1310,0,1310,0,0,0,0,1310,0,1310,0,0,0,0,1310,0,1310,0,0,0,759,760,759,760,759,760,0,0,0,0,1310,0,1310,0,0,0,0,1310,0,1310,0,0,0,0,1310,0,1310,0,0,0,759,760,759,760,759,760,
|
||||
0,0,0,0,2003,2003,2003,0,0,0,0,2003,2003,2003,0,0,0,0,2003,2003,2003,0,0,0,791,792,791,792,791,792,0,0,0,0,2003,2003,2003,0,0,0,0,2003,2003,2003,0,0,0,0,2003,2003,2003,0,0,0,791,792,791,792,791,792,0,0,0,0,2003,2003,2003,0,0,0,0,2003,2003,2003,0,0,0,0,2003,2003,2003,0,0,0,791,792,791,792,791,792,
|
||||
834,842,0,0,910,77,912,0,0,0,0,910,77,912,0,0,0,0,910,77,912,0,0,0,910,77,912,910,77,912,834,842,0,0,910,77,912,0,0,0,0,910,77,912,0,0,0,0,910,77,912,0,0,0,910,77,912,910,77,912,834,842,0,0,910,77,912,0,0,0,0,910,77,912,0,0,0,0,910,77,912,0,0,0,910,77,912,910,77,912,
|
||||
0,810,0,0,910,77,912,601,601,877,0,910,77,912,0,592,592,0,910,77,912,0,592,592,910,77,912,910,77,912,0,810,0,0,910,77,912,601,601,877,0,910,77,912,0,592,592,0,910,77,912,0,592,592,910,77,912,910,77,912,0,810,0,0,910,77,912,601,601,877,0,910,77,912,0,592,592,0,910,77,912,0,592,592,910,77,912,910,77,912,
|
||||
851,0,0,0,113,530,115,601,601,907,885,113,530,115,886,592,592,885,113,530,115,0,592,592,113,530,115,113,530,115,851,0,0,0,113,530,115,601,601,907,885,113,530,115,886,592,592,885,113,530,115,0,592,592,113,530,115,113,530,115,851,0,0,0,113,530,115,601,601,907,885,113,530,115,886,592,592,885,113,530,115,0,592,592,113,530,115,113,530,115,
|
||||
627,628,629,630,209,210,211,601,0,629,630,209,210,211,627,628,629,630,209,210,211,0,592,0,209,210,211,209,210,211,627,628,629,630,209,210,211,601,0,629,630,209,210,211,627,628,629,630,209,210,211,0,592,0,209,210,211,209,210,211,627,628,629,630,209,210,211,601,0,629,630,209,210,211,627,628,629,630,209,210,211,0,592,0,209,210,211,209,210,211,
|
||||
659,660,661,662,910,77,912,592,852,661,662,910,77,912,659,660,661,662,910,77,912,0,592,0,910,77,912,910,77,912,659,660,661,662,910,77,912,592,852,661,662,910,77,912,659,660,661,662,910,77,912,0,592,0,910,77,912,910,77,912,659,660,661,662,910,77,912,592,852,661,662,910,77,912,659,660,661,662,910,77,912,0,592,0,910,77,912,910,77,912,
|
||||
691,692,693,694,910,77,912,691,692,819,0,910,77,912,691,692,693,694,910,77,912,0,592,0,910,77,912,910,77,912,691,692,693,694,910,77,912,691,692,819,0,910,77,912,691,692,693,694,910,77,912,0,592,0,910,77,912,910,77,912,691,692,693,694,910,77,912,691,692,819,0,910,77,912,691,692,693,694,910,77,912,0,592,0,910,77,912,910,77,912,
|
||||
723,724,725,726,113,530,115,723,724,0,0,1371,0,1370,723,724,725,726,113,530,115,0,592,0,113,530,115,113,530,115,723,724,725,726,113,530,115,723,724,0,0,1371,0,1370,723,724,725,726,113,530,115,0,592,0,113,530,115,113,530,115,723,724,725,726,113,530,115,723,724,0,0,1371,0,1370,723,724,725,726,113,530,115,0,592,0,113,530,115,113,530,115,
|
||||
918,0,0,917,209,210,211,918,0,0,620,621,0,618,619,0,0,917,209,210,211,0,0,0,209,210,211,209,210,211,918,0,0,917,209,210,211,918,0,0,620,621,0,618,619,0,0,917,209,210,211,0,0,0,209,210,211,209,210,211,918,0,0,917,209,210,211,918,0,0,620,621,0,618,619,0,0,917,209,210,211,0,0,0,209,210,211,209,210,211,
|
||||
0,0,0,0,910,77,912,0,0,0,652,653,695,650,651,0,0,0,910,77,912,0,0,0,910,77,912,910,77,912,0,0,0,0,910,77,912,0,0,0,652,653,695,650,651,0,0,0,910,77,912,0,0,0,910,77,912,910,77,912,0,0,0,0,910,77,912,0,0,0,652,653,695,650,651,0,0,0,910,77,912,0,0,0,910,77,912,910,77,912,
|
||||
0,0,0,0,910,77,912,0,0,811,0,0,727,0,0,810,0,0,910,77,912,0,0,0,910,77,912,910,77,912,0,0,0,0,910,77,912,0,0,811,0,0,727,0,0,810,0,0,910,77,912,0,0,0,910,77,912,910,77,912,0,0,0,0,910,77,912,0,0,811,0,0,727,0,0,810,0,0,910,77,912,0,0,0,910,77,912,910,77,912,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,1497,0,0,0,0,0,0,0,0,0,0,0,541,542,509,510,542,543,0,0,0,0,0,0,0,0,0,0,0,0,1497,0,0,0,0,0,0,0,0,0,0,0,541,542,509,510,542,543,0,0,0,0,0,0,0,0,0,0,0,0,1497,0,0,0,0,0,0,0,0,0,0,0,541,542,509,510,542,543,
|
||||
0,0,0,0,524,756,525,0,0,0,0,0,0,0,0,0,0,0,524,756,525,0,0,0,0,0,0,0,0,0,0,0,0,0,524,756,525,0,0,0,0,0,0,0,0,0,0,0,524,756,525,0,0,0,0,0,0,0,0,0,0,0,0,0,524,756,525,0,0,0,0,0,0,0,0,0,0,0,524,756,525,0,0,0,0,0,0,0,0,0
|
||||
</data>
|
||||
</layer>
|
||||
<layer id="1" name="Foreground" width="90" height="14">
|
||||
<data encoding="csv">
|
||||
866,1986,1991,1971,976,1011,977,1971,741,742,1971,976,1011,977,1971,741,742,1971,976,1011,977,1971,1991,1972,0,0,0,0,0,0,866,1986,1991,1971,976,1011,977,1971,741,742,1971,976,1011,977,1971,741,742,1971,976,1011,977,1971,1991,1972,0,0,0,0,0,0,866,1986,1991,1971,976,1011,977,1971,741,742,1971,976,1011,977,1971,741,742,1971,976,1011,977,1971,1991,1972,0,0,0,0,0,0,
|
||||
898,1986,1991,1974,1498,1497,1499,1973,773,774,1974,1498,1497,1499,1973,773,774,1974,1498,1497,1499,1973,1991,1972,0,0,0,0,0,0,898,1986,1991,1974,1498,1497,1499,1973,773,774,1974,1498,1497,1499,1973,773,774,1974,1498,1497,1499,1973,1991,1972,0,0,0,0,0,0,898,1986,1991,1974,1498,1497,1499,1973,773,774,1974,1498,1497,1499,1973,773,774,1974,1498,1497,1499,1973,1991,1972,0,0,0,0,0,0,
|
||||
899,2018,2023,2020,0,0,0,2002,2003,2003,2020,0,0,0,2002,2003,2003,2020,0,0,0,2002,2023,2004,0,0,0,0,0,0,899,2018,2023,2020,0,0,0,2002,2003,2003,2020,0,0,0,2002,2003,2003,2020,0,0,0,2002,2023,2004,0,0,0,0,0,0,899,2018,2023,2020,0,0,0,2002,2003,2003,2020,0,0,0,2002,2003,2003,2020,0,0,0,2002,2023,2004,0,0,0,0,0,0,
|
||||
612,908,874,877,0,0,0,908,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,908,874,877,0,0,0,908,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,908,874,877,0,0,0,908,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
644,0,908,907,0,0,0,0,908,0,877,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,644,0,908,907,0,0,0,0,908,0,877,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,644,0,908,907,0,0,0,0,908,0,877,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,1366,560,846,908,907,0,0,1366,560,846,845,560,1366,0,1802,560,560,846,0,0,0,0,0,0,0,0,0,0,0,0,1366,560,846,908,907,0,0,1366,560,846,845,560,1366,0,1802,560,560,846,0,0,0,0,0,0,0,0,0,0,0,0,1366,560,846,908,907,0,0,1366,560,846,845,560,1366,0,1802,560,560,846,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,1366,881,0,0,0,5,6,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1366,881,0,0,0,5,6,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1366,881,0,0,0,5,6,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,535,207,537,810,0,0,0,0,0,1366,560,846,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,535,207,537,810,0,0,0,0,0,1366,560,846,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,535,207,537,810,0,0,0,0,0,1366,560,846,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,852,0,0,0,0,0,842,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,852,0,0,0,0,0,842,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,852,0,0,0,0,0,842,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,233,819,0,0,0,811,233,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,233,819,0,0,0,811,233,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,233,819,0,0,0,811,233,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,37,38,6,38,39,0,0,0,0,265,0,0,0,0,37,38,6,38,39,0,0,0,0,0,0,0,0,0,0,0,37,38,6,38,39,0,0,0,0,265,0,0,0,0,37,38,6,38,39,0,0,0,0,0,0,0,0,0,0,0,37,38,6,38,39,0,0,0,0,265,0,0,0,0,37,38,6,38,39,0,0,0,0,0,0,0,0,
|
||||
0,0,0,535,503,408,504,537,0,0,0,0,0,0,0,0,0,535,503,408,504,537,0,0,0,0,0,0,0,0,0,0,0,535,503,408,504,537,0,0,0,0,0,0,0,0,0,535,503,408,504,537,0,0,0,0,0,0,0,0,0,0,0,535,503,408,504,537,0,0,0,0,0,0,0,0,0,535,503,408,504,537,0,0,0,0,0,0,0,0
|
||||
</data>
|
||||
</layer>
|
||||
</map>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,11 +1,11 @@
|
|||
{ "columns":9,
|
||||
{ "columns":32,
|
||||
"image":"tileset.png",
|
||||
"imageheight":240,
|
||||
"imagewidth":144,
|
||||
"imageheight":1024,
|
||||
"imagewidth":512,
|
||||
"margin":0,
|
||||
"name":"Level1_Tiles",
|
||||
"name":"Tileset_Space",
|
||||
"spacing":0,
|
||||
"tilecount":135,
|
||||
"tilecount":2048,
|
||||
"tiledversion":"1.8.0",
|
||||
"tileheight":16,
|
||||
"tilewidth":16,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<tileset version="1.8" tiledversion="1.8.0" name="Level1_Tiles" tilewidth="16" tileheight="16" tilecount="135" columns="9">
|
||||
<image source="tileset.png" width="144" height="240"/>
|
||||
<tileset version="1.8" tiledversion="1.8.0" name="Tileset_Space" tilewidth="16" tileheight="16" tilecount="2048" columns="32">
|
||||
<image source="tileset.png" width="512" height="1024"/>
|
||||
</tileset>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 138 KiB |
Binary file not shown.
Binary file not shown.
|
|
@ -38,7 +38,7 @@ def convert_map(input, output, params, target):
|
|||
|
||||
structMap = fxconv.Structure()
|
||||
|
||||
structMap += fxconv.u32(w) + fxconv.u32(h)
|
||||
structMap += fxconv.u32(w) + fxconv.u32(h) + fxconv.u32(nbTilelayer)
|
||||
structMap += fxconv.ref(f"img_{nameTilesetFree}")
|
||||
structMap += fxconv.u32(tileset_size)
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
|
|
@ -25,27 +25,27 @@ void Background::Render( void )
|
|||
int x0 = (int) xlevel;
|
||||
int shifttile = (int) (16*xlevel.frac());
|
||||
|
||||
|
||||
for(int i=0; i<=25; i++)
|
||||
{
|
||||
for(int j=0; j<14; j++)
|
||||
for(int u=0; u<map_Level1.nblayers;u++)
|
||||
for(int i=0; i<=25; i++)
|
||||
{
|
||||
uint16_t index = j * map_Level1.w + (x0+i)%25;
|
||||
uint16_t currentTile = map_Level1.layers[ index ];
|
||||
if (currentTile!=0)
|
||||
for(int j=0; j<14; j++)
|
||||
{
|
||||
uint16_t xtile = ((currentTile % 9)-1) * 16;
|
||||
uint16_t ytile = (currentTile / 9) * 16;
|
||||
azrp_subimage_p8( i*16-shifttile, j*16, map_Level1.tileset, xtile, ytile, 16, 16, DIMAGE_NONE );
|
||||
}
|
||||
uint16_t index = j * map_Level1.w + (x0+i) % map_Level1.w;
|
||||
uint16_t currentTile = map_Level1.layers[u][ index ];
|
||||
if (currentTile!=0)
|
||||
{
|
||||
uint16_t xtile = ((currentTile % map_Level1.tileset_size)-1) * 16;
|
||||
uint16_t ytile = (currentTile / map_Level1.tileset_size) * 16;
|
||||
azrp_subimage_p8( i*16-shifttile, j*16, map_Level1.tileset, xtile, ytile, 16, 16, DIMAGE_NONE );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
void Background::Update( float dt )
|
||||
{
|
||||
libnum::num a = libnum::num( dt / 18000.0f );
|
||||
libnum::num a = libnum::num( dt / 90000.0f); //18000.0f );
|
||||
xlevel += a;
|
||||
}
|
||||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
struct Map {
|
||||
/*width, height and the number of layer of the map*/
|
||||
int w, h;
|
||||
int w, h, nblayers;
|
||||
|
||||
/*the tileset to use*/
|
||||
bopti_image_t *tileset;
|
||||
int tileset_size;
|
||||
|
||||
/*list of all the tiles*/
|
||||
short *layers;
|
||||
short *layers[];
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
#include <gint/clock.h>
|
||||
#include <gint/kmalloc.h>
|
||||
|
||||
#include <gint/keyboard.h>
|
||||
|
||||
#include <libprof.h>
|
||||
#include <gint/usb.h>
|
||||
#include <gint/usb-ff-bulk.h>
|
||||
|
|
@ -22,8 +20,9 @@
|
|||
|
||||
#include <num/num.h>
|
||||
|
||||
#include "collections.h"
|
||||
#include "extrakeyboard.h"
|
||||
|
||||
#include "collections.h"
|
||||
|
||||
#include "player.h"
|
||||
#include "utilities.h"
|
||||
|
|
@ -39,7 +38,7 @@
|
|||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
#include "extrakeyboard.h"
|
||||
|
||||
|
||||
|
||||
bool screenshot = false;
|
||||
|
|
|
|||
Loading…
Reference in New Issue