diff options
| author | Joshua Rahm <joshua.rahm@colorado.edu> | 2014-04-22 00:27:21 -0600 |
|---|---|---|
| committer | Joshua Rahm <joshua.rahm@colorado.edu> | 2014-04-22 00:27:21 -0600 |
| commit | bc247b19550b58ce8e9f6ab82ac7607c8713de44 (patch) | |
| tree | 4176eeea6fa453d2958303d2b33b49e6ca42d4d9 /Graphics/Glyph | |
| parent | 14b6f5cee8236f7c42065813c5dd6a659d4d5d65 (diff) | |
| download | terralloc-bc247b19550b58ce8e9f6ab82ac7607c8713de44.tar.gz terralloc-bc247b19550b58ce8e9f6ab82ac7607c8713de44.tar.bz2 terralloc-bc247b19550b58ce8e9f6ab82ac7607c8713de44.zip | |
added stuff for sun
Diffstat (limited to 'Graphics/Glyph')
| -rw-r--r-- | Graphics/Glyph/BufferBuilder.hs | 33 | ||||
| -rw-r--r-- | Graphics/Glyph/GLMath.hs | 6 | ||||
| -rw-r--r-- | Graphics/Glyph/Shaders.hs | 3 |
3 files changed, 42 insertions, 0 deletions
diff --git a/Graphics/Glyph/BufferBuilder.hs b/Graphics/Glyph/BufferBuilder.hs index 809312e..43447a1 100644 --- a/Graphics/Glyph/BufferBuilder.hs +++ b/Graphics/Glyph/BufferBuilder.hs @@ -35,6 +35,39 @@ nelem (Plot _ _ _ l) = l sizeofGLfloat :: Int sizeofGLfloat = 4 +simpleCube :: Num a => [(a,a,a)] +simpleCube = trianglesFromQuads [ + (-1, 1,-1) + , ( 1, 1,-1) + , ( 1,-1,-1) + , (-1,-1,-1) + + , (-1, 1, 1) + , ( 1, 1, 1) + , ( 1,-1, 1) + , (-1,-1, 1) + + , (-1, 1, 1) + , ( 1, 1, 1) + , ( 1, 1,-1) + , (-1, 1,-1) + + , (-1,-1, 1) + , ( 1,-1, 1) + , ( 1,-1,-1) + , (-1,-1,-1) + + , (-1,-1, 1) + , (-1, 1, 1) + , (-1, 1,-1) + , (-1,-1,-1) + + , ( 1,-1, 1) + , ( 1, 1, 1) + , ( 1, 1,-1) + , ( 1,-1,-1) + ] + class Monad a => IsModelBuilder b a where plotVertex3 :: b -> b -> b -> a () plotNormal :: b -> b -> b -> a () diff --git a/Graphics/Glyph/GLMath.hs b/Graphics/Glyph/GLMath.hs index 7b454e2..cd0fd53 100644 --- a/Graphics/Glyph/GLMath.hs +++ b/Graphics/Glyph/GLMath.hs @@ -92,6 +92,12 @@ module Graphics.Glyph.GLMath where sz, uz, -fz, 0, -(s<.>e) , -(u'<.>e), (f<.>e), 1 ) + orthoMatrix :: GLfloat -> GLfloat -> GLfloat -> GLfloat -> GLfloat -> GLfloat -> Mat4 GLfloat + orthoMatrix top bot right left near far = + Matrix4 (2 / (right-left), 0, 0, - (right + left) / (right - left), + 0, 2 / (top-bot), 0, - (top+bot) / (top-bot), + 0, 0, -2 / (far-near), - (far+near) / (far - near), + 0, 0, 0, 1) perspectiveMatrix :: GLfloat -> GLfloat -> GLfloat -> GLfloat -> Mat4 GLfloat {- as close to copied from glm as possible -} perspectiveMatrix fov asp zn zf = diff --git a/Graphics/Glyph/Shaders.hs b/Graphics/Glyph/Shaders.hs index 296e4a8..99a0cfd 100644 --- a/Graphics/Glyph/Shaders.hs +++ b/Graphics/Glyph/Shaders.hs @@ -27,6 +27,9 @@ instance IsShaderSource BSL.ByteString where loadShader typ = loadShader typ . toStrict where toStrict = BS.concat . BSL.toChunks +noShader :: Maybe String +noShader = Nothing + loadShaderBS :: String -> ShaderType -> BS.ByteString -> IO (String, Maybe Shader) loadShaderBS ctx typ src = do shader <- createShader typ |