Simplify props (should they be removed?)
This commit is contained in:
@@ -7,7 +7,6 @@ import Color
|
||||
import Control.Lens
|
||||
import Data.Aeson
|
||||
import Data.Aeson.TH
|
||||
import Dodge.Data.WorldEffect
|
||||
import Geometry.Data
|
||||
import qualified Quaternion as Q
|
||||
import ShapePicture.Data
|
||||
@@ -15,10 +14,8 @@ import ShapePicture.Data
|
||||
data Prop = ShapeProp
|
||||
{ _prPos :: Point2
|
||||
, _prDraw :: SPic
|
||||
, _prUpdate :: PropUpdate
|
||||
, _prID :: Int
|
||||
, _prRot :: Float
|
||||
-- , _prToggle :: Bool
|
||||
}
|
||||
|
||||
data DebrisType
|
||||
@@ -33,23 +30,9 @@ data Debris = DebrisChunk
|
||||
, _dbSpin :: Q.Quaternion Float
|
||||
}
|
||||
|
||||
data PropUpdate
|
||||
= PropUpdateId
|
||||
| PropUpdates [PropUpdate]
|
||||
| PropUpdatePosition WdP2f
|
||||
| PropUpdateWhen WdBl PropUpdate
|
||||
| PropUpdateIf WdBl PropUpdate PropUpdate
|
||||
|
||||
data PrWdLsLs
|
||||
= PrWdLsId
|
||||
| PrWdLsSetPosition WdP2f Point3
|
||||
| PrWdLsSetColor Point3
|
||||
|
||||
makeLenses ''Prop
|
||||
makeLenses ''Debris
|
||||
makeLenses ''DebrisType
|
||||
deriveJSON defaultOptions ''DebrisType
|
||||
deriveJSON defaultOptions ''Debris
|
||||
deriveJSON defaultOptions ''PrWdLsLs
|
||||
deriveJSON defaultOptions ''PropUpdate
|
||||
deriveJSON defaultOptions ''Prop
|
||||
|
||||
Reference in New Issue
Block a user