Cleanup

2022-06-08 22:34:29 +01:00
parent 970858e129
commit 4e4759fb1c
17 changed files with 77 additions and 112 deletions
@@ -36,16 +36,16 @@ moveLSThen :: (World -> (Point2,Float))
 moveLSThen posf off sh = propLSThen propupdate lsupdate thels theprop
  where
    propupdate pr w = w 
-        & props . ix (_pjID pr) . pjPos .~ fst (posf w)
+        & props . ix (_pjID pr) . prPos .~ fst (posf w)
        & props . ix (_pjID pr) . pjRot .~ snd (posf w)
    lsupdate _ w = lsParam . lsPos .~ addZ 0 (fst (posf w)) +.+.+ rotate3z (snd (posf w)) off
    thels = defaultLS
    theprop = ShapeProp
-        { _pjPos = 0
+        { _prPos = 0
        , _pjID = 0
        , _pjRot = 0
        , _pjUpdate = const id
-        , _prDraw = \pr -> noPic $ uncurryV translateSHf (_pjPos pr) $ rotateSH (_pjRot pr) sh
+        , _prDraw = \pr -> noPic $ uncurryV translateSHf (_prPos pr) $ rotateSH (_pjRot pr) sh
        , _prToggle = True
        }