From 7ecb90af1ff9b6f4cd8d700a6d360c2ba466fb65 Mon Sep 17 00:00:00 2001
From: Andrii Solianyk <asolianik2015@gmail.com>
Date: Wed, 4 Dec 2024 12:26:10 +0100
Subject: [PATCH] Directory structure refactor

---
 assets/img/{space.png => background/background.png} | Bin
 .../{bullet_right.png => bullets/bullet_green.png}  | Bin
 .../{bullet_left.png => bullets/bullet_pink.png}    | Bin
 assets/img/{ => icon}/ikonka.png                    | Bin
 assets/img/{ => meteors}/meteor-1.png               | Bin
 assets/img/{ => meteors}/meteor-2.png               | Bin
 assets/img/{ => rockets}/Rocket_111.png             | Bin
 assets/img/{ => rockets}/Rocket_115.png             | Bin
 main.cpp                                            |   4 ++--
 sources/Actor.cpp                                   |   4 ++--
 sources/Plansza.cpp                                 |   4 ++--
 sources/Player.cpp                                  |   5 ++---
 12 files changed, 8 insertions(+), 9 deletions(-)
 rename assets/img/{space.png => background/background.png} (100%)
 rename assets/img/{bullet_right.png => bullets/bullet_green.png} (100%)
 rename assets/img/{bullet_left.png => bullets/bullet_pink.png} (100%)
 rename assets/img/{ => icon}/ikonka.png (100%)
 rename assets/img/{ => meteors}/meteor-1.png (100%)
 rename assets/img/{ => meteors}/meteor-2.png (100%)
 rename assets/img/{ => rockets}/Rocket_111.png (100%)
 rename assets/img/{ => rockets}/Rocket_115.png (100%)

diff --git a/assets/img/space.png b/assets/img/background/background.png
similarity index 100%
rename from assets/img/space.png
rename to assets/img/background/background.png
diff --git a/assets/img/bullet_right.png b/assets/img/bullets/bullet_green.png
similarity index 100%
rename from assets/img/bullet_right.png
rename to assets/img/bullets/bullet_green.png
diff --git a/assets/img/bullet_left.png b/assets/img/bullets/bullet_pink.png
similarity index 100%
rename from assets/img/bullet_left.png
rename to assets/img/bullets/bullet_pink.png
diff --git a/assets/img/ikonka.png b/assets/img/icon/ikonka.png
similarity index 100%
rename from assets/img/ikonka.png
rename to assets/img/icon/ikonka.png
diff --git a/assets/img/meteor-1.png b/assets/img/meteors/meteor-1.png
similarity index 100%
rename from assets/img/meteor-1.png
rename to assets/img/meteors/meteor-1.png
diff --git a/assets/img/meteor-2.png b/assets/img/meteors/meteor-2.png
similarity index 100%
rename from assets/img/meteor-2.png
rename to assets/img/meteors/meteor-2.png
diff --git a/assets/img/Rocket_111.png b/assets/img/rockets/Rocket_111.png
similarity index 100%
rename from assets/img/Rocket_111.png
rename to assets/img/rockets/Rocket_111.png
diff --git a/assets/img/Rocket_115.png b/assets/img/rockets/Rocket_115.png
similarity index 100%
rename from assets/img/Rocket_115.png
rename to assets/img/rockets/Rocket_115.png
diff --git a/main.cpp b/main.cpp
index 417c87c..26b98aa 100644
--- a/main.cpp
+++ b/main.cpp
@@ -15,11 +15,11 @@ int main()
     mainWindow.setVerticalSyncEnabled(true);
     mainWindow.setFramerateLimit(60);
     sf::Image icon;
-    icon.loadFromFile("../assets/img/ikonka.png");
+    icon.loadFromFile("../assets/img/icon/ikonka.png");
     mainWindow.setIcon(128, 128, icon.getPixelsPtr());
     Plansza plansza(mainWindow.getSize().y, mainWindow.getSize().x);
 
-    Background background("../assets/img/space.png", 2.0f); //tutaj predkosc tla, mozna zwiekszyc jak za wolno
+    Background background("../assets/img/background/background.png", 2.0f); //tutaj predkosc tla, mozna zwiekszyc jak za wolno
 
 
     AudioManager audioManager;
diff --git a/sources/Actor.cpp b/sources/Actor.cpp
index d454bad..2170a24 100644
--- a/sources/Actor.cpp
+++ b/sources/Actor.cpp
@@ -12,8 +12,8 @@ void Actor::loadTexture(std::string path) {
     actorTexture.loadFromFile(path);
     actorSprite.setTexture(actorTexture);
 
-    bulletTextureLeft.loadFromFile("../assets/img/bullet_left.png");
-    bulletTextureRight.loadFromFile("../assets/img/Rocket_111.png");
+    bulletTextureLeft.loadFromFile("../assets/img/bullets/bullet_pink.png");
+    bulletTextureRight.loadFromFile("../assets/img/rockets/Rocket_111.png");
 }
 
 sf::Sprite &Actor::getSprite() {
diff --git a/sources/Plansza.cpp b/sources/Plansza.cpp
index 3aeda76..822c62f 100644
--- a/sources/Plansza.cpp
+++ b/sources/Plansza.cpp
@@ -5,8 +5,8 @@
 Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth) {
     size.height = windowHeight;
     size.width = windowWidth;
-    meteorTexture1.loadFromFile("../assets/img/meteor-1.png");
-    meteorTexture2.loadFromFile("../assets/img/meteor-2.png");
+    meteorTexture1.loadFromFile("../assets/img/meteors/meteor-1.png");
+    meteorTexture2.loadFromFile("../assets/img/meteors/meteor-2.png");
     spawnClock.restart();
 }
 
diff --git a/sources/Player.cpp b/sources/Player.cpp
index 7a15507..91117cf 100644
--- a/sources/Player.cpp
+++ b/sources/Player.cpp
@@ -1,10 +1,9 @@
 #include "../headers/Player.h"
 #include "../headers/Bullet.h"
 
-// TODO: Podzielić na klasy Bullet i Rocket.
 Player::Player(int x, int y, std::string path) : Actor(x, y, path) {
-    bulletTexture.loadFromFile("../assets/img/bullet_left.png");
-    rocketTexture.loadFromFile("../assets/img/Rocket_111.png");
+    bulletTexture.loadFromFile("../assets/img/bullets/bullet_pink.png");
+    rocketTexture.loadFromFile("../assets/img/rockets/Rocket_111.png");
 };
 
 void Player::shoot() {