diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d24c59..98092ac 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ target_compile_options(common INTERFACE set(METHODS_PATH "./src/*/methods/*.cpp") -set(VERSION "V9") +set(VERSION "V10") file(GLOB_RECURSE METHODS_SRC "${METHODS_PATH}") add_executable(main${VERSION} ./src/testMain.cpp ${METHODS_SRC} ) diff --git a/README.md b/README.md index a5c7f43..691df6b 100644 --- a/README.md +++ b/README.md @@ -64,4 +64,4 @@ Per spostare l'intera scena si tiene premuto il tasto centrale del mouse. # Per lanciare: - ./build/bin/mainV9 + ./build/bin/mainV10 diff --git a/src/pieces/headers/caviglia.hpp b/src/pieces/headers/caviglia.hpp index 49f5e5d..613c1c8 100644 --- a/src/pieces/headers/caviglia.hpp +++ b/src/pieces/headers/caviglia.hpp @@ -8,6 +8,8 @@ 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"); public: diff --git a/src/pieces/headers/coscia.hpp b/src/pieces/headers/coscia.hpp index 7921268..2c7f1fd 100644 --- a/src/pieces/headers/coscia.hpp +++ b/src/pieces/headers/coscia.hpp @@ -9,7 +9,9 @@ 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"); + public: Coscia(rb::Vector3 coords, _Float16 mass); diff --git a/src/pieces/headers/piece_interface.hpp b/src/pieces/headers/piece_interface.hpp index a5d55cd..593c107 100644 --- a/src/pieces/headers/piece_interface.hpp +++ b/src/pieces/headers/piece_interface.hpp @@ -2,6 +2,7 @@ #include #include "../../rigidbody/headers/rb.hpp" +#define TEXTUREPATH std::string("../../../textures/") #ifndef PIECE_INTERFACE_H #define PIECE_INTERFACE_H diff --git a/src/pieces/headers/torso.hpp b/src/pieces/headers/torso.hpp index 59bbb73..aff2401 100644 --- a/src/pieces/headers/torso.hpp +++ b/src/pieces/headers/torso.hpp @@ -10,6 +10,9 @@ 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"); + public: Torso(rb::Vector3 coords, _Float16 mass); ~Torso();