Remove old Prop update
This commit is contained in:
@@ -9,7 +9,6 @@ module Dodge.Placement.Instance.LightSource (
|
||||
iShape,
|
||||
putLamp,
|
||||
spanColLightBlackI,
|
||||
moveLSThen,
|
||||
spanLightI,
|
||||
spanLightY,
|
||||
mntLightLnkCond',
|
||||
@@ -18,7 +17,6 @@ module Dodge.Placement.Instance.LightSource (
|
||||
|
||||
import Color
|
||||
import Control.Lens
|
||||
import Data.Maybe
|
||||
import Dodge.Creature.Inanimate
|
||||
import Dodge.Data.GenWorld
|
||||
import Dodge.LevelGen.PlacementHelper
|
||||
@@ -27,43 +25,8 @@ import Dodge.Room.Foreground
|
||||
import Geometry
|
||||
import RandomHelp
|
||||
import Shape
|
||||
import ShapePicture
|
||||
import Linear
|
||||
|
||||
propLSThen ::
|
||||
PropUpdate ->
|
||||
PrWdLsLs -> --(Prop -> World -> LightSource -> LightSource)
|
||||
LightSource ->
|
||||
Prop ->
|
||||
-- | continuation, access to ls and prop placements
|
||||
(Placement -> Placement -> Maybe Placement) ->
|
||||
Placement
|
||||
propLSThen propf lsf ls prop cont = pt0 (PutLS ls) $
|
||||
\lspl ->
|
||||
Just $
|
||||
pt0 (PutProp $ prop & prUpdate .~ PropUpdates [propf, PropUpdateLS (fromJust $ _plMID lspl) lsf]) $
|
||||
cont lspl
|
||||
|
||||
moveLSThen ::
|
||||
WdP2f -> --(World -> (Point2,Float))
|
||||
-- | light source offset
|
||||
Point3 ->
|
||||
Shape ->
|
||||
(Placement -> Placement -> Maybe Placement) ->
|
||||
Placement
|
||||
moveLSThen posf off sh = propLSThen (PropUpdatePosition posf) (PrWdLsSetPosition posf off) thels theprop
|
||||
where
|
||||
thels = LS 0 $ LSParam 0 200 0.6
|
||||
theprop =
|
||||
ShapeProp
|
||||
{ _prPos = 0
|
||||
, _prID = 0
|
||||
, _prRot = 0
|
||||
, _prUpdate = PropUpdateId
|
||||
, --, _prDraw = PropDrawSPic $ noPic $ uncurryV translateSHf (_prPos pr) $ rotateSH (_pjRot pr) sh
|
||||
_prDraw = noPic sh
|
||||
}
|
||||
|
||||
-- | mount a light source on a shape
|
||||
mntLSOn ::
|
||||
-- | function describing the mount shape
|
||||
|
||||
Reference in New Issue
Block a user