Cleanup
This commit is contained in:
@@ -15,7 +15,6 @@ module Dodge.Creature.HandPos (
|
|||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Lens
|
import Control.Lens
|
||||||
import Data.Maybe
|
|
||||||
import Dodge.Creature.Test
|
import Dodge.Creature.Test
|
||||||
import Dodge.Data.Creature
|
import Dodge.Data.Creature
|
||||||
import Geometry
|
import Geometry
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import Control.Monad
|
|||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
import Dodge.Base.Collide
|
import Dodge.Base.Collide
|
||||||
import Dodge.Base.Coordinate
|
import Dodge.Base.Coordinate
|
||||||
import Dodge.Creature.HandPos
|
|
||||||
import Dodge.Data.ComposedItem
|
import Dodge.Data.ComposedItem
|
||||||
import Dodge.Data.DoubleTree
|
import Dodge.Data.DoubleTree
|
||||||
import Dodge.Data.MuzzleEffect
|
import Dodge.Data.MuzzleEffect
|
||||||
@@ -365,10 +364,8 @@ getBulletTrajectory mz itm bt tp cr w = case bt of
|
|||||||
BezierTrajectoryType -> BezierTrajectory bulpos tp (mouseWorldPos (w ^. input) (w ^. wCam))
|
BezierTrajectoryType -> BezierTrajectory bulpos tp (mouseWorldPos (w ^. input) (w ^. wCam))
|
||||||
MagnetTrajectoryType -> MagnetTrajectory tp
|
MagnetTrajectoryType -> MagnetTrajectory tp
|
||||||
where
|
where
|
||||||
(moff,mrot) = heldItemOrient2D itm cr (_mzPos mz + V2 0 offset) (_mzRot mz)
|
(moff,_) = heldItemOrient2D itm cr (_mzPos mz + V2 0 offset) (_mzRot mz)
|
||||||
bulpos = _crPos cr + rotateV (_crDir cr) moff
|
bulpos = _crPos cr + rotateV (_crDir cr) moff
|
||||||
-- dir = _crDir cr + mrot + a
|
|
||||||
-- bulpos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm + V2 0 offset)
|
|
||||||
offset = case itm ^? itUse . heldParams . randomOffset of
|
offset = case itm ^? itUse . heldParams . randomOffset of
|
||||||
Just x | x /= 0 -> fst . randomR (- x, x) $ _randGen w
|
Just x | x /= 0 -> fst . randomR (- x, x) $ _randGen w
|
||||||
_ -> 0
|
_ -> 0
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ module Dodge.Item.HeldOffset (
|
|||||||
|
|
||||||
import qualified Quaternion as Q
|
import qualified Quaternion as Q
|
||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
import Dodge.Creature.HandPos
|
|
||||||
import Dodge.Data.Creature
|
import Dodge.Data.Creature
|
||||||
import Dodge.Data.Machine
|
import Dodge.Data.Machine
|
||||||
import Geometry
|
import Geometry
|
||||||
|
|||||||
Reference in New Issue
Block a user