diff --git a/build/bin/mainV10.exe b/build/bin/mainV10.exe index 0328301..4d2dc44 100644 Binary files a/build/bin/mainV10.exe and b/build/bin/mainV10.exe differ diff --git a/src/pieces/headers/caviglia.hpp b/src/pieces/headers/caviglia.hpp index 613c1c8..394f502 100644 --- a/src/pieces/headers/caviglia.hpp +++ b/src/pieces/headers/caviglia.hpp @@ -3,13 +3,14 @@ #ifndef CAVIGLIA_H #define CAVIGLIA_H - class Caviglia : public PieceInterface{ private: const sf::Vector3f caviglia_Dim = {60, 200, 60}; const sf::Color caviglia_Col = sf::Color(230,160,11,255); - const sf::Texture TextureF = sf::Texture(TEXTUREPATH + "cavigliaF.png"); - const sf::Texture TextureL = sf::Texture(TEXTUREPATH + "cavigliaL.png"); + + const std::string TEXTURE_F = std::string("cavigliaF.png"); + const std::string TEXTURE_L = std::string("cavigliaL.png"); + public: diff --git a/src/pieces/headers/coscia.hpp b/src/pieces/headers/coscia.hpp index 2c7f1fd..581cff2 100644 --- a/src/pieces/headers/coscia.hpp +++ b/src/pieces/headers/coscia.hpp @@ -5,12 +5,14 @@ + class Coscia : public PieceInterface{ private: const sf::Vector3f coscia_Dim = {80, 200, 80}; const sf::Color coscia_Col = sf::Color::Yellow; - const sf::Texture TextureF = sf::Texture(TEXTUREPATH + "cosciaF.png"); - const sf::Texture TextureL = sf::Texture(TEXTUREPATH + "cosciaL.png"); + + const std::string TEXTURE_F = std::string("cosciaF.png"); + const std::string TEXTURE_L = std::string("cosciaL.png"); public: diff --git a/src/pieces/headers/piece_interface.hpp b/src/pieces/headers/piece_interface.hpp index e6cd1c4..4311b13 100644 --- a/src/pieces/headers/piece_interface.hpp +++ b/src/pieces/headers/piece_interface.hpp @@ -32,6 +32,22 @@ class PieceInterface{ shapeYZ->setFillColor(color); } Direction direction = Direction::L; + + sf::Texture TextureF ; + sf::Texture TextureL ; + + void setTextures (std::string F, std::string L){ + try{ + TextureF = sf::Texture(TEXTUREPATH + F); + TextureL = sf::Texture(TEXTUREPATH + L); + + shapeXZ->setTexture(&TextureL); + shapeYZ->setTexture(&TextureF); + }catch(...){ + throw "Errore nel caricamento texture."; + } + } + public: sf::Shape* shapeXZ, *shapeYZ; rb::Vector3 globalPos; diff --git a/src/pieces/headers/torso.hpp b/src/pieces/headers/torso.hpp index aff2401..8e2c88b 100644 --- a/src/pieces/headers/torso.hpp +++ b/src/pieces/headers/torso.hpp @@ -4,14 +4,13 @@ #define TORSO_H - - class Torso : public PieceInterface{ private: const sf::Vector3f torso_Dim = {100, 100, 150}; const sf::Color torso_Col = sf::Color::Red; - const sf::Texture TextureF = sf::Texture(TEXTUREPATH + "TorsoF.png"); - const sf::Texture TextureL = sf::Texture(TEXTUREPATH + "TorsoL.png"); + + const std::string TEXTURE_F = std::string("bacinoF.png"); + const std::string TEXTURE_L = std::string("bacinoL.png"); public: Torso(rb::Vector3 coords, _Float16 mass); diff --git a/src/pieces/methods/caviglia_class.cpp b/src/pieces/methods/caviglia_class.cpp index 410532f..787a4c3 100644 --- a/src/pieces/methods/caviglia_class.cpp +++ b/src/pieces/methods/caviglia_class.cpp @@ -7,6 +7,13 @@ Caviglia::Caviglia(rb::Vector3 coords, _Float16 mass){ globalPos = {0,0,0}; initialize_shapes(caviglia_Dim); + try{ + setTextures(TEXTURE_F,TEXTURE_L); + } + catch (const char* &e ){ + printf("Caviglia: %s\n", e); + } + } diff --git a/src/pieces/methods/coscia_class.cpp b/src/pieces/methods/coscia_class.cpp index b63c0cb..e408fc3 100644 --- a/src/pieces/methods/coscia_class.cpp +++ b/src/pieces/methods/coscia_class.cpp @@ -6,6 +6,13 @@ Coscia::Coscia(rb::Vector3 coords, _Float16 mass){ color = coscia_Col; globalPos = {0,0,0}; initialize_shapes(coscia_Dim); + + try{ + setTextures(TEXTURE_F,TEXTURE_L); + } + catch (const char* &e ){ + printf("Caviglia: %s\n", e); + } } Coscia::~Coscia(){ diff --git a/src/pieces/methods/torso.cpp b/src/pieces/methods/torso.cpp index fa15fa8..47b31a4 100644 --- a/src/pieces/methods/torso.cpp +++ b/src/pieces/methods/torso.cpp @@ -7,6 +7,13 @@ Torso::Torso(rb::Vector3 coords, _Float16 mass){ globalPos = {0,0,0}; initialize_shapes(torso_Dim); + + try{ + setTextures(TEXTURE_F,TEXTURE_L); + } + catch (const char* &e){ + printf("Caviglia: %s\n", e); + } } Torso::~Torso(){