From de4734d24528589fd2d4f2383125f7a37de1c40e Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Thu, 7 Oct 2004 14:25:38 +0000
Subject: [PATCH] added camera and shot

---
 vcg/complex/trimesh/base.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/vcg/complex/trimesh/base.h b/vcg/complex/trimesh/base.h
index 3c52eefd..dd2c3a98 100644
--- a/vcg/complex/trimesh/base.h
+++ b/vcg/complex/trimesh/base.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.10  2004/09/08 15:15:05  ganovelli
+changes for gcc
+
 Revision 1.9  2004/07/15 12:03:50  ganovelli
 access to imark added
 
@@ -57,6 +60,7 @@ Initial commit
 #pragma warning( disable : 4804 )
 #endif
 #include <vcg/space/box3.h>
+#include <vcg/math/shot.h>
 
 /*
 People should subclass his vertex class from these one...
@@ -110,7 +114,8 @@ class TriMesh{
 	//vector<string> normalmaps;
 
 		/// La camera
-	//Camera<ScalarType> camera;
+	Camera<ScalarType> camera; // intrinsic
+	Shot<ScalarType> shot;		// extrinsic
 
 		/// Il colore della mesh
 private:
@@ -129,7 +134,7 @@ public:
 
 
 	/// Default constructor
-	TriMesh()
+	TriMesh():shot(camera)
 	{
 		fn = vn = 0;
 		imark = 0;