Fix hlint and few other warnings

Author: sorki

src/Graphics/Implicit/Viewer.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE PackageImports #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
@@ -117,7 +116,7 @@ viewer config@ViewerConf{..} = do
 
       fragmentStream <-
             do
-              guard' (shaderEnvFlatNormals)
+              guard' shaderEnvFlatNormals
               rasterize
                 shaderEnvRasterOptions
                 (proj Flat <$> primitiveStream)
@@ -197,8 +196,8 @@ loop win shader triangles unionBuffers@Uniforms{..} aTime eventChan renderChan v
 
       projMat = perspective (pi/2) (fromIntegral windowWidth / fromIntegral windowHeight) 0.1 100
 
-      eye = (V3 0 (-1) 1)
-      lookAtPoint = (V3 0 0 0)
+      eye = V3 0 (-1) 1
+      lookAtPoint = V3 0 0 0
 
       cameraMatrix :: M44 Float
       cameraMatrix =
@@ -276,8 +275,8 @@ updateViewerState win chan oldState = do
                       V2 cursorX cursorY = lastCursorPos
                     in
                       s { lastCursorPos = x
-                        , camPitch = ((realToFrac $ cursorY - oldCursorY) / 100 + camPitch) `mod''` (2*pi)
-                        , camYaw = ((realToFrac $ cursorX - oldCursorX) / 100 + camYaw) `mod''` (2*pi)
+                        , camPitch = (realToFrac (cursorY - oldCursorY) / 100 + camPitch) `mod''` (2*pi)
+                        , camYaw = (realToFrac (cursorX - oldCursorX) / 100 + camYaw) `mod''` (2*pi)
                         }
             LeftMouse x
               -> s { camRotating = x }
@@ -309,7 +308,7 @@ updateViewerState win chan oldState = do
                                           else -1
       animTime =
         if animationRunning
-             then animationTime + (faster $ animDirection * animationStep)
+             then animationTime + faster (animDirection * animationStep)
              else animationTime
 
       nextOutOfBounds =

src/Graphics/Implicit/Viewer/Demos.hs

@@ -4,7 +4,6 @@ module Graphics.Implicit.Viewer.Demos where
 
 import Graphics.Implicit
 import Graphics.Implicit.Primitives
-import Linear
 
 demoLetterI :: Double -> SymbolicObj3
 demoLetterI t =
@@ -23,8 +22,8 @@ demoRotatingAnim t =
 ontop :: SymbolicObj3 -> SymbolicObj3 -> SymbolicObj3
 ontop a b = union [ translate (V3 0 0 z) a, b ]
   where z = let
-                ((V3 _ _ aBottom), _) = getBox a
-                (_, (V3 _ _ bTop)) = getBox b
+                (V3 _ _ aBottom, _) = getBox a
+                (_, V3 _ _ bTop) = getBox b
             in bTop - aBottom
 
 demoTranslatedSymbolic :: SymbolicObj3

src/Graphics/Implicit/Viewer/Loaders.hs

@@ -21,7 +21,6 @@ import Graphics.Implicit.Export.GL
 import Graphics.Implicit.ExtOpenScad.Definitions
 import Graphics.Implicit.Primitives (getBox)
 import Graphics.Implicit.Viewer.Types
-import Linear (V3 (V3))
 
 import qualified Language.Haskell.Interpreter as Hint
 import qualified System.Directory
@@ -186,7 +185,7 @@ renderObjToChan o resolution renderChan = do
   unless (l == 0) $ do
     atomically $ writeTChan renderChan (l, objScale, mesh)
   after <- getCurrentTime
-  putStrLn $ "Done in " ++ (show $ diffUTCTime after now)
+  putStrLn $ "Done in " ++ show (diffUTCTime after now)
 
   when (l == 0) $ putStrLn "Mesh empty"
 
@@ -201,6 +200,6 @@ runAnimation f initialResolution renderChan aTime = void $ async $ forever $ do
   isE <- atomically $ isEmptyTChan renderChan
   case isE of
     True -> do
-      t <- atomically $ readTVar aTime
+      t <- readTVarIO aTime
       renderObjToChan (f t) initialResolution renderChan
     False -> threadDelay 100000

src/Graphics/Implicit/Viewer/Shaders.hs

@@ -32,7 +32,7 @@ allShaders = Data.Map.fromList $ zip [0..]
 
 asumShaderByID
   :: forall os
-   . ((ShaderEnvironment os) -> Int)
+   . (ShaderEnvironment os -> Int)
   -> Window os RGBAFloat Depth
   -> FragStream
   -> Shader os (ShaderEnvironment os) ()
@@ -62,16 +62,16 @@ computeLight specularIntensity eye VertexInfo{..} =
       halfVector = signorm viewDir
       specular = maxB (viNormal `dot` halfVector) 0
   in
-   specularIntensity *^ (V4 1 1 1 1) ^* (specular ** 32)
+   specularIntensity *^ V4 1 1 1 1 ^* (specular ** 32)
      + (1 *^ opaque $
         0.1 -- global illumination
       + (
           -- red light from front right
-          (V3 0.8 0   0   ^* (maxB (normal `dot` dirR) 0))
+          (V3 0.8 0   0   ^* maxB (normal `dot` dirR) 0)
           -- green from front left
-        + (V3 0   0.8 0   ^* (maxB (normal `dot` dirG) 0))
+        + (V3 0   0.8 0   ^* maxB (normal `dot` dirG) 0)
           -- blue from bottom
-        + (V3 0   0   0.8 ^* (maxB (normal `dot` dirB) 0))
+        + (V3 0   0   0.8 ^* maxB (normal `dot` dirB) 0)
         ))
 
 lightShaded
@@ -82,7 +82,7 @@ lightShaded
 lightShaded i win fragStream = do
   eye <- getUni bEye
   let
-    litFrags = (computeLight i eye) <$> fragStream
+    litFrags = computeLight i eye <$> fragStream
 
   drawWindowColorDepth
     (const (win, def, def))
@@ -100,7 +100,7 @@ alphaWireframe win fragStream = do
         (V3 i j k) = w
         edgeFactor = minB (minB i j) k
       in
-        (V4 1 0 0 ((1.0 - edgeFactor) * 0.95))
+        V4 1 0 0 ((1.0 - edgeFactor) * 0.95)
 
   drawWindowColor
      (const (win, blendAlpha))
@@ -125,7 +125,7 @@ edgy win fragStream = do
 
   drawWindowColor
    (const (win, blendAlpha))
-   (wireFrags)
+   wireFrags
 
 edges
   :: forall os . Window os RGBAFloat Depth