Zeronaut/KaijuSaveEarth
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Zeronaut:162f58b32fe5b889ee89eed154057d895a901c74
Branches Tags
Zeronaut:main
Zeronaut:macos
Zeronaut:emscripten
..
compare: Zeronaut:9b4ea773c3372ca8c192cae2bbaf6bf653e64fa2
Branches Tags
Zeronaut:macos
Zeronaut:emscripten
Zeronaut:main

No commits in common. "162f58b32fe5b889ee89eed154057d895a901c74" and "9b4ea773c3372ca8c192cae2bbaf6bf653e64fa2" have entirely different histories.
162f58b32f ... 9b4ea773c3

3 changed files with 3 additions and 4 deletions
Show Stats Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
src/ecs/TileMapComponent.h
View File

@ -46,8 +46,8 @@ public:
{
// TILESON ~~~~~~~~~~~
const std::filesystem::path jsonPath = std::filesystem::u8path(mapPath);
//const std::filesystem::path jsonPath = std::filesystem::u8path("/Users/ayoungblood/Projects/KaijuSaveEarth/assets/maps/kaiju-city-map.json");
//const std::filesystem::path jsonPath = std::filesystem::u8path(mapPath);
const std::filesystem::path jsonPath = std::filesystem::u8path("/Users/ayoungblood/Projects/KaijuSaveEarth/assets/maps/kaiju-city-map.json");
map = t.parse(jsonPath);
//std::cout << "Trying to load json tile map from: " << jsonPath << std::endl;
if(map->getStatus() == tson::ParseStatus::OK)

3
src/game/Game.cpp
View File

@ -191,8 +191,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
levelMap.y = 0;
// printf("Trying to load Tilemap\n");
std::string mapPath = Game::projPath + "assets/maps/kaiju-city-map.json";
gameScene.addComponent<TileMapComponent>(mapPath,"kaiju-city","Tile Layer 1","Collision",gScale,player.getComponent<TransformComponent>().position.x+player.getComponent<TransformComponent>().width/2,player.getComponent<TransformComponent>().position.y+player.getComponent<TransformComponent>().height/2); //150,100
gameScene.addComponent<TileMapComponent>("assets/maps/kaiju-city-map.json","kaiju-city","Tile Layer 1","Collision",gScale,player.getComponent<TransformComponent>().position.x+player.getComponent<TransformComponent>().width/2,player.getComponent<TransformComponent>().position.y+player.getComponent<TransformComponent>().height/2); //150,100
gameScene.addGroup(groupMap);
// printf("Completed loading Tilemap\n");