Commit mid add time scroll
This commit is contained in:
@@ -114,18 +114,7 @@ data CWCam = CWCam
|
||||
, _cwcBoundDist :: (Float, Float, Float, Float) -- NSEW, S and W negative
|
||||
}
|
||||
|
||||
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data CWorld = CWorld
|
||||
--{ _cameraCenter :: Point2
|
||||
--, _cameraRot :: Float
|
||||
--, _cameraZoom :: Float -- smaller values zoom out
|
||||
--, _itemZoom :: Float
|
||||
--, _defaultZoom :: Float
|
||||
--, _cameraViewFrom :: Point2
|
||||
--, _viewDistance :: Float
|
||||
--, _boundBox :: [Point2]
|
||||
--, _boundDist :: (Float, Float, Float, Float) -- NSEW, S and W negative
|
||||
{ _cwCam :: CWCam
|
||||
, _creatures :: IM.IntMap Creature
|
||||
, _crZoning :: IM.IntMap (IM.IntMap IS.IntSet)
|
||||
@@ -186,19 +175,12 @@ data CWorld = CWorld
|
||||
, _seenLocations :: IM.IntMap (WdP2, String)
|
||||
, _selLocation :: Int
|
||||
, _distortions :: [Distortion]
|
||||
, _cwTime :: CWTime
|
||||
, _cwGen :: CWGen
|
||||
}
|
||||
|
||||
--deriving (Eq, Show, Read) --, Generic)
|
||||
--h--deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
data CWTime = CWTime
|
||||
{ _maybeWorld :: Maybe' CWorld
|
||||
, _rewindWorlds :: [CWorld]
|
||||
, _worldClock :: Int
|
||||
, _deathDelay :: Maybe Int
|
||||
}
|
||||
|
||||
--deriving (Eq, Show, Read) --, Generic)
|
||||
--h--deriving (Eq, Show, Read) --Generic, Flat)
|
||||
@@ -226,13 +208,12 @@ makeLenses ''CWorld
|
||||
makeLenses ''WorldBeams
|
||||
makeLenses ''CWCam
|
||||
makeLenses ''CWGen
|
||||
makeLenses ''CWTime
|
||||
concat
|
||||
<$> mapM
|
||||
(deriveJSON defaultOptions)
|
||||
[ ''WorldBeams
|
||||
, ''CWCam
|
||||
, ''CWGen
|
||||
, ''CWTime
|
||||
-- , ''CWTime
|
||||
, ''CWorld
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user