Merging with develop

lib/Ray/sources/Drawables/Texture.cpp

@@ -42,6 +42,11 @@ namespace RAY {
 		return *this;
 	}
 
+	const std::string &Texture::getResourcePath() const
+	{
+		return this->_resourcePath;
+	}
+
 	Texture::operator ::Texture() const
 	{
 		return *this->_texture;

lib/Ray/sources/Drawables/Texture.hpp

@@ -47,6 +47,9 @@ namespace RAY
 			//! @brief Unload the current texture (calls to drawOn will no-op).
 			void unload();
 
+			//! @return path of loaded texture
+			const std::string &getResourcePath() const;
+
 		protected:
 		private:
 			//! @brief Texture, really, that's just it...

lib/Ray/sources/Model/Model.cpp

@@ -61,6 +61,11 @@ namespace RAY::Drawables::Drawables3D
 		return true;
 	}
 
+	Texture &Model::getTextureByMaterial(MaterialType materialType)
+	{
+		return this->_textureList[materialType];
+	}
+
 	Model::operator ::Model() const
 	{
 		return *this->_model;

lib/Ray/sources/Model/Model.hpp

@@ -90,6 +90,10 @@ namespace RAY::Drawables::Drawables3D {
 			//! @brief Draw model's wires on window
 			void drawWiresOn(RAY::Window &) override;
 
+			//! @param materialType type of material
+			//! @return texture
+			Texture &getTextureByMaterial(MaterialType materialType);
+
 		private:
 			//! @brief Raw data from raylib
 			std::shared_ptr<::Model> _model;