Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed modules after restructuring UI data

Browse Source
This commit is contained in:
tpajenka 2014-05-03 14:51:24 +02:00
parent ca51c23650
commit ad0e569537
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Types.hs
View File

@ -12,7 +12,7 @@ import Control.Monad.RWS.Strict (RWST)
import Control.Lens import Control.Lens
import Graphics.Rendering.OpenGL.GL.Texturing.Objects (TextureObject) import Graphics.Rendering.OpenGL.GL.Texturing.Objects (TextureObject)
import Render.Types import Render.Types
import UI.UIBaseData import UI.UIBase
--Static Read-Only-State --Static Read-Only-State

7
src/UI/Callbacks.hs
View File

@ -12,12 +12,11 @@ import Data.Maybe
import Foreign.Marshal.Array (pokeArray) import Foreign.Marshal.Array (pokeArray)
import Foreign.Marshal.Alloc (allocaBytes) import Foreign.Marshal.Alloc (allocaBytes)
import qualified Graphics.UI.SDL as SDL import qualified Graphics.UI.SDL as SDL
import Render.Misc (genColorData)
import Render.Misc (curb,genColorData)
import Types import Types
import Render.Misc (curb) -- TODO: necessary import ? import UI.UIWidgets
import UI.UIBaseData
import UI.UIClasses
import UI.UIOperations import UI.UIOperations

6
src/UI/UIBaseData.hs → src/UI/UIBase.hs
View File

@ -1,7 +1,7 @@
{-# LANGUAGE GeneralizedNewtypeDeriving, TemplateHaskell, DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving, TemplateHaskell, DeriveGeneric #-}
-- data and classes are separated into several modules to avoid cyclic dependencies with the Type module -- widget data is separated into several modules to avoid cyclic dependencies with the Type module
-- TODO: exclude UIMouseState constructor -- TODO: exclude UIMouseState constructor from export?
module UI.UIBaseData where module UI.UIBase where
import Control.Lens ((^.), (.~), (%~), (&), ix, to, mapped, traverse, makeLenses) import Control.Lens ((^.), (.~), (%~), (&), ix, to, mapped, traverse, makeLenses)
import Control.Monad (liftM) import Control.Monad (liftM)

2
src/UI/UIOperations.hs
View File

@ -6,7 +6,7 @@ import qualified Data.HashMap.Strict as Map
import Data.Maybe import Data.Maybe
import Types import Types
import UI.UIBaseData import UI.UIBase
toGUIAny :: Map.HashMap UIId (GUIWidget m) -> UIId -> GUIWidget m toGUIAny :: Map.HashMap UIId (GUIWidget m) -> UIId -> GUIWidget m
toGUIAny m uid = fromMaybe (error "map does not contain requested key") (Map.lookup uid m) toGUIAny m uid = fromMaybe (error "map does not contain requested key") (Map.lookup uid m)

4
src/UI/UIClasses.hs → src/UI/UIWidgets.hs
View File

@ -1,6 +1,6 @@
{-# LANGUAGE InstanceSigs, MultiParamTypeClasses, FlexibleInstances #-} {-# LANGUAGE InstanceSigs, MultiParamTypeClasses, FlexibleInstances #-}
module UI.UIClasses (module UI.UIClasses, module UI.UIBaseData) where module UI.UIWidgets (module UI.UIWidgets, module UI.UIBase) where
import Control.Lens ((^.), (.~), (&)) import Control.Lens ((^.), (.~), (&))
import Control.Monad import Control.Monad
@ -11,7 +11,7 @@ import Data.Maybe
import qualified Data.HashMap.Strict as Map import qualified Data.HashMap.Strict as Map
import Types import Types
import UI.UIBaseData import UI.UIBase
createContainer :: (Monad m) => (ScreenUnit, ScreenUnit, ScreenUnit, ScreenUnit) -> [UIId] -> Int -> GUIWidget m createContainer :: (Monad m) => (ScreenUnit, ScreenUnit, ScreenUnit, ScreenUnit) -> [UIId] -> Int -> GUIWidget m