Interface tweak to PointPrimitive ring buffer.

2 files changed, 3 insertions, 4 deletions

diff --git a/MeshSketch.hs b/MeshSketch.hs
index cca9524..2b29f0a 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -573,8 +573,7 @@ pushRing w st h k = do
     plane <- readIORef (stPlane st)
     d <- worldCoordinates st h k plane
     Just win <- getWidgetWindow w
-    pushBack (stRingBuffer st) $ do
-        RingPoint{..} <- return $ rKeys (stRingBuffer st)
+    pushBack (stRingBuffer st) $ \RingPoint{..} -> do
         rpPosition @<- d
     windowInvalidateRect win Nothing False
     return d
diff --git a/PointPrimitiveRing.hs b/PointPrimitiveRing.hs
index 47819e3..3647d4a 100644
--- a/PointPrimitiveRing.hs
+++ b/PointPrimitiveRing.hs
@@ -84,11 +84,11 @@ updateRingCommands r = do
     readIORef (objCommands $ rObject r) >>= mapM_ print
     return ()
 
-pushBack :: Ring keys -> Writer [DSum AttributeKey GLUniformValue] a -> IO ()
+pushBack :: Ring keys -> (keys -> Writer [DSum AttributeKey GLUniformValue] a) -> IO ()
 pushBack r attrs = do
     back <- readIORef $ rBack r
     writeIORef (rBack r) (mod (back + 1) (ringCapacity r))
-    updateAttributes back attrs
+    updateAttributes back $ attrs (rKeys r)
     sz <- readIORef (rSize r)
     when (sz < ringCapacity r) $ writeIORef (rSize r) (sz + 1)
     updateRingCommands r