From dc1f563a4b906a23526e8afa589f40c1408dbc46 Mon Sep 17 00:00:00 2001 From: daniel watson Date: Thu, 5 May 2016 14:31:48 -0700 Subject: [PATCH] add square(3) --- curriculum/makefile | 10 +++++++++- curriculum/square.scm | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/curriculum/makefile b/curriculum/makefile index 3fc8796..9446519 100644 --- a/curriculum/makefile +++ b/curriculum/makefile @@ -22,7 +22,15 @@ square2.png: square2.scad makefile --imgsize=931,634 \ square2.scad -square.html: square.scm square.png square1.png square2.png makefile +square3.png: square3.scad makefile + @openscad \ + --render \ + -o square3.png \ + --camera=1.27,1.57,0.01,0,0,0,9.05 \ + --imgsize=931,634 \ + square3.scad + +square.html: square.scm square.png square1.png square2.png square3.png makefile @skribilo square.scm > square.html clean: diff --git a/curriculum/square.scm b/curriculum/square.scm index d01fbeb..d7d8852 100644 --- a/curriculum/square.scm +++ b/curriculum/square.scm @@ -32,4 +32,13 @@ (p [here's the output of ,(source :language c [square(2)\;])]) (figure :legend "square(2);" - (image :file "square2.png" :height 500)))) + (image :file "square2.png" :height 500)) + (p [note that it is twice the size of the prior 2 examples.])) + (chapter + :title [square(3)\;] + :number #f + (p [here's the output of ,(source :language c [square(3)\;])]) + (p [how big do you expect this square to be?]) + (figure + :legend "square(3);" + (image :file "square3.png" :height 500)))) -- 2.30.2