Refactor color into separate class, breaks Codon (exaloop/codon#554)

rtow/__init__.py

@@ -1,4 +1,5 @@
 from .ray import Ray
-from .vec3 import Color, Point3, Vec3
+from .vec3 import Point3, Vec3
+from .color import Color
 from .interval import Interval
 from .aabb import AABB

rtow/__main__.py

@@ -4,7 +4,8 @@
 from typing import Callable, List, Tuple
 
 from .tracer import Tracer, Camera
-from .vec3 import Vec3, Point3, Color
+from .vec3 import Vec3, Point3
+from .color import Color
 from .objects import Sphere, HittableList
 from .materials import Lambertian, Metal, Dielectric
 from .textures import Checker
@@ -13,7 +14,7 @@
 def bouncing_spheres():
     world = HittableList()
 
-    checker = Checker.from_colors(0.32, Color(0.2, 0.3, 0.1), Color.all(0.9))
+    checker = Checker.from_colors(0.32, Color(0.2, 0.3, 0.1), Color.gray(0.9))
     world.add(Sphere(1000, Lambertian(checker), Point3(0, -1000, 0)))
 
     for a in range(-11, 11):
@@ -64,7 +65,7 @@ def bouncing_spheres():
 def checkered_spheres():
     world = HittableList()
 
-    checker = Checker.from_colors(0.32, Color(0.2, 0.3, 0.1), Color.all(0.9))
+    checker = Checker.from_colors(0.32, Color(0.2, 0.3, 0.1), Color.gray(0.9))
 
     world.add(Sphere(10, Lambertian(checker), Point3(0, -10, 0)))
     world.add(Sphere(10, Lambertian(checker), Point3(0,  10, 0)))

rtow/buffer.py

@@ -3,7 +3,7 @@
 
 from .ppm import save
 from .interval import Interval
-from .vec3 import Color
+from .color import Color, black
 
 
 intensity = Interval(0.000, 0.999)
@@ -21,7 +21,7 @@ class Buffer:
     def __init__(self, w: int, h: int):
         self.w = w
         self.h = h
-        self.buffer = [[Color() for x in range(w)] for y in range(h)]
+        self.buffer = [[black for x in range(w)] for y in range(h)]
 
     def save_ppm(self, name: str):
         save(self.raw_buffer(), name)

rtow/color.py

@@ -0,0 +1,21 @@
+from .vec3 import Vec3
+
+
+class Color(Vec3):
+    r: float
+    g: float
+    b: float
+
+    def __init__(self, r: float = 0, g: float = 0, b: float = 0):
+        super().__init__(r, g, b)
+        self.r = r
+        self.g = g
+        self.b = b
+
+    @staticmethod
+    def gray(intensity: float):
+        return Color(intensity, intensity, intensity)
+
+
+black = Color(0, 0, 0)
+white = Color(1, 1, 1)

rtow/materials/lambertian.py

@@ -4,6 +4,7 @@
 from .. import Ray, Color, Vec3
 from ..objects import Hit
 from ..textures import Texture, SolidColor
+from ..color import black
 from .material import Material, Scatter
 
 
@@ -14,7 +15,7 @@ def __init__(self, texture: Texture):
         self.texture = texture
 
     @staticmethod
-    def from_color(albedo: Color = Color(0, 0, 0)):
+    def from_color(albedo: Color = black):
         return Lambertian(SolidColor(albedo))
 
     def scatter(self, r_in: Ray, hit: Hit) -> Optional[Scatter]:

rtow/materials/metal.py

@@ -2,14 +2,15 @@
 
 from .. import Ray, Color, Vec3
 from ..objects import Hit
+from ..color import black
 from .material import Material, Scatter
 
 
 class Metal(Material):
     albedo: Color
     fuzz: float
 
-    def __init__(self, albedo: Color = Color(0, 0, 0), fuzz: float = 0.0):
+    def __init__(self, albedo: Color = black, fuzz: float = 0.0):
         self.albedo = albedo
         self.fuzz = fuzz
 

rtow/tracer.py

@@ -7,7 +7,8 @@
 from .interval import Interval
 from .objects import Hittable, HittableList
 from .ray import Ray
-from .vec3 import Color, Point3, Vec3
+from .vec3 import Point3, Vec3
+from .color import Color, black, white
 from .bvh import BVHNode
 from .camera import Camera
 
@@ -83,7 +84,7 @@ def __init__(
     def ray_color(self, r: Ray, depth: int, world: Hittable) -> Color:
         # If we've exceeded the ray bounce limit, no more light is gathered
         if depth <= 0:
-            return Color(0, 0, 0)
+            return black
 
         # Min distance is 0.001 to avoid floating point precision errors
         # That way if the ray starts just below a surface,
@@ -92,12 +93,12 @@ def ray_color(self, r: Ray, depth: int, world: Hittable) -> Color:
 
         if rec:
             if self.mode == "normals":
-                return 0.5 * (rec.hit.normal + Color(1, 1, 1))
+                return 0.5 * (rec.hit.normal + white)
 
             scatter = rec.mat.scatter(r, rec.hit)
             if scatter:
                 return scatter.attenuation * self.ray_color(scatter.scattered, depth - 1, world)
-            return Color(0, 0, 0)
+            return black
 
         # Sky
         unit_direction = r.direction.unit()
@@ -136,7 +137,7 @@ def render(self, world: HittableList) -> Buffer:
         for j in range(self.image_height):
             row = []
             for i in range(self.image_width):
-                pixel_color = Color(0, 0, 0)
+                pixel_color = black
                 for _ in range(self.samples_per_pixel):
                     r = self.get_ray(i, j)
                     pixel_color += self.ray_color(r, self.max_depth, bvh)

rtow/vec3.py

@@ -121,7 +121,6 @@ def random_on_hemisphere(normal: Vec3):
 
 
 Point3 = Vec3
-Color = Vec3
 
 
 if __name__ == "__main__":