From a212f6320d541a33bff553940e24620490c911ca Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Tue, 22 Feb 2005 11:15:01 +0000
Subject: [PATCH] added vcg namespace

---
 wrap/gl/shot.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/wrap/gl/shot.h b/wrap/gl/shot.h
index 2d693f3b..47f89b26 100644
--- a/wrap/gl/shot.h
+++ b/wrap/gl/shot.h
@@ -23,6 +23,9 @@
 /****************************************************************************
   History
 $Log: not supported by cvs2svn $
+Revision 1.5  2005/02/11 11:43:09  tommyfranken
+FromTrackball() corrected
+
 Revision 1.4  2004/12/15 18:45:06  tommyfranken
 *** empty log message ***
 
@@ -129,11 +132,11 @@ static void FromTrackball(const vcg::Trackball & tr,
 						  const vcg::Shot<ScalarType> & sShot, 
 						  vcg::Shot<ScalarType> & shot )
 {
-	Point3<ScalarType>		cen; cen.Import(tr.center);
-	Point3<ScalarType>		tra; tra.Import(tr.track.tra);
-	Matrix44<ScalarType>	trM; trM.FromMatrix(tr.track.Matrix());
+	vcg::Point3<ScalarType>		cen; cen.Import(tr.center);
+	vcg::Point3<ScalarType>		tra; tra.Import(tr.track.tra);
+	vcg::Matrix44<ScalarType>	trM; trM.FromMatrix(tr.track.Matrix());
 
-	Point3<ScalarType>		vp = Inverse(trM)*(sShot.ViewPoint()-cen) +cen +tra;
+	vcg::Point3<ScalarType>		vp = Inverse(trM)*(sShot.ViewPoint()-cen) +cen +tra;
 
 	shot.SetViewPoint(vp);
 	shot.similarity.rot =   sShot.similarity.rot*trM;