luminance-samples 0.4 → 0.5
raw patch · 2 files changed
+10/−18 lines, 2 filesdep −vectordep ~luminance
Dependencies removed: vector
Dependency ranges changed: luminance
Files
- luminance-samples.cabal +7/−9
- src/Texture.hs +3/−9
luminance-samples.cabal view
@@ -1,5 +1,5 @@ name: luminance-samples-version: 0.4+version: 0.5 synopsis: Luminance samples description: Luminance samples used as tutorial help homepage: https://github.com/phaazon/luminance-samples@@ -29,7 +29,7 @@ , FlexibleContexts build-depends: base >= 4.8 && < 4.9- , luminance >= 0.4 && < 0.5+ , luminance >= 0.5 && < 0.6 , GLFW-b >= 1.4 && < 1.5 , mtl >= 2.2 && < 2.3 , resourcet >= 1.1 && < 1.2@@ -49,7 +49,7 @@ , ScopedTypeVariables build-depends: base >= 4.8 && < 4.9- , luminance >= 0.4 && < 0.5+ , luminance >= 0.5 && < 0.6 , GLFW-b >= 1.4 && < 1.5 , mtl >= 2.2 && < 2.3 , resourcet >= 1.1 && < 1.2@@ -70,7 +70,7 @@ build-depends: base >= 4.8 && < 4.9 , contravariant >= 1.3 && < 1.4- , luminance >= 0.4 && < 0.5+ , luminance >= 0.5 && < 0.6 , GLFW-b >= 1.4 && < 1.5 , mtl >= 2.2 && < 2.3 , resourcet >= 1.1 && < 1.2@@ -91,7 +91,7 @@ build-depends: base >= 4.8 && < 4.9 , contravariant >= 1.3 && < 1.4- , luminance >= 0.4 && < 0.5+ , luminance >= 0.5 && < 0.6 , GLFW-b >= 1.4 && < 1.5 , mtl >= 2.2 && < 2.3 , resourcet >= 1.1 && < 1.2@@ -113,12 +113,11 @@ build-depends: base >= 4.8 && < 4.9 , contravariant >= 1.3 && < 1.4 , JuicyPixels >= 3.2 && < 3.4- , luminance >= 0.4 && < 0.5+ , luminance >= 0.5 && < 0.6 , GLFW-b >= 1.4 && < 1.5 , mtl >= 2.2 && < 2.3 , resourcet >= 1.1 && < 1.2 , transformers >= 0.4 && < 0.5- , vector >= 0.11 && < 0.12 hs-source-dirs: src @@ -135,12 +134,11 @@ build-depends: base >= 4.8 && < 4.9 , contravariant >= 1.3 && < 1.4- , luminance >= 0.4 && < 0.5+ , luminance >= 0.5 && < 0.6 , GLFW-b >= 1.4 && < 1.5 , mtl >= 2.2 && < 2.3 , resourcet >= 1.1 && < 1.2 , transformers >= 0.4 && < 0.5- , vector >= 0.11 && < 0.12 hs-source-dirs: src
src/Texture.hs view
@@ -5,9 +5,6 @@ import Control.Monad.Except ( MonadError(..) ) import Control.Monad.IO.Class import Control.Monad.Trans.Resource-import Data.Vector ( Vector, convert )-import qualified Data.Vector.Storable as S ( Vector )-import Foreign.Storable ( Storable ) import Graphics.Luminance.Batch import Graphics.Luminance.Cmd import Graphics.Luminance.Framebuffer@@ -77,16 +74,13 @@ where treatDynamicImage image = case image of ImageRGBA8 img -> liftIO (putStrLn "ImageRGBA8") >> createTexture_ img- ImageYCbCr8 img -> liftIO (putStrLn "ImageYCbCr8") >> createTexture_ (promoteImage $ (convertImage img :: Image PixelRGB8))- _ -> throwError $ AppError "unsupported image format"+ ImageYCbCr8 img -> liftIO (putStrLn "ImageYCbCr8") >> createTexture_ (promoteImage (convertImage img :: Image PixelRGB8))+ _ -> throwError (AppError "unsupported image format") createTexture_ :: (MonadIO m,MonadResource m) => Image PixelRGBA8 -> m (Texture2D RGBA8UI) createTexture_ img = do let w = fromIntegral $ imageWidth img h = fromIntegral $ imageHeight img tex <- createTexture (w,h) 1 defaultSampling- uploadSub tex (0,0) (w,h) False (convertV $ imageData img)+ uploadSub tex (0,0) (w,h) False (imageData img) pure tex--convertV :: (Storable a) => S.Vector a -> Vector a-convertV = convert