Completed VTK support for materials

Author: adrianschneider94

cadquery/__init__.py

@@ -21,7 +21,7 @@
 )
 from .occ_impl import exporters
 from .occ_impl import importers
-from .materials import Color, Material, CommonMaterial, PbrMaterial
+from .materials import Color, Material, SimpleMaterial, PbrMaterial
 
 # these items are the common implementation
 
@@ -49,7 +49,7 @@
     "Assembly",
     "Color",
     "Material",
-    "CommonMaterial",
+    "SimpleMaterial",
     "PbrMaterial",
     "Constraint",
     "plugins",

cadquery/cq_directive.py

@@ -7,7 +7,7 @@
 
 from json import dumps
 
-from cadquery import exporters, Assembly, Compound, Color, Sketch
+from cadquery import exporters, Assembly, Compound, Sketch
 from cadquery import cqgi
 from cadquery.occ_impl.assembly import toJSON
 from cadquery.occ_impl.jupyter_tools import DEFAULT_COLOR
@@ -299,9 +299,9 @@ def run(self):
                 if isinstance(shape, Assembly):
                     assy = shape
                 elif isinstance(shape, Sketch):
-                    assy = Assembly(shape._faces, color=Color(*DEFAULT_COLOR))
+                    assy = Assembly(shape._faces, color=DEFAULT_COLOR)
                 else:
-                    assy = Assembly(shape, color=Color(*DEFAULT_COLOR))
+                    assy = Assembly(shape, color=DEFAULT_COLOR)
             else:
                 raise result.exception
 

cadquery/materials.py

@@ -53,14 +53,30 @@ def __init__(self, *args, **kwargs):
             self.b = 0.0
             self.a = 1.0
         elif len(args) == 1 and isinstance(args[0], str):
-            from .occ_impl.assembly import color_from_name
-
-            # Handle color name case
-            color = color_from_name(args[0])
-            self.r = color.r
-            self.g = color.g
-            self.b = color.b
-            self.a = color.a
+            from cadquery.occ_impl.assembly import color_from_name
+            from vtkmodules.vtkCommonColor import vtkNamedColors
+
+            # Try to get color from OCCT first, fall back to VTK if not found
+            try:
+                # Get color from OCCT
+                color = color_from_name(args[0])
+                self.r = color.r
+                self.g = color.g
+                self.b = color.b
+                self.a = color.a
+            except ValueError:
+                # Check if color exists in VTK
+                vtk_colors = vtkNamedColors()
+                if not vtk_colors.ColorExists(args[0]):
+                    raise ValueError(f"Unsupported color name: {args[0]}")
+
+                # Get color from VTK
+                color = vtk_colors.GetColor4d(args[0])
+                self.r = color.GetRed()
+                self.g = color.GetGreen()
+                self.b = color.GetBlue()
+                self.a = color.GetAlpha()
+
         elif len(args) == 3:
             # Handle RGB case
             r, g, b = args
@@ -118,15 +134,14 @@ def __eq__(self, other: object) -> bool:
 
 
 @dataclass
-class CommonMaterial:
+class SimpleMaterial:
     """
     Traditional material model matching OpenCascade's XCAFDoc_VisMaterialCommon.
     """
 
     ambient_color: Color
     diffuse_color: Color
     specular_color: Color
-    emissive_color: Color
     shininess: float
     transparency: float
 
@@ -145,21 +160,19 @@ def __hash__(self) -> int:
                 self.ambient_color,
                 self.diffuse_color,
                 self.specular_color,
-                self.emissive_color,
                 self.shininess,
                 self.transparency,
             )
         )
 
     def __eq__(self, other: object) -> bool:
         """Compare two CommonMaterial objects."""
-        if not isinstance(other, CommonMaterial):
+        if not isinstance(other, SimpleMaterial):
             return False
         return (
             self.ambient_color == other.ambient_color
             and self.diffuse_color == other.diffuse_color
             and self.specular_color == other.specular_color
-            and self.emissive_color == other.emissive_color
             and self.shininess == other.shininess
             and self.transparency == other.transparency
         )
@@ -169,6 +182,8 @@ def __eq__(self, other: object) -> bool:
 class PbrMaterial:
     """
     PBR material definition matching OpenCascade's XCAFDoc_VisMaterialPBR.
+    
+    Note: Emission support will be added in a future version with proper texture support.
     """
 
     # Base color and texture
@@ -177,9 +192,6 @@ class PbrMaterial:
     roughness: float
     refraction_index: float
 
-    # Optional properties
-    emissive_factor: Color = Color(0.0, 0.0, 0.0)
-
     def __post_init__(self):
         """Validate the material properties."""
         # Validate ranges
@@ -193,13 +205,7 @@ def __post_init__(self):
     def __hash__(self) -> int:
         """Make PbrMaterial hashable."""
         return hash(
-            (
-                self.base_color,
-                self.metallic,
-                self.roughness,
-                self.refraction_index,
-                self.emissive_factor,
-            )
+            (self.base_color, self.metallic, self.roughness, self.refraction_index,)
         )
 
     def __eq__(self, other: object) -> bool:
@@ -211,7 +217,6 @@ def __eq__(self, other: object) -> bool:
             and self.metallic == other.metallic
             and self.roughness == other.roughness
             and self.refraction_index == other.refraction_index
-            and self.emissive_factor == other.emissive_factor
         )
 
 
@@ -228,12 +233,12 @@ class Material:
 
     # Material representations
     color: Optional[Color] = None
-    common: Optional[CommonMaterial] = None
+    simple: Optional[SimpleMaterial] = None
     pbr: Optional[PbrMaterial] = None
 
     def __post_init__(self):
         """Validate that at least one representation is provided."""
-        if not any([self.color, self.common, self.pbr]):
+        if not any([self.color, self.simple, self.pbr]):
             raise ValueError("Material must have at least one representation defined")
 
     def __hash__(self) -> int:
@@ -244,7 +249,7 @@ def __hash__(self) -> int:
                 self.description,
                 self.density,
                 self.color,
-                self.common,
+                self.simple,
                 self.pbr,
             )
         )
@@ -258,6 +263,6 @@ def __eq__(self, other: object) -> bool:
             and self.description == other.description
             and self.density == other.density
             and self.color == other.color
-            and self.common == other.common
+            and self.simple == other.simple
             and self.pbr == other.pbr
         )