From cb85f91c28be53b4436d4cb4ff3ce4c87f501ba3 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 15 Apr 2010 20:21:14 -0400 Subject: Support transforming pigments and textures in dimension. --- tests/dimension/csg.sh | 9 ++++++--- tests/dimension/demo.sh | 9 ++++++--- tests/dimension/directives.sh | 15 +++++++++------ 3 files changed, 21 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/dimension/csg.sh b/tests/dimension/csg.sh index c27e448..325aaba 100755 --- a/tests/dimension/csg.sh +++ b/tests/dimension/csg.sh @@ -38,7 +38,8 @@ csg_exp="$(echo -n \ (object-modifiers (pigment (vector (integer 1) (integer 0) (integer 0) - (integer 0) (integer 0)))))) + (integer 0) (integer 0)) + pigment-modifiers)))) object-modifiers) (union (array @@ -59,7 +60,8 @@ csg_exp="$(echo -n \ (object-modifiers (pigment (vector (integer 0) (integer 1) (integer 0) - (integer 0) (integer 0))))) + (integer 0) (integer 0)) + pigment-modifiers))) (light_source (vector (integer 15) (integer 0) (integer 0) (integer 0) (integer 0)) (vector (float 0.5) (float 0.5) (float 0.5) (integer 0) (integer 0)) @@ -70,7 +72,8 @@ csg_exp="$(echo -n \ (object-modifiers (pigment (vector (integer 0) (integer 0) (integer 1) - (integer 0) (integer 0)))))) + (integer 0) (integer 0)) + pigment-modifiers)))) (object-modifiers (translate (vector (integer 0) (integer 20) (integer 0) (integer 0) (integer 0))))))' \ diff --git a/tests/dimension/demo.sh b/tests/dimension/demo.sh index 7691093..f047f55 100755 --- a/tests/dimension/demo.sh +++ b/tests/dimension/demo.sh @@ -47,7 +47,8 @@ demo_exp=$(echo -n \ (texture (pigment (vector (integer 0) (integer 0) (integer 1) - (float 0.25) (float 0.5))) + (float 0.25) (float 0.5)) + pigment-modifiers) (finish (reflection (vector (float 0.5) (float 0.5) (float 0.5) @@ -64,7 +65,8 @@ demo_exp=$(echo -n \ (texture (pigment (vector (integer 0) (integer 1) (integer 0) - (integer 0) (integer 0))) + (integer 0) (integer 0)) + pigment-modifiers) (finish (phong (float 0.2)) (phong_size (float 40))))))) @@ -75,7 +77,8 @@ demo_exp=$(echo -n \ (object-modifiers (pigment (vector (integer 1) (integer 1) (integer 1) - (integer 0) (integer 0))))))' \ + (integer 0) (integer 0)) + pigment-modifiers))))' \ | 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 1e487c4..4e77822 100755 --- a/tests/dimension/directives.sh +++ b/tests/dimension/directives.sh @@ -77,20 +77,23 @@ $(echo -n \ (vector (integer 0) (integer 0) (integer 0) (integer 0) (integer 0)) (integer 1) (object-modifiers - (pigment (vector (integer 1) (integer 1) (integer 1) - (integer 0) (integer 0))))) + (pigment + (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0)) + pigment-modifiers))) (sphere (vector (integer 0) (integer 1) (integer 0) (integer 0) (integer 0)) (integer 1) (object-modifiers - (pigment (vector (integer 1) (integer 1) (integer 1) - (integer 0) (integer 0))))) + (pigment + (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0)) + pigment-modifiers))) (box (vector (integer -1) (integer -1) (integer -1) (integer 0) (integer 0)) (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0)) (object-modifiers - (pigment (vector (integer 1) (integer 1) (integer 1) - (integer 0) (integer 0))) + (pigment + (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0)) + pigment-modifiers) (finish (phong (float 0.2))))))' \ | tr '\n' ' ' | sed -r 's/[[:space:]]+/ /g')" -- cgit v1.2.3