From 817c6cf4b5c0bde094dd37aac976fdff91a2e568 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Sun, 27 Mar 2022 23:19:15 -0400 Subject: [PATCH 1/2] Reorder. --- src/Isometry/View.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Isometry/View.hs b/src/Isometry/View.hs index 8f9fa705..cd6ad14c 100644 --- a/src/Isometry/View.hs +++ b/src/Isometry/View.hs @@ -14,8 +14,8 @@ import Control.Carrier.Reader import Control.Effect.Lift import Control.Lens ((&), (.~)) import Data.Functor.I -import Geometry.Transform import GL.Shader.DSL (ClipUnits(..)) +import Geometry.Transform import Isometry.World import Linear.Exts import UI.Window as Window From 10d2508ed8f5b518e4dee32c88bbae31a98ec6ca Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Sun, 27 Mar 2022 23:19:27 -0400 Subject: [PATCH 2/2] Turn off vertical rotation. --- src/Isometry/View.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Isometry/View.hs b/src/Isometry/View.hs index cd6ad14c..6f1a6224 100644 --- a/src/Isometry/View.hs +++ b/src/Isometry/View.hs @@ -46,8 +46,7 @@ withView !angle m = do <<< mkScale (pure scale) <<< mkTranslation (negated focus) <<< mkRotation - ( axisAngle (unit _x) (pi/4) - * axisAngle (unit _y) angle) + ( axisAngle (unit _y) angle) <<< mkScale (pure zoom) runReader View{ transform } m