Mario: saving map as binary file v1.0
This commit is contained in:
parent
d4991ea3a7
commit
183bd53b66
1
mario/.gitignore
vendored
1
mario/.gitignore
vendored
@ -3,3 +3,4 @@ sprites
|
|||||||
mario
|
mario
|
||||||
editor
|
editor
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
*bin
|
||||||
|
@ -10,7 +10,7 @@ enum BlockType {
|
|||||||
OVERWORLD = 0,
|
OVERWORLD = 0,
|
||||||
UNDERWORLD = 1,
|
UNDERWORLD = 1,
|
||||||
WATER = 2,
|
WATER = 2,
|
||||||
BOWSER = 3
|
BOWSER = 4
|
||||||
};
|
};
|
||||||
|
|
||||||
std::shared_ptr<SDLPP::RectangleRender> createTerrainBlock( uint64_t block_id, BlockType type, std::shared_ptr<SDLPP::Renderer> &renderer, bool collision = false );
|
std::shared_ptr<SDLPP::RectangleRender> createTerrainBlock( uint64_t block_id, BlockType type, std::shared_ptr<SDLPP::Renderer> &renderer, bool collision = false );
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
std::shared_ptr< SDLPP::Renderer > renderer = nullptr;
|
std::shared_ptr< SDLPP::Renderer > renderer = nullptr;
|
||||||
bool quit = false;
|
bool quit = false;
|
||||||
|
std::vector<std::array<std::pair<uint8_t, uint16_t>,16>> objects = {};
|
||||||
|
|
||||||
void handleKeyDown( SDL_Keycode key, SDLPP::Scene &scene ) {
|
void handleKeyDown( SDL_Keycode key, SDLPP::Scene &scene ) {
|
||||||
switch ( key ) {
|
switch ( key ) {
|
||||||
@ -113,7 +114,39 @@ int main() {
|
|||||||
bg->setId( 1 );
|
bg->setId( 1 );
|
||||||
scene->addObject( bg );
|
scene->addObject( bg );
|
||||||
|
|
||||||
loadMap( scene, nullptr, "testmap.txt", renderer );
|
loadMap( scene, "test_binary.bin", renderer, objects );
|
||||||
|
|
||||||
|
// grid
|
||||||
|
for ( int i = 1; i < 20; i++ ) {
|
||||||
|
auto line_vertical = std::make_shared< SDLPP::LineRenderer >(
|
||||||
|
i * BLOCK_SIZE, 1 - 16 * BLOCK_SIZE, i * BLOCK_SIZE, 1.0, renderer, "#282828" );
|
||||||
|
line_vertical->setStatic();
|
||||||
|
line_vertical->setAlignment( SDLPP::OBJ_CENTER, SDLPP::OBJ_CENTER );
|
||||||
|
scene->addObject(line_vertical);
|
||||||
|
if(i > 2) {
|
||||||
|
auto line_horizontal = std::make_shared< SDLPP::LineRenderer >(
|
||||||
|
BLOCK_SIZE, ( i + 1 ) * BLOCK_SIZE, 19 * BLOCK_SIZE,
|
||||||
|
( i + 1 ) * BLOCK_SIZE, renderer, "#282828" );
|
||||||
|
line_horizontal->setStatic();
|
||||||
|
line_horizontal->setAlignment( SDLPP::OBJ_CENTER, SDLPP::OBJ_CENTER );
|
||||||
|
scene->addObject(line_horizontal);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// white rectangles
|
||||||
|
auto rectangle1 = std::make_shared< SDLPP::RectangleRender >(
|
||||||
|
0, 4 * BLOCK_SIZE, BLOCK_SIZE, 16 * BLOCK_SIZE, renderer, "#FFFFFF88", true);
|
||||||
|
rectangle1->setAlignment(SDLPP::OBJ_CENTER, SDLPP::OBJ_CENTER);
|
||||||
|
rectangle1->setId(1);
|
||||||
|
rectangle1->addCollision(SDLPP::RectColider(0, 0, 1, 1));
|
||||||
|
scene->addObject(rectangle1);
|
||||||
|
// white rectangles
|
||||||
|
auto rectangle2 = std::make_shared< SDLPP::RectangleRender >(
|
||||||
|
19*BLOCK_SIZE, 4 * BLOCK_SIZE, 20*BLOCK_SIZE, 16 * BLOCK_SIZE, renderer, "#FFFFFF88", true);
|
||||||
|
rectangle2->setAlignment(SDLPP::OBJ_CENTER, SDLPP::OBJ_CENTER);
|
||||||
|
rectangle2->setId(1);
|
||||||
|
rectangle2->addCollision(SDLPP::RectColider(0, 0, 1, 1));
|
||||||
|
scene->addObject(rectangle2);
|
||||||
|
|
||||||
|
|
||||||
FPSmanager gFPS;
|
FPSmanager gFPS;
|
||||||
SDL_initFramerate( &gFPS );
|
SDL_initFramerate( &gFPS );
|
||||||
@ -135,6 +168,7 @@ int main() {
|
|||||||
base = SDL_GetTicks();
|
base = SDL_GetTicks();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// saveMap("test_binary.bin", objects);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -5,42 +5,42 @@
|
|||||||
#include "blocks.hpp"
|
#include "blocks.hpp"
|
||||||
#include "objectids.hpp"
|
#include "objectids.hpp"
|
||||||
|
|
||||||
std::shared_ptr<SDLPP::RectangleRender> decodeObject( char obj, BlockType type, double x, double y, std::shared_ptr<SDLPP::Renderer> &renderer) {
|
uint64_t decodeObject( char obj ) {
|
||||||
switch(obj) {
|
switch(obj) {
|
||||||
case 'F':
|
case 'F':
|
||||||
return createTerrainBlock(FLOOR_ID, type, renderer, x, y, true);
|
return FLOOR_ID;
|
||||||
case 'I':
|
case 'I':
|
||||||
return createTerrainBlock(HILL_INCLINE_ID, type, renderer, x, y);
|
return HILL_INCLINE_ID;
|
||||||
case 'R':
|
case 'R':
|
||||||
return createTerrainBlock(HILL_DOTS_RIGHT_ID, type, renderer, x, y);
|
return HILL_DOTS_RIGHT_ID;
|
||||||
case 'G':
|
case 'G':
|
||||||
return createTerrainBlock(HILL_FILL_ID, type, renderer, x, y);
|
return HILL_FILL_ID;
|
||||||
case 'L':
|
case 'L':
|
||||||
return createTerrainBlock(HILL_DOTS_LEFT_ID, type, renderer, x, y);
|
return HILL_DOTS_LEFT_ID;
|
||||||
case 'D':
|
case 'D':
|
||||||
return createTerrainBlock(HILL_DECLINE_ID, type, renderer, x, y);
|
return HILL_DECLINE_ID;
|
||||||
case 'T':
|
case 'T':
|
||||||
return createTerrainBlock(HILL_TOP_ID, type, renderer, x, y);
|
return HILL_TOP_ID;
|
||||||
case 'q':
|
case 'q':
|
||||||
return createTerrainBlock(BUSH_LEFT_ID, type, renderer, x, y);
|
return BUSH_LEFT_ID;
|
||||||
case 'w':
|
case 'w':
|
||||||
return createTerrainBlock(BUSH_MIDDLE_ID, type, renderer, x, y);
|
return BUSH_MIDDLE_ID;
|
||||||
case 'r':
|
case 'r':
|
||||||
return createTerrainBlock(BUSH_RIGHT_ID, type, renderer, x, y);
|
return BUSH_RIGHT_ID;
|
||||||
case 'a':
|
case 'a':
|
||||||
return createTerrainBlock(CLOUD_LEFT_BOTTOM_ID, type, renderer, x, y);
|
return CLOUD_LEFT_BOTTOM_ID;
|
||||||
case 's':
|
case 's':
|
||||||
return createTerrainBlock(CLOUD_MIDDLE_BOTTOM_ID, type, renderer, x, y);
|
return CLOUD_MIDDLE_BOTTOM_ID;
|
||||||
case 'd':
|
case 'd':
|
||||||
return createTerrainBlock(CLOUD_RIGHT_BOTTOM_ID, type, renderer, x, y);
|
return CLOUD_RIGHT_BOTTOM_ID;
|
||||||
case 'z':
|
case 'z':
|
||||||
return createTerrainBlock(CLOUD_LEFT_TOP_ID, type, renderer, x, y);
|
return CLOUD_LEFT_TOP_ID;
|
||||||
case 'x':
|
case 'x':
|
||||||
return createTerrainBlock(CLOUD_MIDDLE_TOP_ID, type, renderer, x, y);
|
return CLOUD_MIDDLE_TOP_ID;
|
||||||
case 'c':
|
case 'c':
|
||||||
return createTerrainBlock(CLOUD_RIGHT_TOP_ID, type, renderer, x, y);
|
return CLOUD_RIGHT_TOP_ID;
|
||||||
}
|
}
|
||||||
return nullptr;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void loadMap(std::shared_ptr<SDLPP::Scene> &scene, std::shared_ptr<SDLPP::RectangleRender> mario, const std::string &file, std::shared_ptr<SDLPP::Renderer> &renderer) {
|
void loadMap(std::shared_ptr<SDLPP::Scene> &scene, std::shared_ptr<SDLPP::RectangleRender> mario, const std::string &file, std::shared_ptr<SDLPP::Renderer> &renderer) {
|
||||||
@ -63,16 +63,98 @@ void loadMap(std::shared_ptr<SDLPP::Scene> &scene, std::shared_ptr<SDLPP::Rectan
|
|||||||
cur_x += BLOCK_SIZE;
|
cur_x += BLOCK_SIZE;
|
||||||
if(buffer[j] == ' ')
|
if(buffer[j] == ' ')
|
||||||
continue;
|
continue;
|
||||||
auto obj = decodeObject(buffer[j], OVERWORLD, cur_x, cur_y, renderer);
|
auto id = decodeObject(buffer[j]);
|
||||||
|
std::shared_ptr<SDLPP::RectangleRender> obj = nullptr;
|
||||||
|
if(id == FLOOR_ID)
|
||||||
|
obj = createTerrainBlock(id, OVERWORLD, renderer, cur_x, cur_y, true);
|
||||||
|
else
|
||||||
|
obj = createTerrainBlock(id, OVERWORLD, renderer, cur_x, cur_y);
|
||||||
if(obj != nullptr)
|
if(obj != nullptr)
|
||||||
scene->addObject(obj);
|
scene->addObject(obj);
|
||||||
}
|
}
|
||||||
cur_y += BLOCK_SIZE;
|
cur_y += BLOCK_SIZE;
|
||||||
}
|
}
|
||||||
if(mario != nullptr) {
|
mario->setPos(mario_x * BLOCK_SIZE, 1 - (rows - mario_y) * BLOCK_SIZE);
|
||||||
mario->setPos(mario_x * BLOCK_SIZE, 1 - (rows - mario_y) * BLOCK_SIZE);
|
scene->moveZTop(mario);
|
||||||
scene->moveZTop(mario);
|
}
|
||||||
} else {
|
|
||||||
//createMarioBlock
|
/*void loadMap(std::shared_ptr<SDLPP::Scene> &scene, const std::string &file, std::shared_ptr<SDLPP::Renderer> &renderer, std::vector<std::array<std::pair<uint8_t, uint16_t>,16>> &objects) {
|
||||||
|
std::fstream mapFile;
|
||||||
|
mapFile.open(file, std::ios::in);
|
||||||
|
std::string buffer;
|
||||||
|
std::getline(mapFile, buffer);
|
||||||
|
auto cols = std::stoi(buffer);
|
||||||
|
std::getline(mapFile, buffer);
|
||||||
|
auto rows = std::stoi(buffer);
|
||||||
|
std::getline(mapFile, buffer);
|
||||||
|
auto mario_x = std::stoi(buffer);
|
||||||
|
std::getline(mapFile, buffer);
|
||||||
|
auto mario_y = std::stoi(buffer);
|
||||||
|
auto cur_y = 1 - rows * BLOCK_SIZE;
|
||||||
|
objects.resize(cols);
|
||||||
|
for(int i = 0; i < rows; i++) {
|
||||||
|
std::getline(mapFile, buffer);
|
||||||
|
auto cur_x = -BLOCK_SIZE;
|
||||||
|
for(int j = 0; j < cols; j++) {
|
||||||
|
cur_x += BLOCK_SIZE;
|
||||||
|
if(buffer[j] == ' ') {
|
||||||
|
objects[j][i] = {OVERWORLD, 0};
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
auto id = decodeObject(buffer[j]);
|
||||||
|
objects[j][i] = {OVERWORLD, id};
|
||||||
|
|
||||||
|
std::shared_ptr<SDLPP::RectangleRender> obj = nullptr;
|
||||||
|
if(id == FLOOR_ID)
|
||||||
|
obj = createTerrainBlock(id, OVERWORLD, renderer, cur_x, cur_y, true);
|
||||||
|
else
|
||||||
|
obj = createTerrainBlock(id, OVERWORLD, renderer, cur_x, cur_y);
|
||||||
|
if(obj != nullptr)
|
||||||
|
scene->addObject(obj);
|
||||||
|
}
|
||||||
|
cur_y += BLOCK_SIZE;
|
||||||
|
}
|
||||||
|
objects[mario_x][mario_y] = {OVERWORLD, MARIO_ID};
|
||||||
|
}*/
|
||||||
|
|
||||||
|
void loadMap(std::shared_ptr<SDLPP::Scene> &scene, const std::string &file, std::shared_ptr<SDLPP::Renderer> &renderer, std::vector<std::array<std::pair<uint8_t, uint16_t>,16>> &objects) {
|
||||||
|
std::ifstream map_file;
|
||||||
|
map_file.open(file, std::ios::in | std::ios::binary);
|
||||||
|
uint16_t cols;
|
||||||
|
map_file.read((char*)&cols, sizeof(uint16_t)/sizeof(char));
|
||||||
|
objects.resize(cols);
|
||||||
|
for(uint16_t i = 0; i < cols; i++) {
|
||||||
|
auto &col = objects[i];
|
||||||
|
for(int j = 0; j < 16; j++) {
|
||||||
|
uint16_t input_number;
|
||||||
|
map_file.read((char *)&input_number, sizeof(uint16_t)/sizeof(char));
|
||||||
|
uint8_t type = (input_number & 0xF000)>>12;
|
||||||
|
uint16_t id = (input_number & 0x0FFF) | BLOCK_PREFIX;
|
||||||
|
col[i] = {type, id};
|
||||||
|
bool collision = false;
|
||||||
|
if(id == FLOOR_ID) {
|
||||||
|
collision = true;
|
||||||
|
}
|
||||||
|
auto obj = createTerrainBlock(id, static_cast<BlockType>(type), renderer, i * BLOCK_SIZE, 1 - (16-j) * BLOCK_SIZE, collision);
|
||||||
|
if(obj != nullptr)
|
||||||
|
scene->addObject(obj);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void saveMap(const std::string &file, std::vector<std::array<std::pair<uint8_t, uint16_t>,16>> &objects) {
|
||||||
|
std::ofstream output_file;
|
||||||
|
output_file.open(file, std::ios::out | std::ios::binary);
|
||||||
|
uint16_t cols = objects.size();
|
||||||
|
output_file.write((char*)&cols, sizeof(uint16_t)/sizeof(char));
|
||||||
|
for(auto &col : objects) {
|
||||||
|
for(int i = 0; i < 16; i++) {
|
||||||
|
auto &obj = col[i];
|
||||||
|
uint16_t wide_type = obj.first;
|
||||||
|
wide_type = wide_type<<12;
|
||||||
|
uint16_t write_num = (0x0FFF & obj.second) | wide_type;
|
||||||
|
output_file.write((char*)&write_num, sizeof(uint16_t)/sizeof(char));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
output_file.close();
|
||||||
|
}
|
||||||
|
@ -5,5 +5,7 @@
|
|||||||
#include "../sdlpp/sdlpp_rectrenderer.hpp"
|
#include "../sdlpp/sdlpp_rectrenderer.hpp"
|
||||||
|
|
||||||
void loadMap(std::shared_ptr<SDLPP::Scene> &scene, std::shared_ptr<SDLPP::RectangleRender> mario, const std::string &file, std::shared_ptr<SDLPP::Renderer> &renderer);
|
void loadMap(std::shared_ptr<SDLPP::Scene> &scene, std::shared_ptr<SDLPP::RectangleRender> mario, const std::string &file, std::shared_ptr<SDLPP::Renderer> &renderer);
|
||||||
|
void loadMap(std::shared_ptr<SDLPP::Scene> &scene, const std::string &file, std::shared_ptr<SDLPP::Renderer> &renderer, std::vector<std::array<std::pair<uint8_t, uint16_t>,16>> &objects);
|
||||||
|
void saveMap(const std::string &file, std::vector<std::array<std::pair<uint8_t, uint16_t>,16>> &objects);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,28 +1,30 @@
|
|||||||
#ifndef OBJECTIDS_H
|
#ifndef OBJECTIDS_H
|
||||||
#define OBJECTIDS_H
|
#define OBJECTIDS_H
|
||||||
|
|
||||||
#define FLOOR_ID 0x70000001
|
#define BLOCK_PREFIX 0x7000
|
||||||
#define HILL_INCLINE_ID 0x70000002
|
#define FLOOR_ID 0x7001
|
||||||
#define HILL_DECLINE_ID 0x70000003
|
#define HILL_INCLINE_ID 0x7002
|
||||||
#define HILL_DOTS_RIGHT_ID 0x70000004
|
#define HILL_DECLINE_ID 0x7003
|
||||||
#define HILL_DOTS_LEFT_ID 0x70000005
|
#define HILL_DOTS_RIGHT_ID 0x7004
|
||||||
#define HILL_FILL_ID 0x70000006
|
#define HILL_DOTS_LEFT_ID 0x7005
|
||||||
#define HILL_TOP_ID 0x70000007
|
#define HILL_FILL_ID 0x7006
|
||||||
#define BUSH_LEFT_ID 0x70000008
|
#define HILL_TOP_ID 0x7007
|
||||||
#define BUSH_MIDDLE_ID 0x70000009
|
#define BUSH_LEFT_ID 0x7008
|
||||||
#define BUSH_RIGHT_ID 0x7000000A
|
#define BUSH_MIDDLE_ID 0x7009
|
||||||
#define CLOUD_LEFT_BOTTOM_ID 0x7000000B
|
#define BUSH_RIGHT_ID 0x700A
|
||||||
#define CLOUD_MIDDLE_BOTTOM_ID 0x7000000C
|
#define CLOUD_LEFT_BOTTOM_ID 0x700B
|
||||||
#define CLOUD_RIGHT_BOTTOM_ID 0x7000000D
|
#define CLOUD_MIDDLE_BOTTOM_ID 0x700C
|
||||||
#define CLOUD_LEFT_TOP_ID 0x7000000E
|
#define CLOUD_RIGHT_BOTTOM_ID 0x700D
|
||||||
#define CLOUD_MIDDLE_TOP_ID 0x7000000F
|
#define CLOUD_LEFT_TOP_ID 0x700E
|
||||||
#define CLOUD_RIGHT_TOP_ID 0x70000010
|
#define CLOUD_MIDDLE_TOP_ID 0x700F
|
||||||
|
#define CLOUD_RIGHT_TOP_ID 0x7010
|
||||||
|
#define MARIO_ID 0x7FFF
|
||||||
|
|
||||||
#define DEATH_ID 0x10000001
|
#define DEATH_ID 0x1001
|
||||||
#define STOP_MOVEMENT 0x2000
|
#define STOP_MOVEMENT 0x2000
|
||||||
|
|
||||||
#define MARIO_FLOOR_DETECT 0x20000001
|
#define MARIO_FLOOR_DETECT 0x2001
|
||||||
#define MARIO_LEFT_SIDE_DETECT 0x20000002
|
#define MARIO_LEFT_SIDE_DETECT 0x2002
|
||||||
#define MARIO_RIGHT_SIDE_DETECT 0x20000003
|
#define MARIO_RIGHT_SIDE_DETECT 0x2003
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user