No commit message

No commit message

contrib/mobile/drawGeom.cpp

@@ -33,7 +33,7 @@ void drawGeomVertex(GVertex *v)
                (GLubyte)CTX::instance()->unpackBlue(col),
                (GLubyte)CTX::instance()->unpackAlpha(col));
 	const GLfloat p[] = {(GLfloat)v->x(), (GLfloat)v->y(), (GLfloat)v->z()};
-	glPointSize((GLfloat)(CTX::instance()->geom.pointSize>0)? 3:1);
+	glPointSize((GLfloat)CTX::instance()->geom.pointSize);
 	glVertexPointer(3, GL_FLOAT, 0, p);
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glDrawArrays(GL_POINTS, 0, 1);
@@ -66,9 +66,12 @@ void drawGeomEdge(GEdge *e)
 		edge[i*3] = p.x(); edge[i*3+1] = p.y(); edge[i*3+2] = p.z();
 	}
 	// Then print the VA
+	glLineWidth((GLfloat)CTX::instance()->geom.lineWidth);
 	glVertexPointer(3, GL_FLOAT, 0, edge);
 	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnable(GL_LINE_SMOOTH);
 	glDrawArrays(GL_LINE_STRIP, 0, N);
+	glDisable(GL_LINE_SMOOTH);
 	glDisableClientState(GL_VERTEX_ARRAY);
 	free(edge);
 }
@@ -78,8 +81,6 @@ void drawGeomFace(GFace *f)
 }
 void drawContext::drawGeom()
 {
-	if(!CTX::instance()->geom.draw) return;
-
 	for(unsigned int i=0; i<GModel::list.size(); i++) {
 		GModel *m = GModel::list[i];
 		if(!m->getVisibility()) continue;

contrib/mobile/drawMesh.cpp

@@ -75,6 +75,7 @@ void drawMeshEdge(GEdge *e)
         else
             return;
     }
+    glLineWidth(CTX::instance()->mesh.lineWidth);
 	drawArray(e->va_lines, GL_LINES, true);
 }
 void drawMeshFace(GFace *f)

contrib/mobile/iOS/Onelab/ModelViewController.mm

@@ -247,7 +247,7 @@
 }
 
 - (IBAction)singleTap:(UITapGestureRecognizer *)sender {
-	[self.navigationController setToolbarHidden:!self.navigationController.toolbarHidden animated:YES];
+	[self.navigationController setToolbarHidden:(!(self.navigationController.toolbarHidden && !((AppDelegate *)[UIApplication sharedApplication].delegate)->compute && number_of_animation() > 0)) animated:YES];
 }
 
 - (IBAction)doubleTap:(UITapGestureRecognizer *)sender {