nek0/haskelloids
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some cleaning

Browse source
This commit is contained in:
nek0 2016-12-28 16:34:10 +01:00
parent 31aad8018b
commit 95d761babe
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Main.hs
View file

@ -62,9 +62,9 @@ load _ = do
] ]
gegl_node_link_many [ship, rotate, translate] gegl_node_link_many [ship, rotate, translate]
gegl_node_link_many [pover, hover, sover, crop, sink] gegl_node_link_many [pover, hover, sover, crop, sink]
gegl_node_connect_to translate "output" sover "aux" _ <- gegl_node_connect_to translate "output" sover "aux"
gegl_node_connect_to pnop "output" pover "aux" _ <- gegl_node_connect_to pnop "output" pover "aux"
gegl_node_connect_to hnop "output" hover "aux" _ <- gegl_node_connect_to hnop "output" hover "aux"
traceM "nodes complete" traceM "nodes complete"
myMap <- return $ M.fromList myMap <- return $ M.fromList
[ (KeyRoot, root) [ (KeyRoot, root)
@ -82,7 +82,7 @@ load _ = do
py <- liftIO $ randomRIO (0, 600) py <- liftIO $ randomRIO (0, 600)
vx <- liftIO $ randomRIO (-10, 10) vx <- liftIO $ randomRIO (-10, 10)
vy <- liftIO $ randomRIO (-10, 10) vy <- liftIO $ randomRIO (-10, 10)
div <- liftIO $ randomRIO (1, 2) rdiv <- liftIO $ randomRIO (1, 2)
rot <- liftIO $ randomRIO (-2 * pi, 2 * pi) rot <- liftIO $ randomRIO (-2 * pi, 2 * pi)
pitch <- liftIO $ randomRIO (-2 * pi, 2 * pi) pitch <- liftIO $ randomRIO (-2 * pi, 2 * pi)
tempRoot <- liftIO $ gegl_node_new tempRoot <- liftIO $ gegl_node_new
@ -103,14 +103,14 @@ load _ = do
, Property "degrees" $ PropertyDouble rot , Property "degrees" $ PropertyDouble rot
, Property "sampler" $ PropertyInt $ fromEnum GeglSamplerCubic , Property "sampler" $ PropertyInt $ fromEnum GeglSamplerCubic
] ]
liftIO $ gegl_node_link_many [tempText, tempRot, tempTrans] liftIO $ gegl_node_link_many [tempSvg, tempRot, tempTrans]
liftIO $ gegl_node_connect_to tempTrans "output" tempOver "aux" _ <- liftIO $ gegl_node_connect_to tempTrans "output" tempOver "aux"
return Haskelloid return Haskelloid
{ hPos = (px, py) { hPos = (px, py)
, hVel = (vx, vy) , hVel = (vx, vy)
, hRot = rot , hRot = rot
, hPitch = pitch , hPitch = pitch
, hDiv = div , hDiv = rdiv
, hFlange = tempOver , hFlange = tempOver
, hNodeGraph = M.fromList , hNodeGraph = M.fromList
[ ("root", tempRoot) [ ("root", tempRoot)
@ -202,8 +202,6 @@ update sec = do
SDL.KeycodeUp -> SDL.KeycodeUp ->
when (SDL.keyboardEventKeyMotion dat == SDL.Pressed) $ do when (SDL.keyboardEventKeyMotion dat == SDL.Pressed) $ do
ud <- getAffection ud <- getAffection
-- let vx = -10 * (sin (toR $ 2 * (sRot $ ship ud))) + fst (sVel $ ship ud)
-- vy = -10 * (cos (toR $ 2 * (sRot $ ship ud))) + snd (sVel $ ship ud)
let vx = -10 * (sin (toR $ (sRot $ ship ud))) + fst (sVel $ ship ud) let vx = -10 * (sin (toR $ (sRot $ ship ud))) + fst (sVel $ ship ud)
vy = -10 * (cos (toR $ (sRot $ ship ud))) + snd (sVel $ ship ud) vy = -10 * (cos (toR $ (sRot $ ship ud))) + snd (sVel $ ship ud)
putAffection ud putAffection ud
@ -215,7 +213,7 @@ update sec = do
SDL.KeycodeSpace -> SDL.KeycodeSpace ->
when (SDL.keyboardEventKeyMotion dat == SDL.Pressed) $ do when (SDL.keyboardEventKeyMotion dat == SDL.Pressed) $ do
ud <- getAffection ud <- getAffection
ad <- get -- ad <- get
tempRoot <- liftIO $ gegl_node_new tempRoot <- liftIO $ gegl_node_new
tempRect <- liftIO $ gegl_node_new_child tempRoot $ Operation "gegl:rectangle" tempRect <- liftIO $ gegl_node_new_child tempRoot $ Operation "gegl:rectangle"
[ Property "x" $ (PropertyDouble $ (fst $ sPos $ ship ud) + 23) [ Property "x" $ (PropertyDouble $ (fst $ sPos $ ship ud) + 23)
@ -225,7 +223,7 @@ update sec = do
, Property "color" $ PropertyColor $ (GEGL.RGBA 1 1 1 1) , Property "color" $ PropertyColor $ (GEGL.RGBA 1 1 1 1)
] ]
tempOver <- liftIO $ gegl_node_new_child tempRoot $ defaultOverOperation tempOver <- liftIO $ gegl_node_new_child tempRoot $ defaultOverOperation
liftIO $ gegl_node_connect_to tempRect "output" tempOver "aux" _ <- liftIO $ gegl_node_connect_to tempRect "output" tempOver "aux"
ips <- insertParticle (shots ud) $ ips <- insertParticle (shots ud) $
Particle Particle
{ particleTimeToLive = 5 { particleTimeToLive = 5
@ -283,6 +281,7 @@ update sec = do
, haskelloids = nhs , haskelloids = nhs
} }
wrapAround :: (Ord t, Num t) => (t, t) -> t -> (t, t)
wrapAround (nx, ny) width = (nnx, nny) wrapAround (nx, ny) width = (nnx, nny)
where where
nnx = nnx =
@ -315,7 +314,7 @@ draw = do
False False
clean :: UserData -> IO () clean :: UserData -> IO ()
clean ud = return () clean _ = return ()
toR :: Double -> Double toR :: Double -> Double
toR deg = deg * pi / 180 toR deg = deg * pi / 180
@ -334,7 +333,7 @@ shotsUpd sec part@Particle{..} = do
} }
shotsDraw :: GeglBuffer -> GeglNode -> Particle -> Affection UserData () shotsDraw :: GeglBuffer -> GeglNode -> Particle -> Affection UserData ()
shotsDraw buf node Particle{..} = do shotsDraw _ _ _ = do
-- present -- present
-- (GeglRectangle (floor $ fst particlePosition - 2) (floor $ snd particlePosition - 2) 4 4) -- (GeglRectangle (floor $ fst particlePosition - 2) (floor $ snd particlePosition - 2) 4 4)
-- buf -- buf