Use per-primitive index head rather than per-component in PointPrimitiveRing.

2 files changed, 14 insertions, 21 deletions

diff --git a/MaskableStream.hs b/MaskableStream.hs
index 5ef5b28..5274d28 100644
--- a/MaskableStream.hs
+++ b/MaskableStream.hs
@@ -265,12 +265,11 @@ updateAttributes i writer = forM_ (execWriter writer) $ \case
                 putStrLn $ "vector sz = " ++ show sz
                 glBufferSubData GL_ARRAY_BUFFER (base + fromIntegral i * sz') sz' ptr
 
-            Just (MarshalGLMatrix with) -> with $ \sz isrowcol ptr -> do
-                if isrowcol then
-                    hPutStrLn stderr $ "WARNING: (TODO) row-major matrix attribute update unimplemented."
-                else do
+            Just (MarshalGLMatrix with) -> with $ \sz isrowcol ptr -> case isrowcol of
+                0 -> do
                     let sz' = fromIntegral $ attribSize * (fromIntegral sz)
                     glBufferSubData GL_ARRAY_BUFFER (base + fromIntegral i * sz') sz' ptr
+                _ -> hPutStrLn stderr $ "WARNING: (TODO) row-major matrix attribute update unimplemented."
 
             Nothing -> hPutStrLn stderr $ "Warning: dimension mismatch updating " ++ show (unwitnessType typ) ++ " attribute."
         glBindBuffer GL_ARRAY_BUFFER 0
diff --git a/PointPrimitiveRing.hs b/PointPrimitiveRing.hs
index ee5a126..4c4b516 100644
--- a/PointPrimitiveRing.hs
+++ b/PointPrimitiveRing.hs
@@ -33,7 +33,7 @@ data Ring = Ring
     , rStorage      :: GLStorage
     , rObject       :: Object
     , rSize         :: IORef CPtrdiff -- Current count of Floats in the ring buffer.
-    , rStart        :: IORef CPtrdiff -- Float-index where next vector will be added. TODO: rename this.
+    , rBack         :: IORef Int      -- Where next vector will be added.
     , ringCapacity  :: CPtrdiff       -- Maximum number of floats in buffer.
     , rPosition     :: AttributeKey (GLVector 3 Float)
     }
@@ -53,7 +53,7 @@ newRing storage sz = do
             , rStorage      = storage
             , rObject       = obj
             , rSize         = sizeRef
-            , rStart        = startRef
+            , rBack         = startRef
             , ringCapacity  = 3 * fromIntegral sz
             , rPosition     = k
             }
@@ -62,30 +62,24 @@ newRing storage sz = do
 
 updateRingCommands :: Ring -> IO ()
 updateRingCommands r = do
-    start <- fmap (fromIntegral . (`div` 3)) $ readIORef $ rStart r
+    back <- fromIntegral <$> readIORef (rBack r)
     size  <- fmap (fromIntegral . (`div` 3)) $ readIORef $ rSize r
     let mask 0   = []
-        mask cnt = case cnt + start - size of
-            st | st > cnt  -> [(st - cnt,size)]
-               | otherwise -> [(0,start), (st,cnt - st)]
+        mask cnt = case cnt + back - size of
+            front | front > cnt -> [(front - cnt,size)]
+                  | otherwise   -> [(0,back), (front,cnt - front)]
     updateCommands (rStorage r) (rObject r) mask
     readIORef (objCommands $ rObject r) >>= mapM_ print
     return ()
 
 pushBack :: Ring -> Float -> Float -> Float -> IO ()
-pushBack r x y z = allocaArray 3 $ \ptr -> do
-    pokeElemOff ptr 0 x
-    pokeElemOff ptr 1 y
-    pokeElemOff ptr 2 z
-    start <- readIORef $ rStart r
-    writeIORef (rStart r) (mod (start + 3) (ringCapacity r))
-    -- incrementalUpdateBuffer (rBufferObject r) (4*start) (4*3) ptr
-    updateAttributes (fromIntegral (start `div` 3)) $ do
+pushBack r x y z = do
+    back <- readIORef $ rBack r
+    writeIORef (rBack r) (mod (back + 1) (fromIntegral $ ringCapacity r `div` 3))
+    updateAttributes back $ do
         rPosition r @<- V3 x y z -- (fromList [x,y,z] :: Vector Float)
-    -- glFlush
-    -- glFinish
     sz <- readIORef (rSize r)
-    putStrLn $ "pushBack "++show (sz,start,(x,y,z))
+    putStrLn $ "pushBack "++show (sz,back,(x,y,z))
     when (sz < ringCapacity r) $ do
         writeIORef (rSize r) (sz + 3)
     updateRingCommands r