summaryrefslogtreecommitdiffhomepage
path: root/pose-widget/glwidget.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-06-01 18:12:03 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-06-01 18:12:03 +0200
commitfcaf48603f50558326c155edec47fbd64fb09ab9 (patch)
treed10717c5023d1cede34ea3edf8818ab0c3b7fa8c /pose-widget/glwidget.cpp
parentc9a10c21a2c28efa6bb731df89c5c4f32feb73b8 (diff)
octopus: use more simple-mat, less open-coded math
Diffstat (limited to 'pose-widget/glwidget.cpp')
-rw-r--r--pose-widget/glwidget.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/pose-widget/glwidget.cpp b/pose-widget/glwidget.cpp
index c76896c4..0322077b 100644
--- a/pose-widget/glwidget.cpp
+++ b/pose-widget/glwidget.cpp
@@ -86,14 +86,14 @@ private:
static __inline vec3 normal(const vec3& p1, const vec3& p2, const vec3& p3)
{
- vec3 u({p2.x() - p1.x(), p2.y() - p1.y(), p2.z() - p1.z()});
- vec3 v({p3.x() - p1.x(), p3.y() - p1.y(), p3.z() - p1.z()});
+ vec3 u = p2 - p1;
+ vec3 v = p3 - p1;
vec3 tmp = u.cross(v);
- double i = 1./sqrt(tmp.x() * tmp.x() + tmp.y() * tmp.y() + tmp.z() * tmp.z());
+ double i = 1./sqrt(tmp.dot(tmp));
- return vec3({i * tmp.x(), i * tmp.y(), i * tmp.z()});
+ return tmp * i;
}
void GLWidget::project_quad_texture() {
@@ -121,7 +121,7 @@ void GLWidget::project_quad_texture() {
normal2 = normal(foo[0], foo[1], foo[2]);
}
- double dir = normal1.x() * normal2.x() + normal1.y() * normal2.y() + normal1.z() * normal2.z();
+ double dir = normal1.dot(normal2);
QImage& tex = dir < 0 ? back : front;