Crater Decal added

Alexpop11 · Nov 5, 2024 · 5be197d · 5be197d
1 parent 924d617
commit 5be197d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/OpenGL/res/textures/crater-decal.png b/OpenGL/res/textures/crater-decal.png
diff --git a/OpenGL/src/game_objects/Bomb.cpp b/OpenGL/src/game_objects/Bomb.cpp
@@ -38,7 +38,8 @@ void Bomb::explode() {
    }
 
    audio().Bomb_Sound.play();
-   World::gameobjectstoadd.push_back(std::make_unique<Decal>("ExplosionDecal", getTile().x, getTile().y, "explosion-decal.png"));
+   World::gameobjectstoadd.push_back(std::make_unique<Decal>("ExplosionDecal", getTile().x, getTile().y, "crater"));
+   World::gameobjectstoadd.push_back(std::make_unique<Decal>("ExplosionDecal", getTile().x, getTile().y, "explosion"));
    ShouldDestroy = true;
 }
 

diff --git a/OpenGL/src/game_objects/Decal.cpp b/OpenGL/src/game_objects/Decal.cpp
@@ -5,10 +5,15 @@
 #include "AudioEngine.h""
 
 Decal::Decal(const std::string& name, float x, float y, const std::string& type)
-   : SquareObject(name, DrawPriority::Decal, x, y, type)
+   : SquareObject(name, DrawPriority::Decal, x, y, chooseTexture(type))
    , texturepath(chooseTexture(type)) {
-   rotation = std::vector<int>{0, 90, 180, 270}[rand() % 4];
-   scale    = std::vector<float>{0.85, 0.9, 0.95, 1, 1.05}[rand() % 5];
+   if (texturepath == "explosion-decal.png") {
+      scale    = std::vector<float>{0.85, 0.9, 0.95, 1, 1.05}[rand() % 5];
+   }
+   else if (texturepath == "crater-decal.png") {
+      scale = 3;
+   }
+   rotation  = std::vector<int>{0, 90, 180, 270}[rand() % 4];
    tintColor = {0.8, 0.5, 0.5, 0.9};
     
 }
@@ -27,6 +32,8 @@ Decal::Decal(const std::string& name, float x, float y, const std::string& type)
 std::string Decal::chooseTexture(const std::string& type) {
    if (type == "explosion") {
       return "explosion-decal.png";
+   } else if (type == "crater") {
+      return "crater-decal.png";
    }
    return "enemy.png"; // Fallback path if type doesn't match any condition
 }

diff --git a/OpenGL/src/game_objects/GameObject.h b/OpenGL/src/game_objects/GameObject.h
@@ -15,6 +15,7 @@ enum class DrawPriority {
    Background,
    Floor,
    Decal,
+   Wall,
    Bomb,
    Character,
    CharacterAccent,

diff --git a/OpenGL/src/game_objects/Tile.cpp b/OpenGL/src/game_objects/Tile.cpp
@@ -1,13 +1,14 @@
 #include "Tile.h"
 
 Tile::Tile(const std::string& name, bool wall, bool unbreakable, float x, float y)
-   : SquareObject(name, DrawPriority::Floor, x, y, "alt-wall-bright.png")
+   : SquareObject(name, wall ? DrawPriority::Wall : DrawPriority::Floor, x, y, "alt-wall-bright.png")
    , wall(wall)
    , unbreakable(unbreakable)
    , wallTexture(Texture::create("alt-wall-bright.png"))
    , wallTextureUnbreakable(Texture::create("alt-wall-unbreakable.png"))
    , floorTexture(Texture::create(std::vector<std::string>{"2-alt-floor.png", "2-alt-floor-2.png"}[rand() % 2])) {
    setTexture();
+
 }
 
 Tile::Tile(const std::string& name, float x, float y)
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ enum class DrawPriority { @@
        Background,
        Floor,
        Decal,
+       Wall,
        Bomb,
        Character,
        CharacterAccent,
@@ Expand Down @@