refactor mesh composition

This commit is contained in:
2018-12-21 08:42:14 -05:00
parent 0b87482276
commit 876f1edb85
7 changed files with 240 additions and 149 deletions

View File

@@ -4,6 +4,7 @@
#include <glm/vec4.hpp>
#include <glm/mat4x4.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <vsr/vsr.h>
glm::mat4 rotor(glm::vec4 u, glm::vec4 v, float angle) {
@@ -12,7 +13,7 @@ glm::mat4 rotor(glm::vec4 u, glm::vec4 v, float angle) {
auto eu = *((Vec *) (void *) &u);
auto ev = *((Vec *) (void *) &v);
auto biv = (eu ^ ev).unit() * angle;
auto biv = (eu ^ ev).unit() * angle / 2;
Vec col[4] = {
Vec(1, 0, 0, 0).rotate(biv),
@@ -24,4 +25,16 @@ glm::mat4 rotor(glm::vec4 u, glm::vec4 v, float angle) {
return glm::make_mat4((float *) col);
}
glm::mat4 rot_xy(float angle) { return rotor(glm::vec4(1, 0, 0, 0), glm::vec4(0, 1, 0, 0), angle); }
glm::mat4 rot_xz(float angle) { return rotor(glm::vec4(1, 0, 0, 0), glm::vec4(0, 0, 1, 0), angle); }
glm::mat4 rot_xw(float angle) { return rotor(glm::vec4(1, 0, 0, 0), glm::vec4(0, 0, 0, 1), angle); }
glm::mat4 rot_yz(float angle) { return rotor(glm::vec4(0, 1, 0, 0), glm::vec4(0, 0, 1, 0), angle); }
glm::mat4 rot_yw(float angle) { return rotor(glm::vec4(0, 1, 0, 0), glm::vec4(0, 0, 0, 1), angle); }
glm::mat4 rot_zw(float angle) { return rotor(glm::vec4(0, 0, 1, 0), glm::vec4(0, 0, 0, 1), angle); }
#endif //GL_TEMPLATE_ROTOR_H