Reify cloud drawing, move gust data

2022-07-23 19:09:54 +01:00
parent f4808676e2
commit 9d92cbfb9e
8 changed files with 56 additions and 25 deletions
@@ -2,19 +2,26 @@
 {-# LANGUAGE StrictData #-}
 module Dodge.Data.Cloud where
 import Geometry
-import Picture
+import Color
 import Control.Lens
+
+data CloudDraw = CloudColor Float Float Color -- radius-multiply fade-time color
+    | DrawGasCloud Color
+  deriving (Eq,Ord,Show,Read)
+
 data Cloud = Cloud
    { _clPos :: Point3
    , _clVel :: Point3
-    , _clPict :: Cloud -> Picture
+    , _clPict :: CloudDraw
    , _clRad :: Float
    , _clAlt :: Float
    , _clTimer :: Int
    , _clType :: CloudType
 --    , _clEffect :: Cloud -> World -> World
    }
+  deriving (Eq,Ord,Show,Read)
 data CloudType
    = SmokeCloud
    | GasCloud
+  deriving (Eq,Ord,Show,Read)
 makeLenses ''Cloud