From 07d2259700dbc8b6255ddfef32d28899d82fd930 Mon Sep 17 00:00:00 2001
From: cnr-isti-vclab <paolo.cignoni@isti.cnr.it>
Date: Fri, 25 Nov 2005 10:33:33 +0000
Subject: [PATCH] shot.camera  -> shot.Camera() shot.similarity.Matrix() ->
 shot.Similarity().Matrix()

---
 wrap/gl/shot.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/wrap/gl/shot.h b/wrap/gl/shot.h
index 47f89b26..cddfdebe 100644
--- a/wrap/gl/shot.h
+++ b/wrap/gl/shot.h
@@ -23,6 +23,9 @@
 /****************************************************************************
   History
 $Log: not supported by cvs2svn $
+Revision 1.6  2005/02/22 11:15:01  ganovelli
+added vcg namespace
+
 Revision 1.5  2005/02/11 11:43:09  tommyfranken
 FromTrackball() corrected
 
@@ -68,24 +71,24 @@ struct GlShot {
 	typedef typename ShotType::ScalarType ScalarType;
 	typedef typename GlCamera<typename ShotType::CameraType> GlCameraType;
 
-static void MatrixGL(const ShotType & shot,vcg::Matrix44<ScalarType> & m) {
-	m = shot.similarity.Matrix();
+static void MatrixGL(ShotType & shot,vcg::Matrix44<ScalarType> & m) {
+	m = shot.Similarity().Matrix();
 }
 
-static void TransformGL(const vcg::Shot<ScalarType> & shot){
+static void TransformGL(vcg::Shot<ScalarType> & shot){
 	vcg::Matrix44<ScalarType> m;
 	MatrixGL(shot,m);
 	glMultMatrix(m);
 }
 
-static void SetView(const vcg::Shot<ScalarType> & shot){
+static void SetView(vcg::Shot<ScalarType> & shot){
 	assert(glGetError() == 0);
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	glLoadIdentity();
 
 	assert(glGetError() == 0);
-	GlCameraType::TransformGL(shot.camera); // apply camera/modelview transformation
+	GlCameraType::TransformGL(shot.Camera()); // apply camera/modelview transformation
 	assert(glGetError() == 0);
 
 	glMatrixMode(GL_MODELVIEW);