add scaling factor

.gitignore

@@ -54,6 +54,8 @@ Thumbs.db
 *.gcov
 coverage/
 
+*.png
+
 docs/generated/
 
 bin/

src/level.cpp

@@ -8,7 +8,8 @@
 #include <iostream>
 #include <string>
 
-namespace advanced_wars {
+namespace advanced_wars
+{
 
   Level::Level(std::string name, int width, int height, std::vector<Tile> tiles,
                std::vector<Building> buildings, std::vector<Unit> units)
@@ -21,23 +22,30 @@ Level::Level(std::string name, int width, int height, std::vector<Tile> tiles,
           */
         };
 
-void Level::render(Engine &engine, std::vector<SDL_Event> &events) {
+  void Level::render(Engine &engine, std::vector<SDL_Event> &events)
+  {
+    const int RENDERING_SCALE = 3;
+
     // Iterate over all events
-  while (!events.empty()) {
+    while (!events.empty())
+    {
       events.erase(events.begin());
     }
 
-  for (int y = 0; y < this->height; y++) {
-    for (int x = 0; x < this->width; x++) {
+    for (int y = 0; y < this->height; y++)
+    {
+      for (int x = 0; x < this->width; x++)
+      {
         Spritesheet *spritesheet = engine.get_spritesheet();
 
         SDL_Rect dst;
-      dst.x = x * spritesheet->get_tile_width();
-      dst.y = y * spritesheet->get_tile_height();
-      dst.w = spritesheet->get_tile_width();
-      dst.h = spritesheet->get_tile_height();
+        dst.x = x * spritesheet->get_tile_width() * RENDERING_SCALE;
+        dst.y = y * spritesheet->get_tile_height() * RENDERING_SCALE;
+        dst.w = spritesheet->get_tile_width() * RENDERING_SCALE;
+        dst.h = spritesheet->get_tile_height() * RENDERING_SCALE;
 
-      if (spritesheet->render_tile(engine.renderer(), 0, 0, &dst) != 0) {
+        if (spritesheet->render_tile(engine.renderer(), 0, 0, &dst) != 0)
+        {
           throw std::runtime_error("error while rendering a tile: " +
                                    std::string(SDL_GetError()));
         }
@@ -45,7 +53,8 @@ void Level::render(Engine &engine, std::vector<SDL_Event> &events) {
     }
 
     // Set background color for renderer
-  if (SDL_SetRenderDrawColor(engine.renderer(), 255, 0, 0, 0)) {
+    if (SDL_SetRenderDrawColor(engine.renderer(), 255, 0, 0, 0))
+    {
       std::cout << "Could not set render draw color: " << SDL_GetError()
                 << std::endl;
     }

src/main.cpp

@@ -7,9 +7,10 @@
 
 using namespace advanced_wars;
 
-int main() {
+int main()
+{
 
-  Window window("Advanced Wars", 800, 600);
+  Window window("Advanced Wars", 960, 960);
 
   Engine engine(window);
 
@@ -18,11 +19,12 @@ int main() {
 
   engine.set_scene(level);
 
-  Spritesheet spritesheet("/media/data/cpp/cpp-project/test.png", engine);
+  Spritesheet spritesheet("../tiles.png", engine);
 
   engine.set_spritesheet(spritesheet);
 
-  while (!engine.exited()) {
+  while (!engine.exited())
+  {
     engine.pump();
     engine.render();
   }

src/spritesheet.cpp

@@ -6,18 +6,22 @@
 #include <SDL_image.h>
 #include <stdexcept>
 
-namespace advanced_wars {
+namespace advanced_wars
+{
 
-Spritesheet::Spritesheet(std::string path, Engine &engine) {
+  Spritesheet::Spritesheet(std::string path, Engine &engine)
+  {
     SDL_Surface *loadedSurface = IMG_Load(path.c_str());
-  if (loadedSurface == nullptr) {
+    if (loadedSurface == nullptr)
+    {
       throw std::runtime_error("Fehler beim Laden des Bildes " + path + ": " +
                                std::string(IMG_GetError()));
     }
 
     texture = SDL_CreateTextureFromSurface(engine.renderer(), loadedSurface);
 
-  if (texture == nullptr) {
+    if (texture == nullptr)
+    {
       throw std::runtime_error("Fehler beim Erstellen der Textur: " +
                                std::string(SDL_GetError()));
     }
@@ -28,6 +32,7 @@ Spritesheet::Spritesheet(std::string path, Engine &engine) {
     this->tile_width = 16;
     this->tile_height = 16;
     this->tiles.push_back(std::pair(0, 1));
+    this->tiles.push_back(std::pair(1, 4));
   }
 
   int Spritesheet::get_tile_steps(int tile) { return tiles.at(tile).second; }
@@ -37,8 +42,10 @@ int Spritesheet::get_tile_width() { return tile_width; }
   int Spritesheet::get_tile_height() { return tile_height; }
 
   int Spritesheet::render_tile(SDL_Renderer *renderer, int tile, int step,
-                             SDL_Rect *rect) {
-  if (step >= this->get_tile_steps(tile) || step < 0) {
+                               SDL_Rect *rect)
+  {
+    if (step >= this->get_tile_steps(tile) || step < 0)
+    {
       throw std::runtime_error("Tried to access step " + std::to_string(step) +
                                " for tile " + std::to_string(tile));
     }