X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=raymarch.lua;fp=raymarch.lua;h=f1dbc3cad42f2c6cf9f64e1f8f85fd812f7f6dc2;hb=1a83c3fa829a87138827cd937a50f1ef210f7e0b;hp=d296c2379787ac48a0caebca22fc875b631b92b4;hpb=e9357ba46155930cc1dd92fd095fdf2c3b83b2d5;p=raymarcher.git

diff --git a/raymarch.lua b/raymarch.lua
index d296c23..f1dbc3c 100644
--- a/raymarch.lua
+++ b/raymarch.lua
@@ -4,6 +4,9 @@ local V = Vector
 require "Primitives"
 local P = Primitives
 
+require "Operations"
+local O = Operations
+
 require "Textures"
 local T = Textures
 
@@ -68,9 +71,17 @@ local function render(scene, width, height, filename)
    print("done")
 end
 
+
+
 local scene = {
-   sdf = P.make_sphere(V.new{0,0,0}, 1,
-                       T.make_phong({V.new{2,0,2}}, {0,1,0}, 1.0, 0.5, 100)),
+   sdf = O.union(P.make_sphere(V.new{0,0,0}, 1,
+                       -- T.make_count_texture()),
+                               T.make_phong({V.new{2,-1,2}}, {0,1,0},
+                                  1.0, 0.5, 100)),
+                 P.make_sphere(V.new{1.5,0,1.0}, 0.5,
+                               T.make_phong({V.new{2,-1,2}}, {0,0,1},
+                                  1.0, 0.5, 100))),
+                               
    camera = {location = V.new{0,-5,0},
              point_at = V.new{0,0,0},
              right = V.new{1,0,0},