Showing the changes to libraries/script-engine/src/Mat4.cpp (1 of 263 files). Show all
Unified · Split
| @@ -9,14 +9,17 @@ · 8 unmodified lines | |||
| 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html | 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| 10 | // | 10 | // |
| 11 | 11 | ||
| 12 | #include <QDebug> | 12 | #include "Mat4.h" |
| 13 | #include <GLMHelpers.h> | 13 | |
| 14 | #include <glm/glm.hpp> | 14 | #include <glm/glm.hpp> |
| 15 | #include <glm/gtx/string_cast.hpp> | 15 | #include <glm/gtx/string_cast.hpp> |
| 16 | #include <glm/gtc/type_ptr.hpp> | 16 | #include <glm/gtc/type_ptr.hpp> |
| 17 | |||
| 18 | #include <QDebug> | ||
| 19 | #include <GLMHelpers.h> | ||
| 20 | |||
| 17 | #include "ScriptEngineLogging.h" | 21 | #include "ScriptEngineLogging.h" |
| 18 | #include "ScriptEngine.h" | 22 | #include "ScriptEngine.h" |
| 19 | #include "Mat4.h" | ||
| 20 | 23 | ||
| 21 | glm::mat4 Mat4::multiply(const glm::mat4& m1, const glm::mat4& m2) const { | 24 | glm::mat4 Mat4::multiply(const glm::mat4& m1, const glm::mat4& m2) const { |
| 22 | return m1 * m2; | 25 | return m1 * m2; |