From 43b3694d7ac61d53f0ad94b9796ce6a5525c8572 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Tue, 28 Sep 2010 06:36:17 -0300
Subject: [PATCH] Corrected aspect ratio, added lateral views, and improved
 Makefile.

- sfy/Makefile (sben): make a small image, for quick previews
- sfy/Makefile (ben): changed size from 1280x900 to 1600x800
- sfy/Makefile (upload): convert ben.png to ben.jpg and upload to
  http://downloads.qi-hardware.com/people/werner/ben-scans/ben-bottom.jpg
- sfy/ben.pov: adjusted camera position and aspect ratio
- sfy/ben.pov: added lateral views
---
 sfy/Makefile |  14 ++++--
 sfy/ben.pov  | 135 +++++++++++++++++++++++++++++----------------------
 2 files changed, 86 insertions(+), 63 deletions(-)

diff --git a/sfy/Makefile b/sfy/Makefile
index f838796..aae593c 100644
--- a/sfy/Makefile
+++ b/sfy/Makefile
@@ -7,7 +7,7 @@ FACE_B=$(DIR)/ben-$(NAME)-$(BOTTOM)-100um.txt.bz2
 
 .SUFFIXES:	.sfy .inc
 
-.PHONY:		new run pov ben clean
+.PHONY:		new run pov sben ben clean
 
 new:
 		./solidify $(NAME).sfy $(FACE_A) $(FACE_B) $(D)
@@ -21,10 +21,16 @@ run:		$(NAME).sfy
 pov:		$(NAME).pov $(NAME).inc
 		povray +A -P -W1280 -H900 $(NAME).pov
 
-ben:		ben.pov $(PARTS:%=%.inc)
-		povray +A +P -W1280 -H900 ben.pov
-#		povray +A +P -W640 -H480 ben.pov
+sben:		ben.pov $(PARTS:%=%.inc)
+		povray -A +P -W640 -H320 ben.pov
 		
+ben ben.png:	ben.pov $(PARTS:%=%.inc)
+		povray +A +P -W1600 -H800 ben.pov
+		
+upload:		ben
+		convert ben.png ben.jpg
+		qippl ben.jpg ben-scans
+
 $(NAME).pov:	template.pov
 		sed 's/NAME/$(NAME)/' template.pov >$@ || { rm -f $@; exit 1; }
 
diff --git a/sfy/ben.pov b/sfy/ben.pov
index 7eba611..20a37b8 100644
--- a/sfy/ben.pov
+++ b/sfy/ben.pov
@@ -19,10 +19,11 @@
  */
 
 camera {
-    location <30, -150, 90>
+    location <30, -920, 300>
     look_at <0, 20, 20>
     sky z
-    right -4/3*x
+    right -2/1*x
+    angle 18
 }
 
 background { color White }
@@ -33,7 +34,7 @@ light_source {
 }
 
 light_source {
-    <100, -500, 50>
+    <0, -100, 30>
     color White
 }
 
@@ -53,64 +54,80 @@ light_source {
     ambient 0.5
 }
 
+#declare All = union {
+	object {
+	    Part_dispshell
+	    pigment { rgb <0.8, 0.8, 0.8> }
+	    finish { Finish }
+	    rotate <0, 0, 180>
+	    translate <0, 0, 80>
+	}
+
+	object {
+	    Part_dispbase
+	    pigment { rgb <0.25, 0, 0.75> }
+	    finish { Finish }
+	    rotate <0, 0, 180>
+	    translate <0, 0, 70>
+	}
+
+	/* lcdpcb 60 <0.5, 0. 0.5> */
+	/* lcd 50 <1, 0, 0> */
+
+	object {
+	    Part_lcdframe
+	    pigment { rgb <0.75, 0, 0.25> }
+	    finish { Finish }
+	    rotate <180, 0, 0>
+	    translate <0, 0, 40>
+	}
+
+	/* screen 30 <1, 0, 0> */
+
+	object {
+	    Part_baseframe
+	    pigment { rgb <0.5, 0.5, 0> }
+	    finish { Finish }
+	    translate <0, 0, 20>
+	}
+
+	object {
+	    Part_kbd
+	    pigment { rgb <0, 1, 0> }
+	    finish { Finish }
+	    translate <0, 0, 10>
+	}
+
+	/* pcb 0 <0, 0.75, 0.25> */
+
+	object {
+	    Part_bottom
+	    pigment { rgb <0, 0.5, 0.5> }
+	    finish { Finish }
+	    translate <0, 0, -10>
+	}
+
+	/* battery -20 <0, 0.25, 0.75> */
+
+	object {
+	    Part_batcvr
+	    pigment { rgb <0, 0, 1> }
+	    finish { Finish }
+	    rotate <0, 180, 0>
+	    translate <0, 0, -30>
+	}
+}
+
+object { All }
+
 object {
-    Part_dispshell
-    pigment { rgb <0.8, 0.8, 0.8> }
-    finish { Finish }
-    rotate <0, 0, 180>
-    translate <0, 0, 80>
+    All
+    rotate <0, 0, 90>
+    translate <-110, 50, 0>
 }
 
 object {
-    Part_dispbase
-    pigment { rgb <0.25, 0, 0.75> }
-    finish { Finish }
-    rotate <0, 0, 180>
-    translate <0, 0, 70>
-}
-
-/* lcdpcb 60 <0.5, 0. 0.5> */
-/* lcd 50 <1, 0, 0> */
-
-object {
-    Part_lcdframe
-    pigment { rgb <0.75, 0, 0.25> }
-    finish { Finish }
-    rotate <180, 0, 0>
-    translate <0, 0, 40>
-}
-
-/* screen 30 <1, 0, 0> */
-
-object {
-    Part_baseframe
-    pigment { rgb <0.5, 0.5, 0> }
-    finish { Finish }
-    translate <0, 0, 20>
-}
-
-object {
-    Part_kbd
-    pigment { rgb <0, 1, 0> }
-    finish { Finish }
-    translate <0, 0, 10>
-}
-
-/* pcb 0 <0, 0.75, 0.25> */
-
-object {
-    Part_bottom
-    pigment { rgb <0, 0.5, 0.5> }
-    finish { Finish }
-    translate <0, 0, -10>
-}
-
-/* battery -20 <0, 0.25, 0.75> */
-
-object {
-    Part_batcvr
-    pigment { rgb <0, 0, 1> }
-    finish { Finish }
-    rotate <0, 180, 0>
-    translate <0, 0, -30>
+    All
+    rotate <0, 0, -90>
+    translate <110, 50, 0>
 }