aboutsummaryrefslogtreecommitdiff
path: root/Graphics/Glyph/BufferBuilder.hs
diff options
context:
space:
mode:
authorJoshua Rahm <joshua.rahm@colorado.edu>2014-03-19 01:05:20 -0600
committerJoshua Rahm <joshua.rahm@colorado.edu>2014-03-19 01:05:20 -0600
commit1f2c14738f551fc902ba915d84f0515778a7ed4d (patch)
treeb37689c39b0e31666b77fbfff391b0c074370a5c /Graphics/Glyph/BufferBuilder.hs
parent62fa8f93990f6aedaae8242fdde6bba44e434f5f (diff)
downloadearths-ring-1f2c14738f551fc902ba915d84f0515778a7ed4d.tar.gz
earths-ring-1f2c14738f551fc902ba915d84f0515778a7ed4d.tar.bz2
earths-ring-1f2c14738f551fc902ba915d84f0515778a7ed4d.zip
changed quads to triangles
Diffstat (limited to 'Graphics/Glyph/BufferBuilder.hs')
-rw-r--r--Graphics/Glyph/BufferBuilder.hs16
1 files changed, 8 insertions, 8 deletions
diff --git a/Graphics/Glyph/BufferBuilder.hs b/Graphics/Glyph/BufferBuilder.hs
index e43e48a..4c56c6f 100644
--- a/Graphics/Glyph/BufferBuilder.hs
+++ b/Graphics/Glyph/BufferBuilder.hs
@@ -99,20 +99,20 @@ compilingBuilder (Builder lst _) = do
where (?) True = 1
(?) False = 0
-- Cur color normal texture buffer
- let (_,_,_,buffer) =
- Fold.foldl (\(cn,cc,ct,ll) ele ->
+ let (nverts,_,_,_,buffer) =
+ Fold.foldl (\(num,cn,cc,ct,ll) ele ->
-- trace ("foldl " ++! ele) $
case ele of
- NormalLink nn -> (nn,cc,ct,ll)
- ColorLink nc -> (cn,nc,ct,ll)
- TextureLink nt -> (cn,cc,nt,ll)
+ NormalLink nn -> (num,nn,cc,ct,ll)
+ ColorLink nc -> (num,cn,nc,ct,ll)
+ TextureLink nt -> (num,cn,cc,nt,ll)
VertexLink vert ->
- (cn,cc,ct,
+ (num+1,cn,cc,ct,
ll >< (tp3 True vert >< tp3 bn cn >< tp4 bc cc >< tp2 bt ct)
- )) ( (0,0,0), (0,0,0,0), (0,0), Seq.empty ) (Seq.reverse lst)
+ )) ( 0, (0,0,0), (0,0,0,0), (0,0), Seq.empty ) (Seq.reverse lst)
arr <- newListArray (0,Seq.length buffer) (Fold.toList buffer)
- ((putStrLn.("Compiled: "++!))>&>return) $ CompiledBuild stride en (Seq.length buffer `div` stride * sizeof) arr
+ ((putStrLn.("Compiled: "++!))>&>return) $ CompiledBuild stride en nverts arr
where