|
@@ -125,8 +125,10 @@ void Game::LoadLevel(int level)
|
|
|
|
|
|
assert(mapFile.is_open());
|
|
|
|
|
|
- for (int y = 0; y < mapNumRows; y++) {
|
|
|
- for (int x = 0; x < mapNumCols; x++) {
|
|
|
+ for (int y = 0; y < mapNumRows; y++)
|
|
|
+ {
|
|
|
+ for (int x = 0; x < mapNumCols; x++)
|
|
|
+ {
|
|
|
char ch[2] = {0, 0};
|
|
|
mapFile.get(ch[0]);
|
|
|
int srcRectY = atoi(ch) * tileSize;
|
|
@@ -136,7 +138,7 @@ void Game::LoadLevel(int level)
|
|
|
|
|
|
Entity tile = registry->createEntity();
|
|
|
tile.addComponent<TransformComponent>(glm::vec2(x * (tileScale * tileSize), y * (tileScale * tileSize)), glm::vec2(tileScale, tileScale), 0.0);
|
|
|
- tile.addComponent<SpriteComponent>("main-tileset", tileSize, tileSize, srcRectX, srcRectY);
|
|
|
+ tile.addComponent<SpriteComponent>("main-tileset", 0, tileSize, tileSize, srcRectX, srcRectY);
|
|
|
}
|
|
|
}
|
|
|
mapFile.close();
|
|
@@ -144,12 +146,12 @@ void Game::LoadLevel(int level)
|
|
|
Entity tank = this->registry->createEntity();
|
|
|
tank.addComponent<TransformComponent>(glm::vec2(10, 30), glm::vec2(1, 1), 0);
|
|
|
tank.addComponent<RigidBodyComponent>(glm::vec2(40, 0));
|
|
|
- tank.addComponent<SpriteComponent>("tank-image", 32, 32);
|
|
|
+ tank.addComponent<SpriteComponent>("tank-image", 2, 32, 32);
|
|
|
|
|
|
Entity truck = this->registry->createEntity();
|
|
|
truck.addComponent<TransformComponent>(glm::vec2(50, 100), glm::vec2(1, 1), 0);
|
|
|
truck.addComponent<RigidBodyComponent>(glm::vec2(0, 50));
|
|
|
- truck.addComponent<SpriteComponent>("truck-image", 32, 32);
|
|
|
+ truck.addComponent<SpriteComponent>("truck-image", 1, 32, 32);
|
|
|
}
|
|
|
|
|
|
void Game::Setup()
|