Merge branch 'dev'

Chapitalists · Mar 1, 2020 · 607d1f9 · 607d1f9
2 parents 82c2268 + 6ff5402
commit 607d1f9
Show file tree

Hide file tree

Showing 10 changed files with 740 additions and 318 deletions.
diff --git a/elm.json b/elm.json
@@ -17,6 +17,7 @@
             "elm/json": "1.1.3",
             "elm/random": "1.0.0",
             "elm/svg": "1.0.1",
+            "elm/time": "1.0.0",
             "elm/url": "1.0.0",
             "elm-community/typed-svg": "5.1.0",
             "elm-community/undo-redo": "3.0.0",
@@ -33,7 +34,6 @@
         "indirect": {
             "elm/bytes": "1.0.8",
             "elm/regex": "1.0.0",
-            "elm/time": "1.0.0",
             "elm/virtual-dom": "1.0.2",
             "kuon/elm-string-normalize": "1.0.1"
         }

diff --git a/pkgConfig.json b/pkgConfig.json
@@ -6,6 +6,7 @@
     , "ports.html"
     , "ports.js"
     , "elmApp.js"
+    , "lib/recorder.js"
     , "lib/svg.js"
     , "lib/Tone.js"
     , "LICENSE.md"

diff --git a/src/Data/Wheel.elm b/src/Data/Wheel.elm
diff --git a/src/Editor/Interacting.elm b/src/Editor/Interacting.elm
@@ -3,15 +3,18 @@ module Editor.Interacting exposing (..)
 import Coll exposing (Id)
 import Data.Common exposing (Identifier)
 import Data.Mobile exposing (Geer)
+import Link exposing (Link)
 import Pack exposing (Packed)
 import Sound exposing (Sound)
 
 
 type Interactable
     = ISurface
+    | IPack
     | IWheel Identifier
     | IResizeHandle (Id Geer) Bool -- True = right
-    | IPack (Id Packed)
+    | IPacked (Id Packed)
+    | ILink (Link Geer)
     | ISound Sound