mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

update: date stamps + GLM_META_PROG_HELPERS pre-requiste

Browse Source
This commit is contained in:
jan p springer 2016-03-14 16:37:30 +00:00
parent a5a69566b9
commit 25d6c8e341
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glm/gtx/io.inl
View File

@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net) /// OpenGL Mathematics (glm.g-truc.net)
/// ///
/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) /// Copyright (c) 2005 - 2016 G-Truc Creation (www.g-truc.net)
/// Permission is hereby granted, free of charge, to any person obtaining a copy /// Permission is hereby granted, free of charge, to any person obtaining a copy
/// of this software and associated documentation files (the "Software"), to deal /// of this software and associated documentation files (the "Software"), to deal
/// in the Software without restriction, including without limitation the rights /// in the Software without restriction, including without limitation the rights
@ -26,20 +26,15 @@
/// ///
/// @ref gtx_io /// @ref gtx_io
/// @file glm/gtx/io.inl /// @file glm/gtx/io.inl
/// @date 2013-11-22 / 2014-11-25 /// @date 2013-11-22 / 2016-03-14
/// @author Jan P Springer (regnirpsj@gmail.com) /// @author Jan P Springer (regnirpsj@gmail.com)
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#include <iomanip> // std::fixed, std::setfill<>, std::setprecision, std::right, #include <iomanip> // std::fixed, std::setfill<>, std::setprecision, std::right, std::setw
// std::setw
#include <ostream> // std::basic_ostream<> #include <ostream> // std::basic_ostream<>
#include "../gtc/matrix_access.hpp" // glm::col, glm::row #include "../gtc/matrix_access.hpp" // glm::col, glm::row
#include "../gtx/type_trait.hpp" // glm::type<> #include "../gtx/type_trait.hpp" // glm::type<>
#if !defined(GLM_META_PROG_HELPERS)
# pragma error("Please define 'GLM_META_PROG_HELPERS' before using GLM_GTX_io")
#endif
namespace glm{ namespace glm{
namespace io namespace io
{ {

7
test/gtx/gtx_io.cpp
View File

@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net) /// OpenGL Mathematics (glm.g-truc.net)
/// ///
/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net) /// Copyright (c) 2005 - 2016 G-Truc Creation (www.g-truc.net)
/// Permission is hereby granted, free of charge, to any person obtaining a copy /// Permission is hereby granted, free of charge, to any person obtaining a copy
/// of this software and associated documentation files (the "Software"), to deal /// of this software and associated documentation files (the "Software"), to deal
/// in the Software without restriction, including without limitation the rights /// in the Software without restriction, including without limitation the rights
@ -25,11 +25,10 @@
/// THE SOFTWARE. /// THE SOFTWARE.
/// ///
/// @file test/gtx/gtx_io.cpp /// @file test/gtx/gtx_io.cpp
/// @date 2013-11-22 / 2014-11-25 /// @date 2013-11-22 / 2016-03-14
/// @author Christophe Riccio /// @author Jan P Springer (regnirpsj@gmail.com)
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#define GLM_META_PROG_HELPERS
#include <glm/gtc/type_precision.hpp> #include <glm/gtc/type_precision.hpp>
#include <glm/gtx/io.hpp> #include <glm/gtx/io.hpp>
#include <iostream> #include <iostream>