diff options
| author | Joshua Rahm <joshua.rahm@colorado.edu> | 2014-04-17 22:08:15 -0600 |
|---|---|---|
| committer | Joshua Rahm <joshua.rahm@colorado.edu> | 2014-04-17 22:08:15 -0600 |
| commit | 73daf65aaa31b5fb59f4a91d9185387f63c7b09f (patch) | |
| tree | 681036c0cdd6f7981164ac189fed92da900ee3e7 /Graphics/Glyph/BufferBuilder.hs | |
| parent | e083553a455d30374f21aa0c34d9ae827470d490 (diff) | |
| download | terralloc-73daf65aaa31b5fb59f4a91d9185387f63c7b09f.tar.gz terralloc-73daf65aaa31b5fb59f4a91d9185387f63c7b09f.tar.bz2 terralloc-73daf65aaa31b5fb59f4a91d9185387f63c7b09f.zip | |
added real water
Diffstat (limited to 'Graphics/Glyph/BufferBuilder.hs')
| -rw-r--r-- | Graphics/Glyph/BufferBuilder.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/Glyph/BufferBuilder.hs b/Graphics/Glyph/BufferBuilder.hs index ec27a89..809312e 100644 --- a/Graphics/Glyph/BufferBuilder.hs +++ b/Graphics/Glyph/BufferBuilder.hs @@ -204,8 +204,8 @@ storableArrayToBuffer target arr = do bufferData target $= (fromIntegral len, ptr, StaticDraw) return buffer -ptrToBuffer :: (Storable b) => BufferTarget -> Ptr b -> Int -> IO BufferObject -ptrToBuffer target ptr len = do +ptrToBuffer :: (Storable b) => BufferTarget -> Int -> Ptr b -> IO BufferObject +ptrToBuffer target len ptr = do -- len is length in bytes [buffer] <- genObjectNames 1 bindBuffer target $= Just buffer @@ -237,7 +237,7 @@ textureArrayDescriptor (CompiledBuild stride tup@(_,_,True) _ _ _) = ifp b x = if b then x else 0 textureArrayDescriptor _ = Nothing createBufferObject :: BufferTarget -> CompiledBuild GLfloat -> IO BufferObject -createBufferObject target (CompiledBuild _ _ _ arr len) = ptrToBuffer target arr len +createBufferObject target (CompiledBuild _ _ _ arr len) = ptrToBuffer target len arr mapListInsert :: (Ord k) => k -> a -> Map.Map k [a] -> Map.Map k [a] mapListInsert key val map = |