zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-20 21:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging with develop

Browse Source
This commit is contained in:
Zoe Roux
2021-06-07 21:58:07 +02:00
parent fe9a650427 6ff8a20030
commit 31f712531a
23 changed files with 255 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/Map/Map.cpp
View File

@@ -46,6 +46,7 @@ namespace BBM
const std::string MapGenerator::stairsPath = MapGenerator::wallAssetsPath + "stairs";
const std::string MapGenerator::bumperPath = MapGenerator::wallAssetsPath + "bumper";
const std::string MapGenerator::holePath = MapGenerator::wallAssetsPath + "hole";
const std::string MapGenerator::secondFloorHolePath = MapGenerator::secondFloorPath + "_hole";
void MapGenerator::generateUnbreakableBlock(int width, int height, std::shared_ptr<WAL::Scene> scene)
{
@@ -181,10 +182,17 @@ namespace BBM
{
static const std::string holeObj = holePath + objExtension;
static const std::string holePng = holePath + imageExtension;
static const std::string secondFloorObj = secondFloorHolePath + objExtension;
static const std::string secondFloorPng = secondFloorHolePath + imageExtension;
scene->addEntity("Hole Block")
.addComponent<PositionComponent>(Vector3f(coords.x, coords.y - 1, coords.z))
.addComponent<Drawable3DComponent, RAY3D::Model>(holeObj, std::make_pair(MAP_DIFFUSE, holePng));
WAL::Entity &holeEntity = scene->addEntity("Hole Block");
holeEntity.addComponent<PositionComponent>(Vector3f(coords.x, coords.y - 1, coords.z));
if (coords.y == 0)
holeEntity.addComponent<Drawable3DComponent, RAY3D::Model>(holeObj, std::make_pair(MAP_DIFFUSE, holePng));
else
holeEntity.addComponent<Drawable3DComponent, RAY3D::Model>(secondFloorObj, std::make_pair(MAP_DIFFUSE, secondFloorPng));
/*.addComponent<CollisionComponent>([](WAL::Entity &other, const WAL::Entity &entity) {
if (other.hasComponent<HealthComponent>()) {
auto &health = other.getComponent<HealthComponent>();