equal
deleted
inserted
replaced
17 if ln[0] == "v": |
17 if ln[0] == "v": |
18 v = [1.5*float(x) for x in ln[1:4]] |
18 v = [1.5*float(x) for x in ln[1:4]] |
19 vertices.append(tuple(v)) |
19 vertices.append(tuple(v)) |
20 if ln[0] == "f": |
20 if ln[0] == "f": |
21 f = [vertices[int(x)-1] for x in ln[1:4]] |
21 f = [vertices[int(x)-1] for x in ln[1:4]] |
22 face = Triangle(f[0], f[1], f[2], mat) |
22 face = Triangle(NormalVertex(f[0]), NormalVertex(f[1]), NormalVertex(f[2]), mat) |
23 rt.addshape(face) |
23 rt.addshape(face) |
24 |
24 |
25 rt = Raytracer() |
25 rt = Raytracer() |
26 mat = Material(colour=(0.9, 0.9, 0.9)) |
26 mat = Material(colour=(0.9, 0.9, 0.9)) |
27 LoadWavefrontObjFile(rt, mat, "monkey.obj") |
27 LoadWavefrontObjFile(rt, mat, "monkey.obj") |