Textures now take "mapped" pigments as arguments.

[raymarcher.git] / Primitives.lua

diff --git a/Primitives.lua b/Primitives.lua
index 88a3849..c13966b 100644 (file)
--- a/Primitives.lua
+++ b/Primitives.lua
@@ -3,14 +3,32 @@ require "Vector"
 local V = Vector
 
 local function make_sphere(centre, radius, texture)
-      return function(p)
-         return {dist = V.norm(p-centre) - radius,
-                 texture = texture}
-      end
+   local norm = V.norm
+   return function(p)
+      return {dist = V.norm(p-centre) - radius,
+              texture = texture}
+   end
 end
 
+local function make_plane(centre, normal, texture)
+   return function(p)
+      return {dist = normal*(p-centre),
+              texture = texture}
+   end
+end
+
+local function make_pipe(centre, radius, axis, texture)
+   return function(p)
+      return {dist = V.norm(V.cross(p-centre, axis)) - radius,
+              texture = texture}
+   end
+end
+
+
 Primitives = {
-   make_sphere = make_sphere
+   make_sphere = make_sphere,
+   make_plane = make_plane,
+   make_pipe = make_pipe
 }
 
 return Primitives