make colors functional in openscad viewer

couldn't make it work in web though

Author: lfagundes

solid_node/node/base.py

@@ -40,6 +40,9 @@ class AbstractBaseNode:
     # All children nodes, initialized as tuple for compliance
     children = tuple()
 
+    # Set to false to render scad directly instead of stls
+    optimize = True
+
     def __init__(self, *args, name=None, **kwargs):
         # self.uniq_id uniquely identifies a set of parameters of an instance.
         # self.name is used to refer to nodes in tests
@@ -127,9 +130,14 @@ def assemble(self, root=None):
 
         self.validate(rendered)
         self.model = self.as_scad(rendered)
+        if not self.optimize:
+            self.model = self._colorize(self.model)
         self.generate_scad()
 
-        assembled = self.import_optimized()
+        if self.optimize:
+            assembled = self.import_optimized()
+        else:
+            assembled = self.model
 
         for operation in self.operations:
             # Apply scad operation
@@ -143,8 +151,19 @@ def import_optimized(self):
         if self.rigid and self._up_to_date(self.stl_file):
             basedir = os.path.relpath(self.basedir, self.root)
             local_stl = os.path.join(basedir, self.local_stl)
-            return import_stl(local_stl)
-        return self.model
+            imported_stl = import_stl(local_stl)
+            return self._colorize(imported_stl)
+        return self._colorize(self.model)
+
+    def _colorize(self, scad_code):
+        if self.color is None:
+            return scad_code
+        hex_code = self.color.lstrip('#')
+        if len(hex_code) != 6:
+            raise ValueError(f"Invalid self.color at {self}. "
+                             "It should be in the format #RRGGBB")
+        colors = [int(hex_code[i:i + 2], 16) / 255 for i in (0, 2, 4)]
+        return color(colors, 1)(scad_code)
 
     @property
     def stl(self):

solid_node/viewers/web/app/src/node.ts

@@ -21,6 +21,7 @@ interface NodeData {
   children?: string[];
   mtime: number;
   operations: RawOperation[];
+  color: string;
 }
 
 const stlLoader = new STLLoader();
@@ -44,6 +45,8 @@ export abstract class Node {
 
   mtime: number;
 
+  color: string;
+
   // Operations matrix.
   // Each layer of the tree has a list of operations
   // rawOperations contains functions (can use $t or any variable)
@@ -60,6 +63,7 @@ export abstract class Node {
     this.children = [];
     this.rawOperations = [];
     this.operations = [];
+    this.color = data.color;
   }
 
   setOperations(op: RawOperation[], level: number = 0) {
@@ -102,7 +106,18 @@ export abstract class Node {
     const tstamp = new Date().getTime(); // avoid cache
 
     stlLoader.load(`/node${this.path}${this.model}?t=${tstamp}`, (geometry) => {
-      const material = new THREE.MeshNormalMaterial();
+      let material;
+      if (this.color) {
+	const color = new THREE.Color(this.color);
+	material = new THREE.MeshBasicMaterial({
+	  color: color,
+	  //metalness: 0.2,
+	  //roughness: 0.5,
+	  //emissive: color,
+	});
+      } else {
+	material = new THREE.MeshNormalMaterial();
+      }
       const mesh = new THREE.Mesh(geometry, material);
       if (this.context.scene) {
         if (this.mesh) {

solid_node/viewers/web/viewer.py

@@ -174,6 +174,7 @@ async def state(self):
             'operations': self.operations,
             'type': self.node._type,
             'name': self.node.name,
+            'color': self.node.color
         }
         if self.children:
             state['children'] = self.children