Fix ColorEffect decorator for standalone use

xentica/core/base.py

@@ -194,6 +194,9 @@ def declare_coords(cls):
     def define_constant(cls, constant):
         cls._constants[constant.name] = deepcopy(constant)
 
+    def is_constant(cls, constant):
+        return constant in cls._constants
+
     @property
     def coords_declared(cls):
         return cls._coords_declared

xentica/core/color_effects.py

@@ -58,6 +58,7 @@ def __call__(self, *args):
     def __init__(self, func):
         """Initialize base attributes."""
         self.func = func
+        self.effect = ""
 
     def __call__(self, self_var):
         """
@@ -67,14 +68,14 @@ def __call__(self, self_var):
         ``super`` result, like shown in the example above.
 
         """
-        r, g, b = self.func(self_var)
+        red, green, blue = self.func(self_var)
         code = """
             int new_r = %s;
             int new_g = %s;
             int new_b = %s;
             %s
             col[i] = make_int3(new_r, new_g, new_b);
-        """ % (r, g, b, self.effect)
+        """ % (red, green, blue, self.effect)
         self_var.append_code(code)
 
 

xentica/core/renderers.py

@@ -123,9 +123,12 @@ def render_code(self):
         )
         code += "}" * (self._bsca.topology.dimensions - 2)
         # calculate average
+        by_smooth_factor = ""
+        if self._bsca.is_constant("SMOOTH_FACTOR"):
+            by_smooth_factor = "/ SMOOTH_FACTOR"
         code += """
-            img[i * 3] = r / num_cells_projected / SMOOTH_FACTOR;
-            img[i * 3 + 1] = g / num_cells_projected / SMOOTH_FACTOR;
-            img[i * 3 + 2] = b / num_cells_projected / SMOOTH_FACTOR;
-        """
+            img[i * 3] = r / num_cells_projected {by_smooth_factor};
+            img[i * 3 + 1] = g / num_cells_projected {by_smooth_factor};
+            img[i * 3 + 2] = b / num_cells_projected {by_smooth_factor};
+        """.format(by_smooth_factor=by_smooth_factor)
         return code