From b5c1be574e4ad45010013b8819397e10a735c0f2 Mon Sep 17 00:00:00 2001 From: hjp Date: Sun, 17 Feb 2002 21:34:03 +0000 Subject: [PATCH] Added lots of semicolons for povray 3.5 beta compatibility. --- pr/roboter/GNUmakefile | 6 +----- pr/roboter/hand.pov | 40 ++++++++++++++++++++-------------------- pr/roboter/kopf.pov | 16 ++++++++-------- pr/roboter/roboter.pov | 4 ++-- pr/roboter/torso.pov | 20 +++++++++++--------- 5 files changed, 42 insertions(+), 44 deletions(-) diff --git a/pr/roboter/GNUmakefile b/pr/roboter/GNUmakefile index b751c5f..ca9a32b 100644 --- a/pr/roboter/GNUmakefile +++ b/pr/roboter/GNUmakefile @@ -1,9 +1,5 @@ # what's where? -POVHOME=/usr/lib/povray3 -POVBIN=/usr/bin -POVINC=$(POVHOME)/include -POVRAY=$(POVBIN)/x-povray - +include GNUmakevars all: \ test-kopf.ppm \ diff --git a/pr/roboter/hand.pov b/pr/roboter/hand.pov index 2a94499..d2371a8 100644 --- a/pr/roboter/hand.pov +++ b/pr/roboter/hand.pov @@ -88,10 +88,10 @@ } #end -#declare RD0x = 45 // 0 ..90 -#declare RD0y = 180 // 90 .. 180 -#declare RD1 = 30 -#declare RD2 = 30 +#declare RD0x = 45; // 0 ..90 +#declare RD0y = 180; // 90 .. 180 +#declare RD1 = 30; +#declare RD2 = 30; #declare daumen = union { @@ -122,10 +122,10 @@ rotate <0, RD0y, 0> } -#declare RZ0x = 0 // 0 ..90 -#declare RZ0z = 0 // 0 .. 30 -#declare RZ1 = 0 -#declare RZ2 = 0 +#declare RZ0x = 0; // 0 ..90 +#declare RZ0z = 0; // 0 .. 30 +#declare RZ1 = 0; +#declare RZ2 = 0; #declare zeigefinger = union { @@ -156,10 +156,10 @@ rotate <0, 0, -RZ0z> } -#declare RM0x = 0 // 0 ..90 -#declare RM0z = 0 // -15 .. 15 -#declare RM1 = 0 -#declare RM2 = 0 +#declare RM0x = 0; // 0 ..90 +#declare RM0z = 0; // -15 .. 15 +#declare RM1 = 0; +#declare RM2 = 0; #declare mittelfinger = union { @@ -190,10 +190,10 @@ rotate <0, 0, RM0z> } -#declare RR0x = 0 // 0 ..90 -#declare RR0z = 0 // -15 .. 15 -#declare RR1 = 0 -#declare RR2 = 0 +#declare RR0x = 0; // 0 ..90 +#declare RR0z = 0; // -15 .. 15 +#declare RR1 = 0; +#declare RR2 = 0; #declare ringfinger = union { @@ -224,10 +224,10 @@ rotate <0, 0, RR0z> } -#declare RK0x = 0 // 0 ..90 -#declare RK0z = 0 // -15 .. 15 -#declare RK1 = 0 -#declare RK2 = 0 +#declare RK0x = 0; // 0 ..90 +#declare RK0z = 0; // -15 .. 15 +#declare RK1 = 0; +#declare RK2 = 0; #declare kleinerfinger = union { diff --git a/pr/roboter/kopf.pov b/pr/roboter/kopf.pov index ee5050f..5ac527b 100644 --- a/pr/roboter/kopf.pov +++ b/pr/roboter/kopf.pov @@ -8,15 +8,15 @@ #include "metals.inc" #include "glass.inc" -#declare A = 0.2 -#declare B = 0.25 -#declare C = 0.2 -#declare D = 0.15 -#declare E = 0.10 -#declare F = 0.10 -#declare G = 0.01 +#declare A = 0.2; +#declare B = 0.25; +#declare C = 0.2; +#declare D = 0.15; +#declare E = 0.10; +#declare F = 0.10; +#declare G = 0.01; -#declare H = A*1.0 +#declare H = A*1.0; #declare T_glas_schwarz = texture { diff --git a/pr/roboter/roboter.pov b/pr/roboter/roboter.pov index d20da38..11831e1 100644 --- a/pr/roboter/roboter.pov +++ b/pr/roboter/roboter.pov @@ -116,14 +116,14 @@ kopf translate <0, 2.30, 0> } - #declare i = 1.90 + #declare i = 1.90; #while (i <= 2.30) torus { 0.07, 0.03 translate <0, i, 0> texture {T_metall_schwarz} } - #declare i = i + 0.05 + #declare i = i + 0.05; #end object { torso diff --git a/pr/roboter/torso.pov b/pr/roboter/torso.pov index b63832d..1b7bfe1 100644 --- a/pr/roboter/torso.pov +++ b/pr/roboter/torso.pov @@ -4,15 +4,17 @@ #include "metals.inc" #include "glass.inc" -#declare A = 0.2 -#declare B = 0.25 -#declare C = 0.2 -#declare D = 0.15 -#declare E = 0.10 -#declare F = 0.10 -#declare G = 0.01 +/* +#declare A = 0.2; +#declare B = 0.25; +#declare C = 0.2; +#declare D = 0.15; +#declare E = 0.10; +#declare F = 0.10; +#declare G = 0.01; #declare H = A*1.0 +*/ #declare T_glas_schwarz = texture { @@ -62,14 +64,14 @@ union { translate <-15, -30, -15> } - #declare i = -80 + #declare i = -80; #while (i <= -60) torus { 10, 3 translate <0, i, 0> texture {T_metall_schwarz} } - #declare i = i + 5 + #declare i = i + 5; #end intersection {