From 4d3e396ce91dd70b0c9d7f3b1e991fd8ebd0d582 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 4 Dec 2011 19:07:57 -0500 Subject: Rename complex test to cube test. --- dimension/tests/Makefile.am | 4 +-- dimension/tests/complex.dmnsn | 69 ------------------------------------------- dimension/tests/cube.dmnsn | 69 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 dimension/tests/complex.dmnsn create mode 100644 dimension/tests/cube.dmnsn diff --git a/dimension/tests/Makefile.am b/dimension/tests/Makefile.am index fe224fa..684b2aa 100644 --- a/dimension/tests/Makefile.am +++ b/dimension/tests/Makefile.am @@ -18,10 +18,10 @@ ########################################################################### TESTS = demo.dmnsn \ - complex.dmnsn + cube.dmnsn TEST_EXTENSIONS = .dmnsn DMNSN_LOG_COMPILER = $(top_srcdir)/dimension/dimension -AM_DMNSN_LOG_FLAGS = --strict +AM_DMNSN_LOG_FLAGS = --strict -v TESTS_ENVIRONMENT = PYTHONPATH=$(abs_top_builddir) EXTRA_DIST = $(TESTS) diff --git a/dimension/tests/complex.dmnsn b/dimension/tests/complex.dmnsn deleted file mode 100644 index a5a3ec2..0000000 --- a/dimension/tests/complex.dmnsn +++ /dev/null @@ -1,69 +0,0 @@ -######################################################################### -# Copyright (C) 2010-2011 Tavian Barnes # -# # -# This file is part of The Dimension Test Suite. # -# # -# The Dimension Test Suite is free software; you can redistribute it # -# and/or modify it under the terms of the GNU General Public License as # -# published by the Free Software Foundation; either version 3 of the # -# License, or (at your option) any later version. # -# # -# The Dimension Test Suite is distributed in the hope that it will be # -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty # -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # -# General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -######################################################################### - -camera = PerspectiveCamera(location = (3, 6, -11), - look_at = 0) - -background = 0.5*sRGB(0.73, 0.90, 0.97) - -def make_light(x, y, z): - return PointLight(location = (x, y, z), color = White/4) - -for x in [-3, -1, 1, 3]: - for y in [0, 5]: - lights.append(make_light(x, y, -5)) - -objects.append( - Plane( - normal = Y, distance = -4, - - texture = Texture( - pigment = sRGB(0.73, 0.90, 0.97), - finish = Ambient(sRGB(0.5)), - ) - ) -) - -def make_sphere(x, y, z, size): - size -= 1 - - dx = sin(2*pi*x/size) - dy = sin(2*pi*y/size) - dz = sin(2*pi*z/size) - return Sphere( - center = 5*Vector(x, y, z)/size - + Vector(dy + dz, dx + dz, dx + dy)/4 - - Vector(2.5, 2.5, 2.5), - radius = 2/size, - - texture = Texture( - pigment = sRGB(x/size, y/size, z/size), - finish = Ambient(sRGB(0.25)) - + Diffuse(sRGB(0.8)) - + Reflection(0, sRGB(0.5)) - ) - ) - -size = 10 -for x in range(size): - for y in range(size): - for z in range(size): - objects.append(make_sphere(x, y, z, size)) - -recursion_limit = 2*size diff --git a/dimension/tests/cube.dmnsn b/dimension/tests/cube.dmnsn new file mode 100644 index 0000000..22c926d --- /dev/null +++ b/dimension/tests/cube.dmnsn @@ -0,0 +1,69 @@ +######################################################################### +# Copyright (C) 2010-2011 Tavian Barnes # +# # +# This file is part of The Dimension Test Suite. # +# # +# The Dimension Test Suite is free software; you can redistribute it # +# and/or modify it under the terms of the GNU General Public License as # +# published by the Free Software Foundation; either version 3 of the # +# License, or (at your option) any later version. # +# # +# The Dimension Test Suite is distributed in the hope that it will be # +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty # +# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # +# General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +######################################################################### + +camera = PerspectiveCamera(location = (3, 6, -11), + look_at = 0) + +background = 0.5*sRGB(0.73, 0.90, 0.97) + +def make_light(x, y, z): + return PointLight(location = (x, y, z), color = White/4) + +for x in [-3, -1, 1, 3]: + for y in [0, 5]: + lights.append(make_light(x, y, -5)) + +objects.append( + Plane( + normal = Y, distance = -4, + + texture = Texture( + pigment = sRGB(0.73, 0.90, 0.97), + finish = Ambient(sRGB(0.5)), + ) + ) +) + +def make_sphere(x, y, z, size): + size -= 1 + + dx = sin(2*pi*x/size) + dy = sin(2*pi*y/size) + dz = sin(2*pi*z/size) + return Sphere( + center = 5*Vector(x, y, z)/size + + Vector(dy + dz, dx + dz, dx + dy)/4 + - Vector(2.5, 2.5, 2.5), + radius = 2/size, + + texture = Texture( + pigment = sRGB(x/size, y/size, z/size), + finish = Ambient(sRGB(0.25)) + + Diffuse(sRGB(0.8)) + + Reflection(0, 0.25) + ) + ) + +size = 10 +for x in range(size): + for y in range(size): + for z in range(size): + objects.append(make_sphere(x, y, z, size)) + +recursion_limit = 2*size -- cgit v1.2.3