Add pigment= and finish= shorthand to Object.__init__().

4 files changed, 98 insertions, 59 deletions

diff --git a/dimension/tests/complex.dmnsn b/dimension/tests/complex.dmnsn
index 261052e..298f74b 100644
--- a/dimension/tests/complex.dmnsn
+++ b/dimension/tests/complex.dmnsn
@@ -58,7 +58,7 @@ def make_sphere(x, y, z, size):
 
     texture = Texture(
       pigment = Color(x/size, y/size, z/size),
-      finish  = Ambient(0.25) + Reflection(0.5)
+      finish  = Reflection(0.5)
     )
   )
 
diff --git a/dimension/tests/demo.dmnsn b/dimension/tests/demo.dmnsn
index 47c0d76..c51e592 100644
--- a/dimension/tests/demo.dmnsn
+++ b/dimension/tests/demo.dmnsn
@@ -63,22 +63,20 @@ arrow = Union(
       open = True
     ),
   ],
-  texture = Texture(
-    pigment = ColorMap(
-      Gradient(Y),
-      {
-        0/6: Red,
-        1/6: Orange,
-        2/6: Yellow,
-        3/6: Green,
-        4/6: Blue,
-        5/6: Magenta,
-        6/6: Red,
-      },
-    )
-    .transform(scale(1, 2.75, 1))
-    .transform(translate(-1.25*Y)),
-  ),
+  pigment = ColorMap(
+    Gradient(Y),
+    {
+      0/6: Red,
+      1/6: Orange,
+      2/6: Yellow,
+      3/6: Green,
+      4/6: Blue,
+      5/6: Magenta,
+      6/6: Red,
+    },
+  )
+  .transform(scale(1, 2.75, 1))
+  .transform(translate(-1.25*Y)),
 )
 arrow.transform(rotate(-45*X))
 
@@ -102,14 +100,12 @@ torii.transform(rotate(-45*X))
 ground = Plane(
   normal = Y, distance = -2,
 
-  texture = Texture(
-    pigment = PigmentMap(
-      Checker(),
-      [
-        White,
-        ColorMap(Checker(), [Black, White]).transform(scale(1/3))
-      ],
-    ),
+  pigment = PigmentMap(
+    Checker(),
+    [
+      White,
+      ColorMap(Checker(), [Black, White]).transform(scale(1/3))
+    ],
   ),
 )
 
diff --git a/libdimension-python/dimension.pyx b/libdimension-python/dimension.pyx
index e1aba28..8c25538 100644
--- a/libdimension-python/dimension.pyx
+++ b/libdimension-python/dimension.pyx
@@ -793,11 +793,19 @@ cdef class Texture:
   property pigment:
     """The texture's pigment."""
     def __get__(self):
-      return _Pigment(self._texture.pigment)
-    def __set__(self, Pigment pigment not None):
+      if self._texture.pigment == NULL:
+        return None
+      else:
+        return _Pigment(self._texture.pigment)
+    def __set__(self, pigment):
       dmnsn_delete_pigment(self._texture.pigment)
-      self._texture.pigment = pigment._pigment
-      DMNSN_INCREF(self._texture.pigment)
+      cdef Pigment real_pigment
+      if pigment is None:
+        self._texture.pigment = NULL
+      else:
+        real_pigment = Pigment(pigment)
+        self._texture.pigment = real_pigment._pigment
+        DMNSN_INCREF(self._texture.pigment)
 
   property finish:
     """The texture's finish."""
@@ -859,27 +867,66 @@ cdef class Object:
   def __cinit__(self):
     self._object = NULL
 
-  def __init__(self, Texture texture = None, Interior interior = None):
+  def __init__(self, Texture texture = None, pigment = None,
+               Finish finish = None, Interior interior = None):
     """
     Initialize an Object.
 
     Keyword arguments:
     texture  -- the object's Texture
+    pigment  -- shorthand for specifying the texture's pigment
+    finish   -- shorthand for specifying the texture's finish
     interior -- the object's Interior
     """
     if self._object == NULL:
       raise TypeError("attempt to initialize base Object")
 
-    if texture is not None:
-      self._object.texture = texture._texture
-      DMNSN_INCREF(self._object.texture)
+    self.texture = texture
+    if pigment is not None:
+      if texture is not None:
+        raise TypeError('both texture and pigment specified.')
+      else:
+        if self.texture is None:
+          self.texture = Texture()
+        self.texture.pigment = pigment
+
+    if finish is not None:
+      if texture is not None:
+        raise TypeError('both texture and finish specified.')
+      else:
+        if self.texture is None:
+          self.texture = Texture()
+        self.texture.finish = finish
+
     if interior is not None:
-      self._object.interior = interior._interior
-      DMNSN_INCREF(self._object.interior)
+      self.interior = interior
 
   def __dealloc__(self):
     dmnsn_delete_object(self._object)
 
+  property texture:
+    """The object's Texture."""
+    def __get__(self):
+      if self._object.texture == NULL:
+        return None
+      else:
+        return _Texture(self._object.texture)
+    def __set__(self, Texture texture):
+      dmnsn_delete_texture(self._object.texture)
+      if texture is None:
+        self._object.texture = NULL
+      else:
+        self._object.texture = texture._texture
+        DMNSN_INCREF(self._object.texture)
+
+  property interior:
+    """The object's Interior."""
+    def __get__(self):
+      return _Interior(self._object.interior)
+    def __set__(self, Interior interior not None):
+      self._object.interior = interior._interior
+      DMNSN_INCREF(self._object.interior)
+
   def transform(self, Matrix trans not None):
     """Transform an object."""
     self._object.trans = dmnsn_matrix_mul(trans._m, self._object.trans)
diff --git a/libdimension-python/tests/demo.py b/libdimension-python/tests/demo.py
index 7cecb07..700fd8b 100755
--- a/libdimension-python/tests/demo.py
+++ b/libdimension-python/tests/demo.py
@@ -82,22 +82,20 @@ arrow = Union(
       open = True
     ),
   ],
-  texture = Texture(
-    pigment = ColorMap(
-      Gradient(Y),
-      {
-        0/6: Red,
-        1/6: Orange,
-        2/6: Yellow,
-        3/6: Green,
-        4/6: Blue,
-        5/6: Magenta,
-        6/6: Red,
-      },
-    )
-    .transform(scale(1, 2.75, 1))
-    .transform(translate(-1.25*Y)),
-  ),
+  pigment = ColorMap(
+    Gradient(Y),
+    {
+      0/6: Red,
+      1/6: Orange,
+      2/6: Yellow,
+      3/6: Green,
+      4/6: Blue,
+      5/6: Magenta,
+      6/6: Red,
+    },
+  )
+  .transform(scale(1, 2.75, 1))
+  .transform(translate(-1.25*Y)),
 )
 arrow.transform(rotate(-45*X))
 
@@ -121,14 +119,12 @@ torii.transform(rotate(-45*X))
 ground = Plane(
   normal = Y, distance = -2,
 
-  texture = Texture(
-    pigment = PigmentMap(
-      Checker(),
-      [
-        White,
-        ColorMap(Checker(), [Black, White]).transform(scale(1/3))
-      ],
-    ),
+  pigment = PigmentMap(
+    Checker(),
+    [
+      White,
+      ColorMap(Checker(), [Black, White]).transform(scale(1/3))
+    ],
   ),
 )