Drezil/htrace
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

picture is correct now

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-10-24 21:20:46 +02:00
parent 1ee771cf98
commit 3ab4789740
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main.hs
View File

@ -81,7 +81,7 @@ main = do
let (w,h) = (width . sceneCamera $ s, height . sceneCamera $ s) let (w,h) = (width . sceneCamera $ s, height . sceneCamera $ s)
imdata = map (render w h s) [0..w*h-1] imdata = map (render w h s) [0..w*h-1]
imvec = fromList imdata imvec = fromList imdata
im = generateImage (\x y -> imvec ! (x*w+y)) w h im = generateImage (\x y -> imvec ! (x*w+(h-y-1))) w h
print s print s
print (w,h) print (w,h)
writePng "out.png" im writePng "out.png" im

6
src/Scene/Renderer.hs
View File

@ -34,11 +34,13 @@ render w h s index = case pcolls of
(Background (V3 br bg bb)) = sceneBackground s (Background (V3 br bg bb)) = sceneBackground s
pcolls = map fromJust $ filter isJust $ (intersect ray) <$> (sceneObjects s) pcolls = map fromJust $ filter isJust $ (intersect ray) <$> (sceneObjects s)
(Collision pos _ coll) = foldl1 min pcolls (Collision pos _ coll) = foldl1 min pcolls
ray = camRay x y (sceneCamera s) --Ray (eye cam) $ rotCam x y w h (center cam ^-^ eye cam) (up cam) (fovy cam) ray = camRay x y (sceneCamera s)
cam = sceneCamera s
y = fromIntegral $ index `mod` w y = fromIntegral $ index `mod` w
x = fromIntegral $ index `div` w x = fromIntegral $ index `div` w
ci = floor . (*255) ci = floor . (*255)
--wrong format:
--Ray (eye cam) $ rotCam x y w h (center cam ^-^ eye cam) (up cam) (fovy cam)
--cam = sceneCamera s
camRay :: Float -> Float -> Camera -> Ray camRay :: Float -> Float -> Camera -> Ray
camRay x y c = Ray (eye c) (lowerLeft c ^+^ x *^ xDir c ^+^ y *^ yDir c ^-^ eye c) camRay x y c = Ray (eye c) (lowerLeft c ^+^ x *^ xDir c ^+^ y *^ yDir c ^-^ eye c)