Cleanup door mounts, noticed space leak when no debug-display paths
This commit is contained in:
@@ -10,7 +10,6 @@ module Dodge.Data.CWorld (
|
||||
import Control.Lens
|
||||
import Data.Aeson
|
||||
import Data.Aeson.TH
|
||||
--import Data.Graph.Inductive
|
||||
import Data.Tile
|
||||
import Dodge.Data.Camera
|
||||
import Dodge.Data.LWorld
|
||||
@@ -19,13 +18,15 @@ import Geometry.ConvexPoly
|
||||
import Geometry.Data
|
||||
import qualified Data.Vector as V
|
||||
import qualified Data.Vector.Unboxed as UV
|
||||
import qualified Data.IntMap.Strict as IM
|
||||
|
||||
data CWorld = CWorld
|
||||
{ _lWorld :: LWorld
|
||||
, _cwGen :: CWGen
|
||||
, _cClock :: Int
|
||||
, _cwTiles :: [Tile]
|
||||
, _incGraph :: V.Vector [(Int,SimpleEdge)]
|
||||
-- , _incGraph :: V.Vector [(Int,SimpleEdge)]
|
||||
, _incGraph :: V.Vector (IM.IntMap SimpleEdge)
|
||||
, _incNode :: UV.Vector Point2
|
||||
, _incEdges :: [(Int,Int)]
|
||||
, _numberFloorVerxs :: Int
|
||||
|
||||
@@ -55,7 +55,7 @@ data PSType
|
||||
| PutDoor {_putDoorDoor :: Door, _putDoorWall :: Wall}
|
||||
| RandPS (State StdGen PSType)
|
||||
| PutForeground ForegroundShape
|
||||
| PutWorldUpdate (Int -> PlacementSpot -> GenWorld -> GenWorld)
|
||||
| PutWorldUpdate (Int -> PlacementSpot -> GenWorld -> GenWorld) -- the Int is the roomid
|
||||
| PutNothing
|
||||
| PutID {_putID :: Int}
|
||||
| PutChasm {_putChasmPoly :: [Point2]}
|
||||
|
||||
@@ -9,9 +9,7 @@ import Data.Aeson
|
||||
import Data.Aeson.TH
|
||||
|
||||
data MountedObject
|
||||
= MountedLS Int
|
||||
| MountedProp Int
|
||||
| MountedLight Point3 Float Point3
|
||||
= MountedLight Point3 Float Point3
|
||||
| MountedSPic SPic
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user