From 84cd30d8e551a6d269064c6e589574909a307cc5 Mon Sep 17 00:00:00 2001 From: nek0 Date: Fri, 10 Aug 2018 11:34:46 +0200 Subject: [PATCH] cleaning --- src/Object.hs | 27 --------------------------- src/Types/UserData.hs | 28 ---------------------------- 2 files changed, 55 deletions(-) diff --git a/src/Object.hs b/src/Object.hs index d98541d..b0713ae 100644 --- a/src/Object.hs +++ b/src/Object.hs @@ -12,33 +12,6 @@ import Data.Ecstasy import Types instance ObjectAction ObjType ObjState where - -- objectAction ObjCopier "idle" ent = do - -- ud <- getAffection - -- (nws, _) <- liftIO $ yieldSystemT (worldState ud) $ do - -- emap (anEnt ent) $ do - -- with anim - -- mtime <- queryMaybe objStateTime - -- case mtime of - -- Nothing -> do - -- liftIO $ logIO Debug "copying!" - -- let nstat = AnimState - -- (AnimId "copier" "copy" N) - -- 0 - -- 0 - -- return unchanged - -- { anim = Set nstat - -- , objStateTime = Set 5 - -- , objState = "copying" - -- } - -- Just ttl -> do - -- dt <- getDelta - -- return unchanged - -- { objStateTime = Set (ttl - dt) - -- } - -- putAffection ud - -- { worldState = nws - -- } - objectAction dt t@ObjCopier s@"copying" ent = do emap (anEnt ent) $ do mtime <- queryMaybe objStateTime diff --git a/src/Types/UserData.hs b/src/Types/UserData.hs index 7c977ad..b58f208 100644 --- a/src/Types/UserData.hs +++ b/src/Types/UserData.hs @@ -54,34 +54,6 @@ data SubMain = WorldMap | MindMap --- data Entity f = Entity --- { pos :: Component f 'Field (V2 Double) --- , mmpos :: Component f 'Field (V2 Double) --- , gridPos :: Component f 'Field (V2 Int) --- , vel :: Component f 'Field (V2 Double) --- , mmvel :: Component f 'Field (V2 Double) --- , velFact :: Component f 'Field Double --- , rot :: Component f 'Field Direction --- , obstacle :: Component f 'Field (Boundaries Double) --- , player :: Component f 'Unique () --- , npcMoveState :: Component f 'Field NPCMoveState --- , anim :: Component f 'Field AnimState --- , objAccess :: Component f 'Field ((V2 Int), Direction) --- , objType :: Component f 'Field ObjType --- , objState :: Component f 'Field ObjState --- , objStateTime :: Component f 'Field Double --- } --- deriving (Generic) --- --- data NPCMoveState --- = NPCWalking --- { npcWalkPath :: [V2 Int] --- } --- | NPCStanding --- { npcStandTime :: Double --- , npcFuturePath :: MVar [V2 Int] --- } - data Subsystems = Subsystems { subWindow :: Window , subMouse :: Mouse