Correctly display held root item

src/Dodge/LightSource.hs

@@ -12,33 +12,11 @@ import Dodge.Material.Sound
 import Dodge.WorldEvent.Sound
 import Geometry.Data
 import Geometry.Vector
-import Geometry.Vector3D
 import LensHelp
 
 lsPosRad :: Point3 -> Float -> LightSource
 lsPosRad = lsColPosRad 0.75
 
---tlsTimeRadFunPos :: Int -> Float -> TLSIntensity -> Point3 -> TempLightSource
---tlsTimeRadFunPos t rmax intensityF p =
---    TLS
---        { _tlsParam =
---            LSParam
---                { _lsPos = p
---                , _lsRad = rmax
---                , _lsCol = 0 -- intensityF t
---                }
---        , _tlsUpdate = IntensityTLS intensityF
---        , _tlsTime = t
---        }
-
---  where
---    upF tls
---        | _tlsTime tls <= 0 = Nothing
---        | otherwise         = Just $ tls
---            & tlsTime -~ 1
---            & tlsParam . lsCol .~ f (intensityF (_tlsTime tls) )
---    f x' = V3 x' x' x'
-
 lsColPosID :: Point3 -> Point3 -> Int -> LightSource
 lsColPosID col p i = lsColPos col p & lsID .~ i
 
@@ -51,33 +29,6 @@ lsPosCol pos col = lsColPos col pos
 lsColPosRad :: Point3 -> Point3 -> Float -> LightSource
 lsColPosRad col p r = LS 0 $ LSParam p r col
 
---lsRadCol :: Float -> Point3 -> LightSource
---lsRadCol r col =
---    defaultLS & lsParam . lsRad .~ r
---        & lsParam . lsCol .~ col
-
---tlsTimeRadColPos ::
---    Int ->
---    -- | maximal radius
---    Float ->
---    Point3 ->
---    Point3 ->
---    TempLightSource
---tlsTimeRadColPos t rmax col (V3 x y z) =
---    TLS
---        { _tlsParam =
---            LSParam
---                { _lsPos = V3 x y z
---                , _lsRad = rmax
---                , _lsCol = col
---                }
---        , _tlsUpdate = TimerTLS
---        , _tlsTime = t
---        }
---
---makeTlsTimeRadColPos :: Int -> Float -> Point3 -> Point3 -> World -> World
---makeTlsTimeRadColPos i rad (V3 r g b) p = cWorld . lWorld . tempLightSources .:~ tlsTimeRadColPos i rad (V3 r g b) p
-
 destroyLS :: Int -> World -> World
 destroyLS lsid w =
     w
@@ -89,14 +40,6 @@ destroyLS lsid w =
     p3 = _lsPos $ _lsParam ls
 
 destroyLSFlashAt :: Point3 -> World -> World
-destroyLSFlashAt (V3 x' y' z') =
+destroyLSFlashAt x =
     cWorld . lWorld . worldEvents .:~ MakeTempLight 
-        (LSParam (addZ z' p) 150 1) 20
---    cWorld . lWorld . tempLightSources
---        .:~ tlsTimeRadFunPos
---            20
---            150
---            (TLSFade 1 10)
---            (addZ z' p)
-  where
-    p = V2 x' y'
+        (LSParam x 150 1) 20