rgleichman/glance
1
1
Fork 0
mirror of https://github.com/rgleichman/glance.git synced 2024-08-16 18:30:36 +03:00
Code Issues Projects Releases Wiki Activity

Use a variable for the set of rotation angles.

Browse Source
This commit is contained in:
Robbie Gleichman 2017-07-18 19:11:57 -07:00
parent 4ab6c09cf4
commit b6171533c5
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Rendering.hs
View File

@ -241,21 +241,24 @@ bestAngleForIcon :: (SpecialNum n, ING.Graph gr) =>
-> Bool
-> (Angle n, n)
bestAngleForIcon positionMap graph key@(NodeName nodeId, _) reflected =
minimumBy (compare `on` snd) $ (\angle -> (angle, scoreAngle iconPosition edges reflected angle)) <$> fmap (@@ turn) [0,(1/24)..1] where
iconPosition = positionMap Map.! key
edges = getPositionAndAngles <$> fmap getSucEdge (ING.lsuc graph nodeId) <> fmap getPreEdge (ING.lpre graph nodeId)
getPositionAndAngles (node, nameAndPort) = (positionMap Map.! nodeLabel, portAngles) where
nodeLabel = fromMaybeError "getPositionAndAngles: node not found" $ ING.lab graph node
portAngles = findPortAngles key nameAndPort
minimumBy (compare `on` snd) $ (\angle -> (angle, scoreAngle iconPosition edges reflected angle)) <$> fmap (@@ turn) possibleAngles
where
possibleAngles = [0,(1/24)..1]
-- possibleAngles = [0, 1/2] -- (uncomment this line and comment out the line above to disable rotation)
iconPosition = positionMap Map.! key
edges = getPositionAndAngles <$> fmap getSucEdge (ING.lsuc graph nodeId) <> fmap getPreEdge (ING.lpre graph nodeId)
getPositionAndAngles (node, nameAndPort) = (positionMap Map.! nodeLabel, portAngles) where
nodeLabel = fromMaybeError "getPositionAndAngles: node not found" $ ING.lab graph node
portAngles = findPortAngles key nameAndPort
-- Edge points from id to otherNode
getSucEdge (otherNode, edge) = (otherNode, nameAndPort) where
(nameAndPort, _) = edgeConnection edge
getSucEdge (otherNode, edge) = (otherNode, nameAndPort) where
(nameAndPort, _) = edgeConnection edge
-- Edge points from otherNode to id
getPreEdge (otherNode, edge) = (otherNode, nameAndPort) where
(_, nameAndPort) = edgeConnection edge
getPreEdge (otherNode, edge) = (otherNode, nameAndPort) where
(_, nameAndPort) = edgeConnection edge
findIconRotation :: (SpecialNum n, ING.Graph gr) =>
Map.Map (NodeName, Icon) (Point V2 n)

2
app/Translate.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE NoMonomorphismRestriction, FlexibleContexts, TypeFamilies, TupleSections #-}
{-# LANGUAGE NoMonomorphismRestriction, TupleSections #-}
module Translate(
translateStringToSyntaxGraph,
translateStringToCollapsedGraphAndDecl,