diff --git a/SFMLEngine/makingAGameTick/Classes/Other/resources.hpp b/SFMLEngine/makingAGameTick/Classes/Other/resources.hpp index e032d44..e564470 100644 --- a/SFMLEngine/makingAGameTick/Classes/Other/resources.hpp +++ b/SFMLEngine/makingAGameTick/Classes/Other/resources.hpp @@ -14,6 +14,7 @@ namespace Textures // This gives us a scope for the enumerators which allows us { Eagle, Raptor, + Desert }; } diff --git a/SFMLEngine/makingAGameTick/Classes/Other/world.cpp b/SFMLEngine/makingAGameTick/Classes/Other/world.cpp index 99497ee..2e3d765 100644 --- a/SFMLEngine/makingAGameTick/Classes/Other/world.cpp +++ b/SFMLEngine/makingAGameTick/Classes/Other/world.cpp @@ -19,9 +19,16 @@ World::World(sf::RenderWindow& window) , mScrollSpeed ( WORLD_SCROLL_SPEED ) , mPlayerAircraft(nullptr) { - // loadTextures(); + loadTextures(); // buildScene(); // mWorldView.setCenter(mSpawnPosition); } +void World::loadTextures() +{ + mTextures.load(Textures::Eagle, PATH_TO_EAGLE_TEXTURE); + mTextures.load(Textures::Raptor, PATH_TO_RAPTOR_TEXTURE); + mTextures.load(Textures::Desert, PATH_TO_DESERT_TEXTURE); +} + #endif // WORLD_CPP diff --git a/SFMLEngine/makingAGameTick/app b/SFMLEngine/makingAGameTick/app index d55588a..e7fe4b7 100755 Binary files a/SFMLEngine/makingAGameTick/app and b/SFMLEngine/makingAGameTick/app differ diff --git a/SFMLEngine/makingAGameTick/constants.hpp b/SFMLEngine/makingAGameTick/constants.hpp index 416335b..897e414 100644 --- a/SFMLEngine/makingAGameTick/constants.hpp +++ b/SFMLEngine/makingAGameTick/constants.hpp @@ -5,6 +5,9 @@ // Paths const std::string PATH_TO_PLAYER_TEXTURE = "Textures/Player.png"; +const std::string PATH_TO_EAGLE_TEXTURE = "Textures/Eagle.png"; +const std::string PATH_TO_RAPTOR_TEXTURE = "Textures/Raptor.png"; +const std::string PATH_TO_DESERT_TEXTURE = "Textures/Desert.png"; // Player constants const float PLAYER_RADIUS = 40; diff --git a/SFMLEngine/makingAGameTick/game.o b/SFMLEngine/makingAGameTick/game.o index ce0fb1d..7c08357 100644 Binary files a/SFMLEngine/makingAGameTick/game.o and b/SFMLEngine/makingAGameTick/game.o differ