Directory structure refactor

This commit is contained in:
2024-12-04 12:26:10 +01:00
parent 29d3c11fd1
commit 7ecb90af1f
12 changed files with 8 additions and 9 deletions

View File

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

View File

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 667 KiB

After

Width:  |  Height:  |  Size: 667 KiB

View File

Before

Width:  |  Height:  |  Size: 402 KiB

After

Width:  |  Height:  |  Size: 402 KiB

View File

Before

Width:  |  Height:  |  Size: 489 B

After

Width:  |  Height:  |  Size: 489 B

View File

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 503 B

View File

@@ -15,11 +15,11 @@ int main()
mainWindow.setVerticalSyncEnabled(true); mainWindow.setVerticalSyncEnabled(true);
mainWindow.setFramerateLimit(60); mainWindow.setFramerateLimit(60);
sf::Image icon; sf::Image icon;
icon.loadFromFile("../assets/img/ikonka.png"); icon.loadFromFile("../assets/img/icon/ikonka.png");
mainWindow.setIcon(128, 128, icon.getPixelsPtr()); mainWindow.setIcon(128, 128, icon.getPixelsPtr());
Plansza plansza(mainWindow.getSize().y, mainWindow.getSize().x); 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; AudioManager audioManager;

View File

@@ -12,8 +12,8 @@ void Actor::loadTexture(std::string path) {
actorTexture.loadFromFile(path); actorTexture.loadFromFile(path);
actorSprite.setTexture(actorTexture); actorSprite.setTexture(actorTexture);
bulletTextureLeft.loadFromFile("../assets/img/bullet_left.png"); bulletTextureLeft.loadFromFile("../assets/img/bullets/bullet_pink.png");
bulletTextureRight.loadFromFile("../assets/img/Rocket_111.png"); bulletTextureRight.loadFromFile("../assets/img/rockets/Rocket_111.png");
} }
sf::Sprite &Actor::getSprite() { sf::Sprite &Actor::getSprite() {

View File

@@ -5,8 +5,8 @@
Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth) { Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth) {
size.height = windowHeight; size.height = windowHeight;
size.width = windowWidth; size.width = windowWidth;
meteorTexture1.loadFromFile("../assets/img/meteor-1.png"); meteorTexture1.loadFromFile("../assets/img/meteors/meteor-1.png");
meteorTexture2.loadFromFile("../assets/img/meteor-2.png"); meteorTexture2.loadFromFile("../assets/img/meteors/meteor-2.png");
spawnClock.restart(); spawnClock.restart();
} }

View File

@@ -1,10 +1,9 @@
#include "../headers/Player.h" #include "../headers/Player.h"
#include "../headers/Bullet.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) { Player::Player(int x, int y, std::string path) : Actor(x, y, path) {
bulletTexture.loadFromFile("../assets/img/bullet_left.png"); bulletTexture.loadFromFile("../assets/img/bullets/bullet_pink.png");
rocketTexture.loadFromFile("../assets/img/Rocket_111.png"); rocketTexture.loadFromFile("../assets/img/rockets/Rocket_111.png");
}; };
void Player::shoot() { void Player::shoot() {