mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-07 00:22:56 +01:00
GLES fixes, update GLM, build fixes
This commit is contained in:
@@ -6,16 +6,20 @@
|
||||
/// @defgroup gtx_projection GLM_GTX_projection
|
||||
/// @ingroup gtx
|
||||
///
|
||||
/// @brief Projection of a vector to other one
|
||||
/// Include <glm/gtx/projection.hpp> to use the features of this extension.
|
||||
///
|
||||
/// <glm/gtx/projection.hpp> need to be included to use these functionalities.
|
||||
/// Projection of a vector to other one
|
||||
|
||||
#pragma once
|
||||
|
||||
// Dependency:
|
||||
#include "../geometric.hpp"
|
||||
|
||||
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
|
||||
#ifndef GLM_ENABLE_EXPERIMENTAL
|
||||
# error "GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
|
||||
#endif
|
||||
|
||||
#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
|
||||
# pragma message("GLM: GLM_GTX_projection extension included")
|
||||
#endif
|
||||
|
||||
@@ -27,8 +31,8 @@ namespace glm
|
||||
/// Projects x on Normal.
|
||||
///
|
||||
/// @see gtx_projection
|
||||
template <typename vecType>
|
||||
GLM_FUNC_DECL vecType proj(vecType const & x, vecType const & Normal);
|
||||
template<typename genType>
|
||||
GLM_FUNC_DECL genType proj(genType const& x, genType const& Normal);
|
||||
|
||||
/// @}
|
||||
}//namespace glm
|
||||
|
||||
Reference in New Issue
Block a user