diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-12-25 18:55:00 +0100 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-12-25 18:55:00 +0100 |
commit | c70430e833c4913b89dab3a85b753f82b18d5c89 (patch) | |
tree | 60448f774a549a8c616d4409a34ae258be00230e | |
parent | edc943fdfb84808710faff02da385d594aec0939 (diff) |
fix(lib): fix Flat import and other minor fixes
-rw-r--r-- | lib/Grav2ty/Simulation.hs | 2 | ||||
-rw-r--r-- | lib/Grav2ty/Util/Serialization.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Grav2ty/Simulation.hs b/lib/Grav2ty/Simulation.hs index 86fcd4f..5ddfe4c 100644 --- a/lib/Grav2ty/Simulation.hs +++ b/lib/Grav2ty/Simulation.hs @@ -185,7 +185,7 @@ objectRelGraph = insertMapKey rel emptyRel -- an 'Object' after a certain @timeStep@ of being exposed to -- a certain @gravitationForce@. It also factors in the current -- acceleration and speed of the 'Object'. -updateObject :: Fractional a => a -> V2 a -> Object a -> Object a +updateObject :: Fractional a => a -> V2 a -> Object a -> Object a updateObject _ _ obj@Static {} = obj updateObject timeStep force obj@Dynamic {} = obj { objectLoc = objectLoc obj + (objectSpeed obj ^* timeStep) diff --git a/lib/Grav2ty/Util/Serialization.hs b/lib/Grav2ty/Util/Serialization.hs index 42be957..ec8459b 100644 --- a/lib/Grav2ty/Util/Serialization.hs +++ b/lib/Grav2ty/Util/Serialization.hs @@ -3,7 +3,7 @@ {-# LANGUAGE DeriveAnyClass #-} module Grav2ty.Util.Serialization where -import Data.Flat +import Flat import GHC.Generics import Grav2ty.Core (Hitbox (..), Object (..), Modifier (..), Modification (..)) import Linear.V2 (V2 (..)) |