made parallel, added startup-script

This commit is contained in:
Stefan Dresselhaus
2014-10-25 13:49:39 +02:00
parent 90fad1366b
commit 46b2b7fb29
6 changed files with 34 additions and 43 deletions

View File

@ -88,7 +88,7 @@ raytrace r s = case possibleCollisions of
_ -> Just $ foldl1 min possibleCollisions
where
possibleCollisions :: [Collision]
possibleCollisions = map fromJust $ filter isJust $ (intersect r) <$> (sceneObjects s)
possibleCollisions = map fromJust $ filter isJust $ (intersect r) <$> sceneObjects s
camRay :: Float -> Float -> Camera -> Ray
camRay x y c = Ray (eye c) (lowerLeft c + x *^ xDir c + y *^ yDir c - eye c)