Rework vector/point typesystem
Don't rely on Data.Vector.V2 and friend anymore, but use the types we have from Diagrams already and enhance them.
This commit is contained in:
@@ -1,23 +1,25 @@
|
||||
{-# OPTIONS_HADDOCK ignore-exports #-}
|
||||
|
||||
module Parser.Meshparser (VTable, meshToArr) where
|
||||
module Parser.Meshparser (meshToArr) where
|
||||
|
||||
import Control.Applicative
|
||||
import Diagrams.TwoD.Types
|
||||
import LinearAlgebra.Vector
|
||||
import Parser.Core
|
||||
|
||||
-- |The VTable is represented by a 'Double' tuple, 2-dimensional.
|
||||
type VTable = [(Double, Double)]
|
||||
|
||||
-- | Convert a text String with multiple vertices into
|
||||
-- an array of float tuples.
|
||||
meshToArr :: String -- ^ the string to convert
|
||||
-> VTable -- ^ the resulting vertice table
|
||||
meshToArr xs = fmap (\(Just (x, _)) -> x) .
|
||||
-> [PT] -- ^ the resulting vertice table
|
||||
meshToArr xs = fmap (p2) .
|
||||
fmap (\(Just (x, _)) -> x) .
|
||||
filter (/= Nothing) .
|
||||
fmap (runParser parseVertice) .
|
||||
lines $
|
||||
xs
|
||||
|
||||
|
||||
-- | Creates a Parser that accepts a single vertice, such as 'v 1.0 2.0'.
|
||||
parseVertice :: Parser (Double, Double)
|
||||
parseVertice = (,) <$>
|
||||
|
||||
Reference in New Issue
Block a user