Skip to content

Flatland #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Flatland #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
817c6cf
Reorder.
robrix Mar 28, 2022
10d2508
Turn off vertical rotation.
robrix Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Isometry/View.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down