Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exporting some Glsl utility functions due to linking issues. (#1044)

Browse Source
This commit is contained in:
Stefan Schindler 2016-01-22 21:20:56 +01:00 committed by Lukas Dürrenberger
parent c78c8106da
commit b61502b69a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/SFML/Graphics/Glsl.inl
View File

@ -27,8 +27,8 @@
/// \brief Helper functions to copy sf::Transform to sf::Glsl::Mat3/4 /// \brief Helper functions to copy sf::Transform to sf::Glsl::Mat3/4
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void copyMatrix(const Transform& source, Matrix<3, 3>& dest); void SFML_GRAPHICS_API copyMatrix(const Transform& source, Matrix<3, 3>& dest);
void copyMatrix(const Transform& source, Matrix<4, 4>& dest); void SFML_GRAPHICS_API copyMatrix(const Transform& source, Matrix<4, 4>& dest);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Copy array-based matrix with given number of elements /// \brief Copy array-based matrix with given number of elements
@ -37,14 +37,14 @@ void copyMatrix(const Transform& source, Matrix<4, 4>& dest);
/// <algorithm> and MSVC's annoying 4996 warning in header /// <algorithm> and MSVC's annoying 4996 warning in header
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void copyMatrix(const float* source, std::size_t elements, float* dest); void SFML_GRAPHICS_API copyMatrix(const float* source, std::size_t elements, float* dest);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Helper functions to copy sf::Color to sf::Glsl::Vec4/Ivec4 /// \brief Helper functions to copy sf::Color to sf::Glsl::Vec4/Ivec4
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void copyVector(const Color& source, Vector4<float>& dest); void SFML_GRAPHICS_API copyVector(const Color& source, Vector4<float>& dest);
void copyVector(const Color& source, Vector4<int>& dest); void SFML_GRAPHICS_API copyVector(const Color& source, Vector4<int>& dest);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////