hasufell/cga
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Read the obj file as ByteString and pass ByteString to the Parser

Browse Source
This commit is contained in:
hasufell
2014-11-21 04:49:17 +01:00
parent 2d7a62770a
commit e673fee652
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Graphics/Diagram/Gif.hs
View File

@@ -5,6 +5,7 @@ module Graphics.Diagram.Gif where
import Algebra.VectorTypes
import Algorithms.ConvexHull.GrahamScan
import Codec.Picture.Gif
import qualified Data.ByteString.Char8 as B
import Data.Monoid
import Diagrams.Backend.Cairo
import Diagrams.Prelude hiding ((<>))
@@ -33,5 +34,5 @@ gifDiag p xs =
-- |Same as gifDiag, except that it takes a string containing the
-- mesh file content instead of the the points.
gifDiagS :: DiagProp -> MeshString -> [(Diagram Cairo R2, GifDelay)]
gifDiagS :: DiagProp -> B.ByteString -> [(Diagram Cairo R2, GifDelay)]
gifDiagS p = gifDiag p . filterValidPT p . meshToArr

5
Graphics/Diagram/Gtk.hs
View File

@@ -2,6 +2,7 @@
module Graphics.Diagram.Gtk where
import qualified Data.ByteString.Char8 as B
import Diagrams.Backend.Cairo
import Diagrams.Prelude
import Graphics.Diagram.Plotter
@@ -36,7 +37,7 @@ diag p objs@(Objects _)
-- |Create the Diagram from a String which is supposed to be the contents
-- of an obj file.
diagS :: DiagProp -> MeshString -> Diagram Cairo R2
diagS :: DiagProp -> B.ByteString -> Diagram Cairo R2
diagS p mesh
| algo p == 2 || algo p == 3 =
diag p
@@ -49,7 +50,7 @@ diagS p mesh
-- |Create the tree diagram from a String which is supposed to be the contents
-- of an obj file.
diagTreeS :: DiagProp -> MeshString -> Diagram Cairo R2
diagTreeS :: DiagProp -> B.ByteString -> Diagram Cairo R2
diagTreeS p mesh
| algo p == 4 = mkDiag treePretty p (Object
. filterValidPT p