Zeronaut/BeagleRescue
Template
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Kdevelop included, libtmxparser excluded

Browse Source
This commit is contained in:
Alan Youngblood
2023-07-11 14:28:46 -04:00
parent fd17014eef
commit e4c270a81d
128 changed files with 17774 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/Game.cpp
View File

@ -134,7 +134,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
// Trying out the halsafar/libtmx-parser
tmxparser::TmxReturn error;
/* tmxparser::TmxReturn error;
tmxparser::TmxMap map;
error = tmxparser::parseFromFile("assets/maps/testmapb64.tmx", &map, "assets/textures/tiles/");
@ -150,7 +150,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
} else {
std::cout << "Encountered error loading map file: " << error << std::endl;
}
*/
// std::cout << "levelMap.w - camera.w: " << levelMap.w-camera.w << std::endl;
assets->AddTexture("player", "assets/textures/actors/firefighter.png");
@ -237,7 +237,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
player.addComponent<KeyboardController>();
player.addGroup(groupPlayers);
gameScene.addComponent<TileMapComponent>(map,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>(/*map,*/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);
playerPosition = Vector2D().Zero();
@ -254,7 +254,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
}
// ====== Setup groups
auto& tiles(manager.getGroup(Game::groupMap));
//auto& tiles(manager.getGroup(Game::groupMap));
auto& players(manager.getGroup(Game::groupPlayers));
auto& colliders(manager.getGroup(Game::groupColliders));
auto& objects(manager.getGroup(Game::groupObjects));

10
src/game/Game.hpp
View File

@ -7,16 +7,18 @@
#ifndef GAME_HPP_
#define GAME_HPP_
#include "../../libsdl2/include/SDL.h"
#include "../../libsdl2_image/SDL_image.h"
#include "../../libsdl2_mixer/SDL_mixer.h"
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
#include <SDL2/SDL_mixer.h>
#include <stdio.h>
#include <iostream>
#include <vector>
#include "Vector2D.h"
#include "../assetmgr/AssetManager.h"
#include "GameStateManager.h"
#include "../../libtmx-parser/src/tmxparser.h"
//#include "../../libtmx-parser/src/tmxparser.h"
//#include "libtmx-parser/src/tmxparser.h"
//#include <tmxparser.h>
class ColliderComponent;
class AssetManager;