[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.2-71-gc3934c8

[Anton Gladky]

The following commit has been merged in the master branch:
commit 093fe7b0fb72f67aa829ba051267e452ab07db1f
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Jun 7 17:38:55 2011 +0200

    Fix compilation with Eigen3

diff --git a/debian/patches/fix_compilation_with_eigen3.patch b/debian/patches/fix_compilation_with_eigen3.patch
new file mode 100644
index 0000000..fa4ac0e
--- /dev/null
+++ b/debian/patches/fix_compilation_with_eigen3.patch
@@ -0,0 +1,38 @@
+Description: Fix compilation with Eigen3
+Author: Anton Gladky <gladky.anton at gmail.com>
+Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2572
+Last-Update: 2011-06-07
+
+--- a/pkg/common/Gl1_NormPhys.cpp
++++ b/pkg/common/Gl1_NormPhys.cpp
+@@ -64,9 +64,9 @@
+ 		glTranslatef(p1[0],p1[1],p1[2]);
+ 		Quaternionr q(Quaternionr().setFromTwoVectors(Vector3r(0,0,1),relPos/dist /* normalized */));
+ 		// using Transform with OpenGL: http://eigen.tuxfamily.org/dox/TutorialGeometry.html
+-		#if EIGEN_MAJOR_VERSION<20              //Eigen3 definition, while it is not realized
++		#if EIGEN_WORLD_VERSION==2
+ 			glMultMatrixd(Eigen::Transform3d(q).data());
+-		#else
++		#elif EIGEN_WORLD_VERSION==3
+ 			glMultMatrixd(Eigen::Affine3d(q).data());
+ 		#endif
+ 		glColor3v(color);
+--- a/pkg/dem/DomainLimiter.cpp
++++ b/pkg/dem/DomainLimiter.cpp
+@@ -226,11 +226,11 @@
+ 
+ 	// switch to local coordinates
+ 	glTranslatev(tester->contPt);
+-	#if EIGEN_MAJOR_VERSION<20              //Eigen3 definition, while it is not realized
+- 		glMultMatrixd(Eigen::Transform3d(tester->trsf).data());
+-        #else
+- 		glMultMatrixd(Eigen::Affine3d(tester->trsf).data());
+-        #endif
++	#if EIGEN_WORLD_VERSION==2
++		glMultMatrixd(Eigen::Transform3d(tester->trsf).data());
++	#elif EIGEN_WORLD_VERSION==3
++		glMultMatrixd(Eigen::Affine3d(tester->trsf).data());
++	#endif
+ 
+ 
+ 	glDisable(GL_LIGHTING); 
diff --git a/debian/patches/series b/debian/patches/series
index e31c76a..8c80730 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix_spelling_errors.patch
 fix_force_applying_to_non_existing_body.patch
 fix_absent_syncSizesOfContainers.patch
 fix_FTBFS_on_KFreeBSD.patch
+fix_compilation_with_eigen3.patch

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.