diff -r ffe83ca074f3 -r 574c34441a1c demos/triangles_monkey.py
--- a/demos/triangles_monkey.py	Sat Dec 08 12:37:45 2007 +0100
+++ b/demos/triangles_monkey.py	Sat Dec 08 14:07:42 2007 +0100
@@ -3,28 +3,13 @@
 import sys
 sys.path.append(open('ModulePath').read().strip())
 
-from raytracer import Raytracer, Light, Sphere, Triangle, Material
+from raytracer import Raytracer, Light, Sphere, Triangle, NormalVertex, Material
+from objreader import LoadWavefrontObjFile
 import Image
 
-def LoadWavefrontObjFile(rt, mat, filename):
-	vertices = []
-	fp = file(filename)
-	while True:
-		ln = fp.readline()
-		if ln == "":
-			break;
-		ln = ln.split()
-		if ln[0] == "v":
-			v = [1.5*float(x) for x in ln[1:4]]
-			vertices.append(tuple(v))
-		if ln[0] == "f":
-			f = [vertices[int(x)-1] for x in ln[1:4]]
-			face = Triangle(NormalVertex(f[0]), NormalVertex(f[1]), NormalVertex(f[2]), mat)
-			rt.addshape(face)
-
 rt = Raytracer()
 mat = Material(colour=(0.9, 0.9, 0.9))
-LoadWavefrontObjFile(rt, mat, "monkey.obj")
+LoadWavefrontObjFile(rt, "monkey.obj", mat, 1.5)
 
 light = Light(position=(-5.0, 2.0, 8.0), colour=(0.9, 0.3, 0.6))
 rt.addlight(light)