From 81e3eb41025ba14471dfb5ad868c5f5a34e6ab83 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 19 Dec 2011 19:49:52 +0100
Subject: Minor Eigen namespace update


diff --git a/src/glview.cc b/src/glview.cc
index 59a56d6..d9f6bb5 100644
--- a/src/glview.cc
+++ b/src/glview.cc
@@ -28,6 +28,7 @@
 #include "Preferences.h"
 #include "renderer.h"
 #include "rendersettings.h"
+#include "linalg.h"
 
 #include <QApplication>
 #include <QWheelEvent>
@@ -58,8 +59,6 @@
 
 #define FAR_FAR_AWAY 100000.0
 
-#include <Eigen/Geometry>
-
 GLView::GLView(QWidget *parent) : QGLWidget(parent), renderer(NULL)
 {
 	init();
@@ -600,18 +599,18 @@ void GLView::mouseMoveEvent(QMouseEvent *event)
       double mx = +(dx) * viewer_distance/1000;
       double my = -(dy) * viewer_distance/1000;
 
-			Eigen::Matrix3d aax, aay, aaz, tm3;
-			aax = Eigen::AngleAxisd(-(object_rot_x/180) * M_PI,Eigen::Vector3d::UnitX());
-			aay = Eigen::AngleAxisd(-(object_rot_y/180) * M_PI,Eigen::Vector3d::UnitY());
-			aaz = Eigen::AngleAxisd(-(object_rot_z/180) * M_PI,Eigen::Vector3d::UnitZ());
-			tm3 = Eigen::Matrix3d::Identity();
+			Matrix3d aax, aay, aaz, tm3;
+			aax = Eigen::AngleAxisd(-(object_rot_x/180) * M_PI, Vector3d::UnitX());
+			aay = Eigen::AngleAxisd(-(object_rot_y/180) * M_PI, Vector3d::UnitY());
+			aaz = Eigen::AngleAxisd(-(object_rot_z/180) * M_PI, Vector3d::UnitZ());
+			tm3 = Matrix3d::Identity();
 			tm3 = aaz * (aay * (aax * tm3));
 
-			Eigen::Matrix4d tm;
-			tm = Eigen::Matrix4d::Identity();
+			Matrix4d tm;
+			tm = Matrix4d::Identity();
 			for (int i=0;i<3;i++) for (int j=0;j<3;j++) tm(j,i)=tm3(j,i);
 
-			Eigen::Matrix4d vec;
+			Matrix4d vec;
 			vec <<
         0,  0,  0,  mx,
         0,  0,  0,  0,
diff --git a/src/linalg.h b/src/linalg.h
index e20d8d8..a83949e 100644
--- a/src/linalg.h
+++ b/src/linalg.h
@@ -10,6 +10,7 @@ using Eigen::Vector3d;
 typedef Eigen::AlignedBox<double, 3> BoundingBox;
 using Eigen::Matrix3f;
 using Eigen::Matrix3d;
+using Eigen::Matrix4d;
 using Eigen::Transform3d;
 
 #endif
-- 
cgit v0.10.1