Fix switch detection, cleanup

src/Dodge/Data/Button.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -13,8 +13,7 @@ import Dodge.Data.WorldEffect
 import Geometry.Data
 
 data ButtonEvent
-    = ButtonDoNothing
-    | ButtonPress
+    = ButtonPress
         { _btOn :: Bool
         , _bpEff :: WdWd
         , _bpColor :: Color
@@ -27,31 +26,16 @@ data ButtonEvent
         , _btOn :: Bool
         }
     | ButtonAccessTerminal
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data Button = Button
-    {
--- _btPict :: ButtonDraw --Button -> SPic
-     _btPos :: Point2
+    { _btPos :: Point2
     , _btRot :: Float
-    , _btEvent :: ButtonEvent --Button -> World -> World
+    , _btEvent :: ButtonEvent
     , _btID :: Int
---    , _btText :: String
---    , _btState :: ButtonState
     , _btTermMID :: Maybe Int
-    , _btName :: String
-    , _btColor :: Color
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
-
---data ButtonState = BtOn | BtOff | BtInactive
---    deriving Eq -- (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Button
 makeLenses ''ButtonEvent
---deriveJSON defaultOptions ''ButtonDraw
---deriveJSON defaultOptions ''ButtonState
 deriveJSON defaultOptions ''ButtonEvent
 deriveJSON defaultOptions ''Button