diff --git a/src/Dodge/Data/Flame.hs b/src/Dodge/Data/Flame.hs index b80401338..fdc45e1bc 100644 --- a/src/Dodge/Data/Flame.hs +++ b/src/Dodge/Data/Flame.hs @@ -5,7 +5,6 @@ module Dodge.Data.Flame where -import Color import Control.Lens import Data.Aeson import Data.Aeson.TH @@ -13,7 +12,6 @@ import Geometry.Data data Flame = Flame { _flVel :: Point2 - , _flColor :: Color , _flPos :: Point2 , _flWidth :: Float , _flTimer :: Int diff --git a/src/Dodge/Flame.hs b/src/Dodge/Flame.hs index 617b3ef64..a5f261ccc 100644 --- a/src/Dodge/Flame.hs +++ b/src/Dodge/Flame.hs @@ -30,7 +30,6 @@ aFlameParticle :: aFlameParticle t pos vel = Flame { _flVel = vel - , _flColor = red , _flPos = pos , _flWidth = 4 , _flTimer = t @@ -117,7 +116,7 @@ flFlicker :: Flame -> World -> World flFlicker pt | _flTimer pt `mod` 7 == 0 = cWorld . lWorld . lights - .:~ LSParam (addZ 10 $ _flPos pt) 70 (0.5 *.*.* xyzV4 (_flColor pt)) + .:~ LSParam (addZ 10 $ _flPos pt) 70 (0.5 *.*.* xyzV4 red) -- .:~ tlsTimeRadColPos 1 70 (0.5 *.*.* xyzV4 (_flColor pt)) (addZ 10 $ _flPos pt) | otherwise = id