Allow to pass more options for meshes

madcad/displays.py

@@ -244,9 +244,13 @@ def __init__(self, scene, box, color=None):
 
 class SolidDisplay(Display):
 	''' Display render Meshes '''
-	def __init__(self, scene, positions, normals, faces, lines, idents, color=None):
+	def __init__(self, scene, positions, normals, faces, lines, idents, color=None, options:dict = None):
 		self.box = npboundingbox(positions)
-		self.options = scene.options
+
+		self.options = scene.options.copy()
+		self.options.update(options)
+		# if we can make backward-breaking changes, remove color as parameter, use instead:
+		# color = options["color"] if options is not None and "color" in options else None
 
 		s = settings.display
 		color = fvec3(color or s['solid_color'])

madcad/mesh/mesh.py

@@ -670,7 +670,8 @@ def display(self, scene):
 				typedlist_to_numpy(m.faces, 'u4'),
 				typedlist_to_numpy(edges, 'u4'),
 				typedlist_to_numpy(idents, 'u4'),
-				color = self.options.get('color'),
+				self.options.get('color'),
+				self.options,
 				)
 
 	def __repr__(self):

madcad/rendering.py

@@ -67,6 +67,12 @@ class display:
 # shared open gl context, None if not yet initialized
 global_context = None
 
+def qt_surface_format():
+    fmt = QSurfaceFormat()
+    fmt.setVersion(*opengl_version)
+    fmt.setProfile(QSurfaceFormat.OpenGLContextProfile.CoreProfile)
+    fmt.setSamples(4)
+    return fmt
 
 def show(scene:dict, interest:Box=None, size=uvec2(400,400), projection=None, navigation=None, **options):
 	''' 
@@ -90,6 +96,8 @@ def show(scene:dict, interest:Box=None, size=uvec2(400,400), projection=None, na
 	if 'options' in options:	options.update(options['options'])
 	if not isinstance(scene, Scene):	scene = Scene(scene, options)
 
+	QSurfaceFormat.setDefaultFormat(qt_surface_format())
+
 	app = QApplication.instance()
 	created = False
 	if not app:
@@ -764,7 +772,7 @@ def render(self):
 		# prepare the view uniforms
 		w, h = self.fb_screen.size
 		self.uniforms['view'] = view = self.navigation.matrix()
-		self.uniforms['proj'] = proj = self.projection.matrix(w/h, self.navigation.distance)
+		self.uniforms['proj'] = proj = self.projection.matrix(w/h if h > 0 else 0, self.navigation.distance)
 		self.uniforms['projview'] = proj * view
 		self.fresh.clear()
 
@@ -1020,11 +1028,7 @@ class View(ViewCommon, QOpenGLWidget):
 	def __init__(self, scene, projection=None, navigation=None, parent=None):
 		# super init
 		QOpenGLWidget.__init__(self, parent)
-		fmt = QSurfaceFormat()
-		fmt.setVersion(*opengl_version)
-		fmt.setProfile(QSurfaceFormat.CoreProfile)
-		fmt.setSamples(4)
-		self.setFormat(fmt)
+		self.setFormat(qt_surface_format())
 
 		# ugly trick to receive interaction events in a different function than QOpenGLWidget.event (that one is locking the GIL during the whole rendering, killing any possibility of having a computing thread aside)
 		# that event reception should be in the current widget ...