projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework UI architecture and blendshape animation
[opengl.git]
/
util.hpp
diff --git
a/util.hpp
b/util.hpp
index 543d0c66aae985f9298bc4533d5a05dd43d27ce7..4ccef53b62cb1371ee6f18bc3738ceaf2c164bb7 100644
(file)
--- a/
util.hpp
+++ b/
util.hpp
@@
-24,6
+24,10
@@
inline aiMatrix4x4 mat4ToaiMatrix(glm::mat4 from) {
return to;
}
return to;
}
-inline glm::vec3 aiVector3DToMat4(aiVector3D from) {
+inline glm::vec3 aiVector3DToVec3(aiVector3D from) {
+ return {from[0], from[1], from[2]};
+}
+
+inline aiVector3D vec3ToaiVector3D(glm::vec3 from) {
return {from[0], from[1], from[2]};
}
return {from[0], from[1], from[2]};
}