From 8424804b1feaff5121060ed5ae4a321c47a76c34 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 21 Dec 2009 04:25:30 -0500 Subject: Differentiate between colors and vectors in the AST. --- tests/dimension/demo.sh | 12 ++++++------ tests/dimension/directives.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/dimension') diff --git a/tests/dimension/demo.sh b/tests/dimension/demo.sh index 8a210d4..c49e0ca 100755 --- a/tests/dimension/demo.sh +++ b/tests/dimension/demo.sh @@ -31,10 +31,10 @@ demo_exp=$(echo -n \ (rotate (vector (integer 0) (integer 53) (integer 0) (integer 0) (integer 0)))) (background - (vector (integer 0) (float 0.1) (float 0.2) (float 0.1) (integer 0))) + (color (integer 0) (float 0.1) (float 0.2) (float 0.1) (integer 0))) (light_source (vector (integer -15) (integer 20) (integer 10) (integer 0) (integer 0)) - (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0))) + (color (integer 1) (integer 1) (integer 1) (integer 0) (integer 0))) (box (vector (integer -1) (integer -1) (integer -1) (integer 0) (integer 0)) (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0)) @@ -42,15 +42,15 @@ demo_exp=$(echo -n \ (rotate (vector (integer 45) (integer 0) (integer 0) (integer 0) (integer 0))) (texture - (pigment (vector (integer 0) (integer 0) (integer 1) - (float 0.25) (float 0.25)))))) + (pigment (color (integer 0) (integer 0) (integer 1) + (float 0.25) (float 0.25)))))) (sphere (vector (integer 0) (integer 0) (integer 0) (integer 0) (integer 0)) (float 1.25) (object-modifiers (texture - (pigment (vector (integer 0) (integer 1) (integer 0) - (integer 0) (integer 0)))))))' \ + (pigment (color (integer 0) (integer 1) (integer 0) + (integer 0) (integer 0)))))))' \ | tr '\n' ' ' | sed -r 's/[[:space:]]+/ /g') if [ "$demo" != "$demo_exp" ]; then diff --git a/tests/dimension/directives.sh b/tests/dimension/directives.sh index c64cbd8..49095a9 100755 --- a/tests/dimension/directives.sh +++ b/tests/dimension/directives.sh @@ -39,8 +39,8 @@ $(echo -n \ (integer 1) (object-modifiers (texture - (pigment (vector (integer 1) (integer 0) (integer 1) - (integer 0) (integer 0)))))))' \ + (pigment (color (integer 1) (integer 0) (integer 1) + (integer 0) (integer 0)))))))' \ | tr '\n' ' ' | sed -r 's/[[:space:]]+/ /g')" if [ "$directives" != "$directives_exp" ]; then -- cgit v1.2.3