Backup
This commit is contained in:
parent
34d1529dd7
commit
06b36a96c4
|
|
@ -25,6 +25,7 @@ add_custom_command(
|
|||
OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level2.json"
|
||||
OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level3.json"
|
||||
OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level4.json"
|
||||
OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level5.json"
|
||||
DEPENDS assets-cg/converters.py
|
||||
assets-cg/levels/tileset.png
|
||||
assets-cg/levels/tilesetnpp.tsx
|
||||
|
|
@ -33,6 +34,7 @@ add_custom_command(
|
|||
assets-cg/levels/level2.tmx
|
||||
assets-cg/levels/level3.tmx
|
||||
assets-cg/levels/level4.tmx
|
||||
assets-cg/levels/level5.tmx
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
|
|
@ -65,6 +67,7 @@ set(ASSETS_cg
|
|||
assets-cg/levels/level2.json
|
||||
assets-cg/levels/level3.json
|
||||
assets-cg/levels/level4.json
|
||||
assets-cg/levels/level5.json
|
||||
# ...
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
{ "compressionlevel":-1,
|
||||
"height":14,
|
||||
"infinite":false,
|
||||
"layers":[
|
||||
{
|
||||
"data":[1, 1, 1, 1, 1, 47, 47, 1, 1, 1, 47, 47, 47, 47, 47, 1, 1, 1, 47, 47, 1, 1, 1, 1, 1, 1, 3, 4, 1, 46, 0, 0, 48, 1, 3, 0, 0, 0, 0, 0, 4, 1, 46, 0, 0, 48, 1, 3, 4, 1, 1, 13, 0, 4, 50, 0, 0, 49, 3, 0, 0, 0, 0, 0, 0, 0, 4, 50, 0, 0, 49, 3, 0, 14, 1, 1, 1, 13, 0, 0, 0, 0, 0, 0, 0, 0, 20, 45, 9, 0, 0, 0, 0, 0, 0, 0, 0, 14, 1, 1, 1, 47, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 47, 1, 46, 0, 0, 0, 0, 39, 40, 0, 0, 39, 13, 0, 0, 0, 14, 40, 0, 0, 39, 40, 0, 0, 0, 0, 48, 46, 0, 0, 0, 0, 49, 50, 0, 0, 4, 50, 0, 0, 0, 49, 3, 0, 0, 49, 50, 0, 0, 0, 0, 48, 1, 45, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 45, 1, 1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 1, 1, 1, 3, 0, 14, 40, 0, 0, 39, 13, 0, 0, 0, 30, 0, 0, 0, 14, 40, 0, 0, 39, 13, 0, 4, 1, 1, 13, 14, 1, 46, 0, 0, 48, 46, 0, 0, 39, 1, 40, 0, 0, 48, 46, 0, 0, 48, 1, 13, 14, 1, 1, 1, 1, 1, 46, 0, 0, 48, 46, 0, 0, 4, 47, 3, 0, 0, 48, 46, 0, 0, 48, 1, 1, 1, 1, 1, 1, 1, 1, 1, 45, 45, 1, 1, 13, 0, 0, 0, 0, 0, 14, 1, 1, 45, 45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 45, 45, 45, 45, 45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
|
||||
"height":14,
|
||||
"id":1,
|
||||
"name":"Background",
|
||||
"opacity":1,
|
||||
"type":"tilelayer",
|
||||
"visible":true,
|
||||
"width":25,
|
||||
"x":0,
|
||||
"y":0
|
||||
},
|
||||
{
|
||||
"data":[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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 34, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 34, 0, 0, 23, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 0, 0, 42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 33, 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, 32, 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, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
"height":14,
|
||||
"id":2,
|
||||
"name":"Foreground",
|
||||
"opacity":1,
|
||||
"type":"tilelayer",
|
||||
"visible":true,
|
||||
"width":25,
|
||||
"x":0,
|
||||
"y":0
|
||||
}],
|
||||
"nextlayerid":3,
|
||||
"nextobjectid":1,
|
||||
"orientation":"orthogonal",
|
||||
"renderorder":"right-down",
|
||||
"tiledversion":"1.8.0",
|
||||
"tileheight":16,
|
||||
"tilesets":[
|
||||
{
|
||||
"firstgid":1,
|
||||
"source":"tilesetnpp.tsx"
|
||||
}],
|
||||
"tilewidth":16,
|
||||
"type":"map",
|
||||
"version":"1.8",
|
||||
"width":25
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="25" height="14" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
|
||||
<tileset firstgid="1" source="tilesetnpp.tsx"/>
|
||||
<layer id="1" name="Background" width="25" height="14">
|
||||
<data encoding="csv">
|
||||
1,1,1,1,1,47,47,1,1,1,47,47,47,47,47,1,1,1,47,47,1,1,1,1,1,
|
||||
1,3,4,1,46,0,0,48,1,3,0,0,0,0,0,4,1,46,0,0,48,1,3,4,1,
|
||||
1,13,0,4,50,0,0,49,3,0,0,0,0,0,0,0,4,50,0,0,49,3,0,14,1,
|
||||
1,1,13,0,0,0,0,0,0,0,0,20,45,9,0,0,0,0,0,0,0,0,14,1,1,
|
||||
1,47,50,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,49,47,1,
|
||||
46,0,0,0,0,39,40,0,0,39,13,0,0,0,14,40,0,0,39,40,0,0,0,0,48,
|
||||
46,0,0,0,0,49,50,0,0,4,50,0,0,0,49,3,0,0,49,50,0,0,0,0,48,
|
||||
1,45,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,45,1,
|
||||
1,1,3,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,4,1,1,
|
||||
1,3,0,14,40,0,0,39,13,0,0,0,30,0,0,0,14,40,0,0,39,13,0,4,1,
|
||||
1,13,14,1,46,0,0,48,46,0,0,39,1,40,0,0,48,46,0,0,48,1,13,14,1,
|
||||
1,1,1,1,46,0,0,48,46,0,0,4,47,3,0,0,48,46,0,0,48,1,1,1,1,
|
||||
1,1,1,1,1,45,45,1,1,13,0,0,0,0,0,14,1,1,45,45,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,45,45,45,45,45,1,1,1,1,1,1,1,1,1,1
|
||||
</data>
|
||||
</layer>
|
||||
<layer id="2" name="Foreground" width="25" height="14">
|
||||
<data encoding="csv">
|
||||
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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,43,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,43,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||
0,23,0,0,34,0,0,0,34,0,0,0,0,0,0,0,23,0,0,0,23,0,0,34,0,
|
||||
0,23,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,34,0,
|
||||
0,0,0,0,0,0,0,0,0,0,0,0,31,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,0,0,0,0,0,0,0,0,
|
||||
0,0,44,0,0,42,42,0,0,0,0,0,0,0,0,0,0,0,42,42,0,0,44,0,0,
|
||||
0,0,0,0,0,42,42,0,0,0,0,0,0,0,0,0,0,0,42,42,0,0,0,0,0,
|
||||
0,0,0,0,0,33,33,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,32,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,0,0,0,0,0,0,0,0
|
||||
</data>
|
||||
</layer>
|
||||
</map>
|
||||
|
|
@ -20,6 +20,7 @@ extern struct Map map_level1;
|
|||
extern struct Map map_level2;
|
||||
extern struct Map map_level3;
|
||||
extern struct Map map_level4;
|
||||
extern struct Map map_level5;
|
||||
|
||||
extern bool drawbackground;
|
||||
extern bool drawforeground;
|
||||
|
|
@ -46,7 +47,8 @@ extern bopti_image_t img_selected;
|
|||
|
||||
Level::Level( )
|
||||
{
|
||||
map_level = &map_level1;
|
||||
map_level = &map_level0;
|
||||
this->UpdateBorders();
|
||||
}
|
||||
|
||||
Level::~Level( )
|
||||
|
|
@ -61,6 +63,7 @@ void Level::ChangeMap( int level, Player *MyPlayer )
|
|||
else if(level==2) map_level = &map_level2;
|
||||
else if(level==3) map_level = &map_level3;
|
||||
else if(level==4) map_level = &map_level4;
|
||||
else if(level==5) map_level = &map_level5;
|
||||
else map_level = &map_level0;
|
||||
|
||||
this->UpdateDataMap( MyPlayer );
|
||||
|
|
|
|||
|
|
@ -251,7 +251,6 @@ int main(void)
|
|||
azrp_shader_image_rgb16_configure();
|
||||
azrp_shader_image_p8_configure();
|
||||
azrp_shader_image_p4_configure();
|
||||
azrp_shader_triangle_configure();
|
||||
|
||||
azrp_hook_set_prefrag(hook_prefrag);
|
||||
|
||||
|
|
@ -294,6 +293,8 @@ int main(void)
|
|||
|
||||
Azur_draw_text(1,01, "FPS = %.0f", (float) (1000.0f / elapsedTime) );
|
||||
|
||||
azrp_circle( 198, 112, 20, C_RED );
|
||||
|
||||
azrp_update();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue