From 976853309555e0d31dc6fe0295e23d5cd836f64a Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Fri, 12 Mar 2010 14:58:02 +0000
Subject: [PATCH] (involuntary  commit  reverted)

---
 apps/sample/trimesh_QT/glarea.cpp    | 123 +++++++--------------------
 apps/sample/trimesh_QT/para_body.pro |  45 ----------
 2 files changed, 31 insertions(+), 137 deletions(-)
 delete mode 100755 apps/sample/trimesh_QT/para_body.pro

diff --git a/apps/sample/trimesh_QT/glarea.cpp b/apps/sample/trimesh_QT/glarea.cpp
index 38d86e30..8c2a372d 100644
--- a/apps/sample/trimesh_QT/glarea.cpp
+++ b/apps/sample/trimesh_QT/glarea.cpp
@@ -97,111 +97,50 @@ void GLArea::resizeGL (int w, int h)
   initializeGL();
  }
 
-vcg::Point3f EP_right_shoulder(float s_dx, float r, float r1, unsigned int N ,unsigned int i){
-    float delta = (r-r1)*0.5/N;
-    if(i<N/2){
-        float x = s_dx-delta*i;
-        return vcg::Point3f(x,0,-sqrt(1.f-x*x/(r*r*0.25))*r1*0.5);}
-    else{
-        float x = -r/2+delta*i;
-        return vcg::Point3f(x,0,sqrt(1.f-x*x/(r*r*0.25))*r1*0.5);}
-    }
-}
-
-vcg::Point3f CP_right_shoulder(float r, unsigned int N ,unsigned int i){
-    float ang = M_PI/N*i;
-    return vcg::Point3f(r*vcg::math::Cos(ang),0,-r*vcg::math::Sin(ang))
-}
-
-void DrawHE(float r, float r1, float sg=1.0){
-   const float delta = 100.f;
-    glBegin(GL_LINE_STRIP);
-    for(float x = -r/2.f; x < r/2.f+r/(delta-1.f); x+=r/delta)
-        glVertex3f(x,0,sg*sqrt(1.f-x*x/(r*r*0.25))*r1*0.5);
-    glEnd();
-}
-void DrawShoulder_d(float dx,float dy,float rad){
-    glPushMatrix();
-    glTranslatef(dx,dy,0.f);
-    gluSphere(gluNewQuadric(),rad,100,100);
-    glPopMatrix();
-}
-
-void DrawE(float n_r1, float n_r2){
-    DrawHE(n_r1,n_r2,1.0);
-    DrawHE(n_r1,n_r2,-1.0);
-
-}
-void  DrawNeck(float ne_x, float ne_y, float angle, float n_r1, float n_r2){
-
-    glPushMatrix();
-    glTranslatef(ne_x,ne_y,0.0);
-    glRotatef(angle,1,0,0);
-
-    DrawE(n_r1,n_r2);
-    glTranslatef(0,3,0);
-    DrawE(n_r1,n_r2);
-    glPopMatrix();
-}
-
-void DrawBody(){
-    DrawHE(50,40,1.0);      // petto basso
-    DrawHE(50,20,-1.0);     // schiena basso
-
-    float rad = 4;
-    float     s_dx = -15.f,s_dy = 10.f;
-    float     s_sx =  15.f,s_sy = 10.f;
-    DrawShoulder_d(s_dx,s_dy,rad);
-    DrawShoulder_d(s_sx,s_sy,rad);
-
-    float delta_neck = 3.f;
-    float ne_x = (s_dx+s_sx)*0.5;
-    float ne_y = (s_dy+s_sy+2*rad)*0.5+delta_neck;
-    float angle = 10.f;
-    float n_r1 = 10.f;
-    float n_r2 = 12.f;
-
-    DrawNeck(ne_x,ne_y, angle,n_r1,n_r2);
-
-    // FRR
-    float delta_low = (s_dx-r/2)/20;
-    for(float x = -r/2; r <= s_dx;r=r+delta_low){
-        glVertex(EP(r,r1,1.0,x));
-        glVertex(EP(r,r1,1.0,x+delta_low));
-        glVertex(CP(r,1.0,x+delta_high));
-
-    }
-
-
-
-
-
-
-
-}
 void GLArea::paintGL ()
 {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    gluPerspective(40, GLArea::width()/(float)GLArea::height(), 0.1, 200);
+    gluPerspective(40, GLArea::width()/(float)GLArea::height(), 0.1, 100);
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
-    gluLookAt(0,0,100,   0,0,0,   0,1,0);
+    gluLookAt(0,0,5,   0,0,0,   0,1,0);
     track.center=vcg::Point3f(0, 0, 0);
-    track.radius= 30;
+    track.radius= 1;
 	track.GetView();
     track.Apply(false);
     glPushMatrix();
-    glPolygonMode(GL_FRONT,GL_LINE);
-
-
-    // disegna il modello
-    glDisable(GL_LIGHTING);
-    DrawBody();
+    float d=1.0f/mesh.bbox.Diag();
+    vcg::glScale(d);
+	glTranslate(-glWrap.m->bbox.Center());	
+	// the trimesh drawing calls
+	switch(drawmode)
+	{
+	  case SMOOTH: 
+	  	glWrap.Draw<vcg::GLW::DMSmooth,   vcg::GLW::CMNone,vcg::GLW::TMNone> ();
+	  	break;
+	  case POINTS: 
+	  	glWrap.Draw<vcg::GLW::DMPoints,   vcg::GLW::CMNone,vcg::GLW::TMNone> ();
+	  	break;
+	  case WIRE: 
+	    glWrap.Draw<vcg::GLW::DMWire,     vcg::GLW::CMNone,vcg::GLW::TMNone> ();
+	    break;
+	  case FLATWIRE: 
+	  	glWrap.Draw<vcg::GLW::DMFlatWire, vcg::GLW::CMNone,vcg::GLW::TMNone> ();
+	  	break;
+	  case HIDDEN: 
+	  	glWrap.Draw<vcg::GLW::DMHidden,   vcg::GLW::CMNone,vcg::GLW::TMNone> ();
+	  	break;
+	  case FLAT: 
+	  	glWrap.Draw<vcg::GLW::DMFlat,     vcg::GLW::CMNone,vcg::GLW::TMNone> ();
+	  	break;
+	  default: 
+	  	break;
+	}
 
     glPopMatrix();
-   // track.DrawPostApply();
+    track.DrawPostApply();
 } 
 
 void GLArea::keyReleaseEvent (QKeyEvent * e)
diff --git a/apps/sample/trimesh_QT/para_body.pro b/apps/sample/trimesh_QT/para_body.pro
deleted file mode 100755
index 6134c803..00000000
--- a/apps/sample/trimesh_QT/para_body.pro
+++ /dev/null
@@ -1,45 +0,0 @@
-# Base options
-TEMPLATE = app
-LANGUAGE  = C++
-
-# QT modules
-QT += opengl
-
-# Executable name
-TARGET = para_body
-
-# Directories
-DESTDIR = .
-UI_DIR = build/ui
-MOC_DIR = build/moc
-OBJECTS_DIR = build/obj
-
-# Lib headers
-INCLUDEPATH += .
-INCLUDEPATH += ../../../../../vcglib
-
-# Lib sources
-SOURCES += ../../../../../vcglib/wrap/ply/plylib.cpp
-SOURCES += ../../../../../vcglib/wrap/gui/trackball.cpp
-SOURCES += ../../../../../vcglib/wrap/gui/trackmode.cpp
-
-
-# Compile glew
-DEFINES += GLEW_STATIC
-INCLUDEPATH += ../../../../../code/lib/glew/include
-SOURCES += ../../../../../code/lib/glew/src/glew.c
-
-# Awful problem with windows..
-win32{
-  DEFINES += NOMINMAX
-}
-
-# Input
-HEADERS += mainwindow.h
-HEADERS += glarea.h
-
-SOURCES += main.cpp
-SOURCES += mainwindow.cpp
-SOURCES += glarea.cpp
-
-FORMS += mainwindow.ui