Transparency/material fix (#375)

* Rough fix

* Use correct var name

* Setup own shading aspect explicitly

* Add test

Author: adam-urbanczyk

cq_editor/cq_utils.py

@@ -9,10 +9,14 @@
 from OCP.TopoDS import TopoDS_Shape
 from OCP.AIS import AIS_InteractiveObject, AIS_Shape
 from OCP.Quantity import \
-    Quantity_TOC_RGB as TOC_RGB, Quantity_Color
-    
+    Quantity_TOC_RGB as TOC_RGB, Quantity_Color, Quantity_NOC_GOLD as GOLD
+from OCP.Graphic3d import Graphic3d_NOM_JADE, Graphic3d_MaterialAspect
+
 from PyQt5.QtGui import QColor
 
+DEFAULT_FACE_COLOR = Quantity_Color(GOLD)
+DEFAULT_MATERIAL = Graphic3d_MaterialAspect(Graphic3d_NOM_JADE)
+
 def find_cq_objects(results : dict):
 
     return {k:SimpleNamespace(shape=v,options={}) for k,v in results.items() if isinstance(v,cq.Workplane)}
@@ -30,7 +34,7 @@ def to_compound(obj : Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.
     elif isinstance(obj,list) and isinstance(obj[0],cq.Shape):
         vals.extend(obj)
     elif isinstance(obj, TopoDS_Shape):
-        vals.append(cq.Shape.cast(obj))        
+        vals.append(cq.Shape.cast(obj))
     elif isinstance(obj,list) and isinstance(obj[0],TopoDS_Shape):
         vals.extend(cq.Shape.cast(o) for o in obj)
     elif isinstance(obj, cq.Sketch):
@@ -63,15 +67,18 @@ def make_AIS(obj : Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.Sha
     else:
         shape = to_compound(obj)
         ais = AIS_Shape(shape.wrapped)
-   
+
+    set_material(ais, DEFAULT_MATERIAL)
+    set_color(ais, DEFAULT_FACE_COLOR)
+
     if 'alpha' in options:
-        ais.SetTransparency(options['alpha'])
+        set_transparency(ais, options['alpha'])
     if 'color' in options:
-        ais.SetColor(to_occ_color(options['color']))
+        set_color(ais, to_occ_color(options['color']))
     if 'rgba' in options:
         r,g,b,a = options['rgba']
-        ais.SetColor(to_occ_color((r,g,b)))
-        ais.SetTransparency(a)
+        set_color(ais, to_occ_color((r,g,b)))
+        set_transparency(ais, a)
 
     return ais,shape
 
@@ -88,7 +95,7 @@ def export(obj : Union[cq.Workplane, List[cq.Workplane]], type : str,
         comp.exportBrep(file)
 
 def to_occ_color(color) -> Quantity_Color:
-    
+
     if not isinstance(color, QColor):
         if isinstance(color, tuple):
             if isinstance(color[0], int):
@@ -118,12 +125,29 @@ def get_occ_color(obj : Union[AIS_InteractiveObject, Quantity_Color]) -> QColor:
 def set_color(ais : AIS_Shape, color : Quantity_Color) -> AIS_Shape:
 
     drawer = ais.Attributes()
+    drawer.SetupOwnShadingAspect()
     drawer.ShadingAspect().SetColor(color)
 
     return ais
 
+def set_material(ais : AIS_Shape, material: Graphic3d_MaterialAspect) -> AIS_Shape:
+
+    drawer = ais.Attributes()
+    drawer.SetupOwnShadingAspect()
+    drawer.ShadingAspect().SetMaterial(material)
+
+    return ais
+
+def set_transparency(ais : AIS_Shape, alpha: float) -> AIS_Shape:
+
+    drawer = ais.Attributes()
+    drawer.SetupOwnShadingAspect()
+    drawer.ShadingAspect().SetTransparency(alpha)
+
+    return ais
+
 def reload_cq():
-    
+
     # NB: order of reloads is important
     reload(cq.types)
     reload(cq.occ_impl.geom)
@@ -147,13 +171,13 @@ def reload_cq():
     reload(cq.occ_impl.exporters)
     reload(cq.assembly)
     reload(cq)
-    
-    
+
+
 def is_obj_empty(obj : Union[cq.Workplane,cq.Shape]) -> bool:
-    
+
     rv = False
-    
+
     if isinstance(obj, cq.Workplane):
         rv = True if isinstance(obj.val(), cq.Vector) else False
-        
+
     return rv

cq_editor/widgets/viewer.py

@@ -7,23 +7,23 @@
     Graphic3d_MaterialAspect
 from OCP.AIS import AIS_Shaded,AIS_WireFrame, AIS_ColoredShape, AIS_Axis
 from OCP.Aspect import Aspect_GDM_Lines, Aspect_GT_Rectangular
-from OCP.Quantity import Quantity_NOC_BLACK as BLACK, Quantity_NOC_GOLD as GOLD,\
-    Quantity_TOC_RGB as TOC_RGB, Quantity_Color
+from OCP.Quantity import Quantity_NOC_BLACK as BLACK, Quantity_TOC_RGB as TOC_RGB,\
+    Quantity_Color
 from OCP.Geom import Geom_Axis1Placement
 from OCP.gp import gp_Ax3, gp_Dir, gp_Pnt, gp_Ax1
 
 from ..utils import layout, get_save_filename
 from ..mixins import ComponentMixin
 from ..icons import icon
-from ..cq_utils import to_occ_color, make_AIS
+from ..cq_utils import to_occ_color, make_AIS, DEFAULT_FACE_COLOR
 
 from .occt_widget import OCCTWidget
 
 from pyqtgraph.parametertree import Parameter
 import qtawesome as qta
 
 
-DEFAULT_FACE_COLOR = Quantity_Color(GOLD)
+
 DEFAULT_EDGE_COLOR = Quantity_Color(BLACK)
 DEFAULT_EDGE_WIDTH = 2
 
@@ -62,7 +62,7 @@ def __init__(self,parent=None):
                              [self.canvas,],
                              top_widget=self,
                              margin=0)
-        
+
         self.setup_default_drawer()
         self.updatePreferences()
 
@@ -88,9 +88,9 @@ def updatePreferences(self,*args):
         if not self.preferences['Use gradient']:
             color2 = color1
         self.canvas.view.SetBgGradientColors(color1,color2,theToUpdate=True)
-        
+
         self.canvas.update()
-        
+
         ctx = self.canvas.context
         ctx.SetDeviationCoefficient(self.preferences['Deviation'])
         ctx.SetDeviationAngle(self.preferences['Angular deviation'])

tests/test_app.py

@@ -1092,7 +1092,37 @@ def test_render_colors_console(main_clean):
     # check if error occured
     qtbot.wait(100)
     assert('Unknown color format' in log.toPlainText().splitlines()[-1])
+
+code_shading = \
+'''
+import cadquery as cq
+
+res1 = cq.Workplane('XY').box(5, 7, 5)
+res2 = cq.Workplane('XY').box(8, 5, 4)
+show_object(res1)
+show_object(res2,options={"alpha":0})
+'''
+
+def test_shading_aspect(main_clean):
 
+    qtbot, win = main_clean
+
+    obj_tree = win.components['object_tree']
+    editor = win.components['editor']
+    debugger = win.components['debugger']
+
+    editor.set_text(code_shading)
+    debugger._actions['Run'][0].triggered.emit()
+
+    CQ = obj_tree.CQ
+
+    # get material aspects
+    ma1 = CQ.child(0).ais.Attributes().ShadingAspect().Material()
+    ma2 = CQ.child(1).ais.Attributes().ShadingAspect().Material()
+
+    # verify that they are the same
+    assert ma1.Shininess() == ma2.Shininess()
+
 def test_confirm_new(monkeypatch,editor):
 
     qtbot, editor = editor