Thread: [cgkit-commits] SF.net SVN: cgkit: [227] cgkit/trunk/unittests/ritest.py
Brought to you by:
mbaas
From: <mb...@us...> - 2008-02-11 21:06:03
|
Revision: 227 http://cgkit.svn.sourceforge.net/cgkit/?rev=227&view=rev Author: mbaas Date: 2008-02-11 13:06:00 -0800 (Mon, 11 Feb 2008) Log Message: ----------- Made numpy optional Modified Paths: -------------- cgkit/trunk/unittests/ritest.py Modified: cgkit/trunk/unittests/ritest.py =================================================================== --- cgkit/trunk/unittests/ritest.py 2008-02-10 21:00:18 UTC (rev 226) +++ cgkit/trunk/unittests/ritest.py 2008-02-11 21:06:00 UTC (rev 227) @@ -1,10 +1,16 @@ # Test the Ri interface +import sys from cgkit import ri from cgkit import cri from cgkit.cgtypes import * import ctypes -import numpy +try: + import numpy + has_numpy = True +except ImportError: + print >>sys.stderr, "Warning: numpy module not found. Skipping numpy test in ritest.py." + has_numpy = False def normalizeRIB(inFile, outFile): """Helper function to normalize a RIB file. @@ -67,7 +73,11 @@ ri.RiTranslate(1,0,0) ri.RiParaboloid(0.5,0.2,0.7, 360, "varying color Cs", [(1,0,0),(0,1,0),(0,0,1),(1,1,0)]) ri.RiTranslate(1,0,0) - ri.RiDisk(0,0.5,360, "varying color Cs", numpy.array([(1,0,0),(0,1,0),(0,0,1),(1,1,0)], dtype=numpy.float32)) + if has_numpy: + Cs = numpy.array([(1,0,0),(0,1,0),(0,0,1),(1,1,0)], dtype=numpy.float32) + else: + Cs = [(1,0,0),(0,1,0),(0,0,1),(1,1,0)] + ri.RiDisk(0,0.5,360, "varying color Cs", Cs) ri.RiTranslate(1,0,0) ri.RiTorus(0.45,0.05,0,360,360, "varying color Cs", [(1,0,0),(0,1,0),(0,0,1),(1,1,0)]) ri.RiTransformEnd() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mb...@us...> - 2008-02-17 10:57:21
|
Revision: 229 http://cgkit.svn.sourceforge.net/cgkit/?rev=229&view=rev Author: mbaas Date: 2008-02-17 02:57:17 -0800 (Sun, 17 Feb 2008) Log Message: ----------- Cleanup Modified Paths: -------------- cgkit/trunk/unittests/ritest.py Modified: cgkit/trunk/unittests/ritest.py =================================================================== --- cgkit/trunk/unittests/ritest.py 2008-02-17 10:56:48 UTC (rev 228) +++ cgkit/trunk/unittests/ritest.py 2008-02-17 10:57:17 UTC (rev 229) @@ -170,9 +170,6 @@ archiveName: Name of the test archive file """ ri.RiBegin(name) - # for Aqsis... -# ri.RiDeclare("Ka", "float") -# ri.RiDeclare("Kd", "float") ri.RiArchiveRecord(ri.RI_COMMENT, "Test RIB file %d", 1) ri.RiArchiveRecord(ri.RI_STRUCTURE, "Creator $CREATOR") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mb...@us...> - 2008-02-24 15:17:38
|
Revision: 241 http://cgkit.svn.sourceforge.net/cgkit/?rev=241&view=rev Author: mbaas Date: 2008-02-24 07:17:29 -0800 (Sun, 24 Feb 2008) Log Message: ----------- Removed an unused import Modified Paths: -------------- cgkit/trunk/unittests/ritest.py Modified: cgkit/trunk/unittests/ritest.py =================================================================== --- cgkit/trunk/unittests/ritest.py 2008-02-24 11:35:38 UTC (rev 240) +++ cgkit/trunk/unittests/ritest.py 2008-02-24 15:17:29 UTC (rev 241) @@ -4,7 +4,7 @@ from cgkit import ri from cgkit import cri from cgkit.cgtypes import * -import ctypes + try: import numpy has_numpy = True This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |