Move main to allow for new executables
This commit is contained in:
+10
-11
@@ -33,6 +33,10 @@ module Shader.Data
|
||||
, psText
|
||||
, psArc
|
||||
, psEll
|
||||
|
||||
, vert
|
||||
, geom
|
||||
, frag
|
||||
|
||||
-- TODO make lenses for VBO object
|
||||
-- , textureObject
|
||||
@@ -138,8 +142,6 @@ instance Traversable PicShads where
|
||||
, _psArc = x4
|
||||
, _psEll = x5
|
||||
} = PicShads <$> f x0 <*> f x1 <*> f x2 <*> f x3 <*> f x4 <*> f x5
|
||||
|
||||
|
||||
{- | Datatype containing the necessary information for a single shader. -}
|
||||
data FullShader = FullShader
|
||||
{ _shaderProgram :: Program
|
||||
@@ -151,15 +153,6 @@ data FullShader = FullShader
|
||||
{- | Datatype containing the reference to a texture object. -}
|
||||
newtype ShaderTexture = ShaderTexture
|
||||
{ _textureObject :: TextureObject }
|
||||
--data PicVerxs = PicVerxs
|
||||
-- { _pvPoly :: (Point3,Point4)
|
||||
-- , _pvPolyz :: (Point3,Point4,Float)
|
||||
-- , _pvBez :: (Point3,Point4,Point4)
|
||||
-- , _pvText :: (Point3,Point4,Point2)
|
||||
-- , _pvArc :: (Point3,Point3,Point3)
|
||||
-- , _pvEll :: (Point3,Point4)
|
||||
-- }
|
||||
|
||||
data EPrimitiveMode
|
||||
= EPoints
|
||||
| ELines
|
||||
@@ -174,6 +167,12 @@ data EPrimitiveMode
|
||||
| EPolygon
|
||||
| EPatches
|
||||
|
||||
-- | Short synonyms for shader types
|
||||
vert, geom, frag :: ShaderType
|
||||
vert = VertexShader
|
||||
geom = GeometryShader
|
||||
frag = FragmentShader
|
||||
|
||||
makeLenses ''VAO
|
||||
makeLenses ''FullShader
|
||||
makeLenses ''VShader
|
||||
|
||||
Reference in New Issue
Block a user