X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Frasterize;a=blobdiff_plain;f=animate.lua;h=b9fb1be73c995bf31013172f8e2bcceac4e7e4bd;hp=476051ff8fb08accdd01018703df710b99e010f2;hb=09dd89d10e65029f0be313dd463ba1f43cac2fbb;hpb=aca1bceb5ab7dd87e910f0b8c5dba784ab6e8290

diff --git a/animate.lua b/animate.lua
index 476051f..b9fb1be 100755
--- a/animate.lua
+++ b/animate.lua
@@ -11,30 +11,24 @@
 -- installed, the frames will also be combined into a video file.  This script
 -- must be called from the same directory where the rasterize program is.
 
--- Set the width and height of the viewport.
-local size = {w = 640, h = 480}
-
 -- Set the number of frames to be rendered for the animation.
-local frames = 512
+local frames = 360
 
 -- Define the code to calculate where the camera is, in world coordinates.
 local eye = function(frame)
     -- just rotate around the center of the scene on the XZ plane
-    local center    = {x = 0, y = 1, z = 0}
+    local center    = vec_new(0, 1, 0)
     local distance  = 4
     local start     = math.pi
     local t = start + 2 * math.pi * frame / frames
-    local v = {
-        x = math.cos(t),
-        y = 0,
-        z = math.sin(t),
-    }
+    local v = vec_new(math.cos(t), 0, math.sin(t))
     return vec_add(vec_scale(v, distance), center)
 end
 
 -- Define the code to calculate where the focal point of the scene is.
 local look = function(frame)
-    return {x = 2, y = 1, z = 2}    -- keep focused on the buddha
+    -- keep the camera focused on the buddha
+    return vec_new(2, 1, 2)
 end
 
 -- Define the actual objects of the scene that will be rendered, in the
@@ -42,11 +36,11 @@ end
 local scene = [[
 L 0 1000000 0 1 1 1 1 1 1
 L 0 0 1000000 1 1 1 1 1 1
-g triangle.raw
-c 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2 0.1
-t 2 0 -2
-s 1 1 1
+g ak47.obj
+c 0.1 0.1 0.1 0.1 0.1 0.1 0.1 0.1 0.1
+M 0.9 0.9 0.9 128
 g dragon.raw
+M 0.3 0.3 0.3 5
 c 0.7 0.3 0.2 0.8 0.2 0.1 0.9 0.2 0.2
 t -2 -1 -2
 s 2 2 2
@@ -55,15 +49,22 @@ c 0.1 0.2 0.7 0.1 0.3 0.9 0.2 0.1 0.8
 t 2 -1.5 2
 s 10 10 10
 g bunny.raw
+M 0.2 0.2 0.2 1
 c 0.9 0.8 0.9 0.8 0.7 0.9 0.9 0.8 0.7
 t -2 -1 2
 s 10 10 10
-g teapot2.raw
-c 0 1 0 0 1 0 0 1 0
-t 0 -1 0
-s 0.6 0.6 0.6
 ]]
 
+-- Set the number of samples for supersampling.  If this is set to a value of
+-- two or greater, each frame will be rendered larger by the factor specified.
+-- ImageMagick is used to scale the frames back down to size; if ImageMagick
+-- is not installed, the resulting frames will end up bigger than they should
+-- be and the aliasing problem will not be fixed.
+local supersample = 4
+
+-- Set the width and height of the viewport.
+local size = {w = 640, h = 480}
+
 -- Set the number of concurrent renderings (for multi-core machines).
 local jobs = 6
 
@@ -72,18 +73,28 @@ local jobs = 6
 ---------------------------------------------------------------------------
 
 local fmt   = string.format
-local write = function(...) io.write(fmt(...)) end
+local write = function(...) return io.write(fmt(...)) end
+local run   = function(...) return os.execute(fmt(...)) end
+
+function vec_new(x, y, z)
+    return {x = x, y = y, z = z}
+end
 
 function vec_add(a, b)
-    return {x = a.x + b.x, y = a.y + b.y, z = a.z + b.z}
+    return vec_new(a.x + b.x, a.y + b.y, a.z + b.z)
 end
 
 function vec_scale(v, s)
-    return {x = v.x * s, y = v.y * s, z = v.z * s}
+    return vec_new(v.x * s, v.y * s, v.z * s)
 end
 
 function render(i)
     while i do
+        local w, h = size.w, size.h
+        if 1 < supersample then
+            w = w * supersample
+            h = h * supersample
+        end
         local filename  = fmt("frames/anim%04d.bmp", i)
         local command   = fmt("./rasterize -o %s >/dev/null", filename)
         local out = io.popen(command, "w")
@@ -99,9 +110,12 @@ U3
 1.57 %f 0.1 1000
 %s
 X
-]], size.w, size.h, e.x, e.y, e.z, l.x, l.y, l.z, size.w/size.h, scene))
+]], w, h, e.x, e.y, e.z, l.x, l.y, l.z, size.w/size.h, scene))
         i = coroutine.yield()
         out:close()
+        if 1 < supersample then
+            run("convert %s -scale %dx%d %s", filename, size.w, size.h, filename)
+        end
     end
 end
 
@@ -112,14 +126,14 @@ for i = 1,jobs do
     table.insert(threads, coroutine.wrap(render))
 end
 
-os.execute("rm -rf frames && mkdir frames >/dev/null 2>&1")
+run("rm -rf frames && mkdir frames >/dev/null 2>&1")
 for i = 0,(frames-1) do
     threads[1 + (i % jobs)](i)
 end
 for _,thread in ipairs(threads) do thread(null) end
 print()
 
-if os.execute("ffmpeg -i frames/anim%04d.bmp -b 1024k -y -an scene.avi") == 0 then
+if run("ffmpeg -i frames/anim%04d.bmp -b 1024k -y -an scene.avi") == 0 then
     print("Animation written to scene.avi.")
 end