packages feed

GLUtil 0.6.2 → 0.6.3

raw patch · 5 files changed

+16/−7 lines, 5 filesdep ~linearPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: linear

API changes (from Hackage documentation)

+ Graphics.GLUtil.Camera2D: Camera :: V3 a -> V3 a -> V3 a -> Quaternion a -> V3 a -> Camera a
+ Graphics.GLUtil.Camera2D: forward :: Camera a -> V3 a
+ Graphics.GLUtil.Camera2D: location :: Camera a -> V3 a
+ Graphics.GLUtil.Camera2D: orientation :: Camera a -> Quaternion a
+ Graphics.GLUtil.Camera2D: rightward :: Camera a -> V3 a
+ Graphics.GLUtil.Camera2D: upward :: Camera a -> V3 a
+ Graphics.GLUtil.Camera3D: Camera :: V3 a -> V3 a -> V3 a -> Quaternion a -> V3 a -> Camera a
+ Graphics.GLUtil.Camera3D: forward :: Camera a -> V3 a
+ Graphics.GLUtil.Camera3D: location :: Camera a -> V3 a
+ Graphics.GLUtil.Camera3D: orientation :: Camera a -> Quaternion a
+ Graphics.GLUtil.Camera3D: rightward :: Camera a -> V3 a
+ Graphics.GLUtil.Camera3D: upward :: Camera a -> V3 a
+ Graphics.GLUtil.TypeMapping: instance HasVariableType (V1 GLfloat)
+ Graphics.GLUtil.TypeMapping: instance HasVariableType (V1 GLint)
+ Graphics.GLUtil.TypeMapping: instance HasVariableType (V1 GLuint)
+ Graphics.GLUtil.TypeMapping: instance HasVariableType (V1 Int32)
+ Graphics.GLUtil.TypeMapping: instance HasVariableType (V1 Word32)

Files

GLUtil.cabal view
@@ -1,5 +1,5 @@ Name:                GLUtil-Version:             0.6.2+Version:             0.6.3 Synopsis:            Miscellaneous OpenGL utilities. License:             BSD3 License-file:        LICENSE@@ -20,9 +20,12 @@                     examples/shaders/hello-gl.frag,                     examples/shaders/hello-gl.vert -source-repository this+-- source-repository this+--   type:     git+--   tag:      0.6.2+--   location: http://github.com/acowley/GLUtil.git+source-repository head   type:     git-  tag:      0.6.2   location: http://github.com/acowley/GLUtil.git  Library@@ -45,7 +48,7 @@                        bytestring,                        array,                        containers,-                       linear,+                       linear >= 1.1.3,                        JuicyPixels >= 3,                        OpenGLRaw >= 1.1,                        OpenGL >= 2.4,
src/Graphics/GLUtil/Camera2D.hs view
@@ -3,7 +3,7 @@ -- direction. module Graphics.GLUtil.Camera2D    (-- * Camera movement-   Camera, track, roll, rollRad,+   Camera(..), track, roll, rollRad,    -- * Camera initialization    camera2D,    -- * Math
src/Graphics/GLUtil/Camera3D.hs view
@@ -6,7 +6,7 @@ -- 'projectionMatrix'. module Graphics.GLUtil.Camera3D    (-- * Camera movement-   Camera, panRad, pan, tiltRad, tilt, rollRad, roll, dolly,+   Camera(..), panRad, pan, tiltRad, tilt, rollRad, roll, dolly,    -- * Camera initialization    rosCamera, fpsCamera,    -- * Matrices
src/Graphics/GLUtil/Textures.hs view
@@ -86,6 +86,7 @@   where loadTex TexMono = case pixelType of                             GL.UnsignedShort -> loadAux Luminance16 Luminance                             GL.Float         -> loadAux R32F Red+                            GL.UnsignedByte  -> loadAux R8 Red                             _                -> loadAux Luminance' Luminance                                      loadTex TexRGB = loadAux RGBA' RGB
src/Graphics/GLUtil/TypeMapping.hs view
@@ -9,7 +9,7 @@ import Foreign.Storable (Storable) import qualified Graphics.Rendering.OpenGL as GL import Graphics.Rendering.OpenGL-import Linear (V2, V3, V4, M22, M33, M44)+import Linear (V1, V2, V3, V4, M22, M33, M44)  -- | A mapping from Haskell types to values of 'VariableType'. This -- defines how Haskell values may be mapped to values that may be@@ -24,22 +24,27 @@ instance HasVariableType Word32 where variableType _ = UnsignedInt' instance HasVariableType GLuint where variableType _ = UnsignedInt' +instance HasVariableType (V1 GLfloat) where variableType _ = Float' instance HasVariableType (V2 GLfloat) where variableType _ = FloatVec2 instance HasVariableType (V3 GLfloat) where variableType _ = FloatVec3 instance HasVariableType (V4 GLfloat) where variableType _ = FloatVec4 +instance HasVariableType (V1 GLint) where variableType _ = Int' instance HasVariableType (V2 GLint) where variableType _ = IntVec2 instance HasVariableType (V3 GLint) where variableType _ = IntVec3 instance HasVariableType (V4 GLint) where variableType _ = IntVec4 +instance HasVariableType (V1 Int32) where variableType _ = Int' instance HasVariableType (V2 Int32) where variableType _ = IntVec2 instance HasVariableType (V3 Int32) where variableType _ = IntVec3 instance HasVariableType (V4 Int32) where variableType _ = IntVec4 +instance HasVariableType (V1 Word32) where variableType _ = UnsignedInt' instance HasVariableType (V2 Word32) where variableType _ = UnsignedIntVec2 instance HasVariableType (V3 Word32) where variableType _ = UnsignedIntVec3 instance HasVariableType (V4 Word32) where variableType _ = UnsignedIntVec4 +instance HasVariableType (V1 GLuint) where variableType _ = UnsignedInt' instance HasVariableType (V2 GLuint) where variableType _ = UnsignedIntVec2 instance HasVariableType (V3 GLuint) where variableType _ = UnsignedIntVec3 instance HasVariableType (V4 GLuint) where variableType _ = UnsignedIntVec4