From d52a3df33efd1451100396cb4bd0c2e301fa2218 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Mon, 26 Feb 2007 11:57:19 +0000
Subject: [PATCH] Re enabled on screen help, moved back far plane

---
 src/meshlab/glarea.cpp | 20 +++++++-------------
 src/meshlab/glarea.h   | 13 ++++++++-----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp
index d699e3cc0..7baccef1d 100644
--- a/src/meshlab/glarea.cpp
+++ b/src/meshlab/glarea.cpp
@@ -24,6 +24,9 @@
 History
 
 $Log$
+Revision 1.113  2007/02/26 11:57:19  cignoni
+Re enabled on screen help, moved back far plane
+
 Revision 1.112  2007/02/26 01:20:59  cignoni
 cursor added
 
@@ -123,7 +126,7 @@ GLArea::GLArea(QWidget *parent)
 	activeDefaultTrackball=true;
 	infoAreaVisible = false;
 	trackBallVisible = true;
-	currentSharder = NULL;
+	currentShader = NULL;
 	lastFilterRef = NULL;
 	lastEditRef = NULL;
 	mm = NULL;
@@ -368,9 +371,9 @@ void GLArea::paintGL()
 	              else glDisable(GL_CULL_FACE);
   if(!mm->busy)
   {
-    if(iRenderer && currentSharder) {
+    if(iRenderer && currentShader) {
 		  glPushAttrib(GL_ALL_ATTRIB_BITS);
-		  iRenderer->Render(currentSharder, *mm, rm, this); 
+		  iRenderer->Render(currentShader, *mm, rm, this); 
 	  }
 
 	  mm->Render(rm.drawMode,rm.colorMode,rm.textureMode);
@@ -611,15 +614,6 @@ void GLArea::closeEvent(QCloseEvent *event)
 	}
 }
 
-
-
-void GLArea::keyPressEvent ( QKeyEvent * e )  
-{
-	e->ignore();
-	if (e->key ()==Qt::Key_F1)      {helpVisible=!helpVisible;e->accept();updateGL();}
-}
-
-
 void GLArea::keyReleaseEvent ( QKeyEvent * e )
 {
 	e->ignore();
@@ -851,7 +845,7 @@ void GLArea::setView()
 	float objDist = ratio / tanf(vcg::math::ToRad(fov*.5f));
 
 	nearPlane = objDist - 2.f*clipRatioNear;
-	farPlane =  objDist + 2.f*clipRatioFar;
+	farPlane =  objDist + 10.f*clipRatioFar;
 	if(nearPlane<=objDist*.1f) nearPlane=objDist*.1f;
 
 	if(fov==5)		glOrtho(-ratio*fAspect,ratio*fAspect,-ratio,ratio,objDist - 2.f*clipRatioNear, objDist+2.f*clipRatioFar);
diff --git a/src/meshlab/glarea.h b/src/meshlab/glarea.h
index 401750337..34c262706 100644
--- a/src/meshlab/glarea.h
+++ b/src/meshlab/glarea.h
@@ -24,6 +24,9 @@
   History
 
 $Log$
+Revision 1.66  2007/02/26 11:57:19  cignoni
+Re enabled on screen help, moved back far plane
+
 Revision 1.65  2007/02/26 01:20:59  cignoni
 cursor added
 
@@ -244,6 +247,7 @@ public:
 	bool isTrackBallVisible()		{return trackBallVisible;}
 	bool isDefaultTrackBall()   {return activeDefaultTrackball;}
 
+	bool toggleHelpVisible()      {helpVisible = !helpVisible; update();}  
 	void setBackFaceCulling(bool enabled);
 	void setSelectionRendering(bool enabled);
 	void setCustomSetting(const ColorSetting & s);
@@ -259,7 +263,7 @@ public:
 	void resetTrackBall();
 	list<pair<QAction *,MeshDecorateInterface *> > *iDecoratorsList;
 
-	void setRenderer(MeshRenderInterface *rend, QAction *shader){	iRenderer = rend; currentSharder = shader;}
+	void setRenderer(MeshRenderInterface *rend, QAction *shader){	iRenderer = rend; currentShader = shader;}
 	MeshRenderInterface * getRenderer() { return iRenderer; }
 
 	void setEdit(MeshEditInterface *edit, QAction *editor){	iEdit = edit; currentEditor=editor;}
@@ -282,14 +286,13 @@ protected:
 	QString GetMeshInfoString(int mask);
 	void paintGL();
 	void resizeGL(int width, int height);
-	void keyPressEvent ( QKeyEvent * e );  
 	void keyReleaseEvent ( QKeyEvent * e ); 
 	void mousePressEvent(QMouseEvent *event);
 	void mouseMoveEvent(QMouseEvent *event);
 	void mouseReleaseEvent(QMouseEvent *event);
-    void mouseDoubleClickEvent ( QMouseEvent * event ) ;
+  void mouseDoubleClickEvent ( QMouseEvent * event ) ;
 	void wheelEvent(QWheelEvent*e);
-    bool drawSelection;
+	bool drawSelection;
 
 private:
 
@@ -306,7 +309,7 @@ private:
 
 	//shader support
 	MeshRenderInterface *iRenderer;
-	QAction *currentSharder;
+	QAction *currentShader;
 	QAction *lastFilterRef; // reference to last filter applied
 	QAction *lastEditRef; // reference to last Editing Mode Used 
 	QFont	qFont;			//font settings