Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/dseyb/meshvis

meshvis/__init__.py

+from __future__ import print_function
 
 try:
     from .openmesh_utils import *

meshvis/immediate.py

 from .context import *
 
-def display_faces(vertices, face_indices, normals=None, colors=None, uvs=None, shading='flat', z_offset=0.5):
-    Context().draw_faces(vertices, face_indices, normals, colors, uvs, shading, z_offset).display()
+def display_faces(vertices, face_indices, normals=None, colors=None, uvs=None,
+                  shading='flat', z_offset=0.5, width=600, height=400,
+                  background_color = '#dddddd'):
+    Context(width, height, background_color).draw_faces(vertices, face_indices, normals, colors, uvs, shading, z_offset).display()
 
-def display_edges(vertices, edge_indices=None, colors=None, uvs=None, z_offset=0, linewidth=1):
-    Context().draw_edges(vertices, edge_indices, colors, uvs, z_offset, linewidth).display()
+def display_edges(vertices, edge_indices=None, colors=None, uvs=None,
+                  z_offset=0, linewidth=1, width=600, height=400,
+                  background_color = '#dddddd'):
+    Context(width, height, background_color).draw_edges(vertices, edge_indices, colors, uvs, z_offset, linewidth).display()
 
-def display_vertices(vertices, colors=None, point_size=1, z_offset=0, perspective=False):
-    Context().draw_vertices(vertices, colors, point_size, z_offset, perspective).display()
+def display_vertices(vertices, colors=None, point_size=1, z_offset=0,
+                     perspective=False, width=600, height=400,
+                     background_color = '#dddddd'):
+    Context(width, height, background_color).draw_vertices(vertices, colors, point_size, z_offset, perspective).display()