Allow sounds to be reset on frames.

Wicklets · Sep 28, 2020 · faf1781 · faf1781
1 parent f9c460c
commit faf1781
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/engine/dist/emptyproject.html b/engine/dist/emptyproject.html
@@ -14,7 +14,7 @@
         <!-- The Wick Engine build is injected here during the engine build step (see gulpfile.js) -->
         <script>
             /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.9.18.12.32.16";
+var WICK_ENGINE_BUILD_VERSION = "2020.9.28.15.26.35";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -55662,6 +55662,11 @@
   }
 
   set sound(soundAsset) {
+    if (!soundAsset) {
+      this.removeSound();
+      return;
+    }
+
     this._soundAssetUUID = soundAsset.uuid;
   }
   /**

diff --git a/engine/dist/wickengine.js b/engine/dist/wickengine.js
@@ -1,5 +1,5 @@
 /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.9.18.12.32.16";
+var WICK_ENGINE_BUILD_VERSION = "2020.9.28.15.26.35";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -55647,6 +55647,11 @@ Wick.Frame = class extends Wick.Tickable {
   }
 
   set sound(soundAsset) {
+    if (!soundAsset) {
+      this.removeSound();
+      return;
+    }
+
     this._soundAssetUUID = soundAsset.uuid;
   }
   /**

diff --git a/engine/src/base/Frame.js b/engine/src/base/Frame.js
@@ -117,6 +117,11 @@ Wick.Frame = class extends Wick.Tickable {
     }
 
     set sound(soundAsset) {
+        if (!soundAsset) { 
+            this.removeSound();
+            return;
+        }
+
         this._soundAssetUUID = soundAsset.uuid;
     }
 

diff --git a/public/corelibs/wick-engine/emptyproject.html b/public/corelibs/wick-engine/emptyproject.html
@@ -14,7 +14,7 @@
         <!-- The Wick Engine build is injected here during the engine build step (see gulpfile.js) -->
         <script>
             /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.9.18.12.32.16";
+var WICK_ENGINE_BUILD_VERSION = "2020.9.28.15.26.35";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -55662,6 +55662,11 @@
   }
 
   set sound(soundAsset) {
+    if (!soundAsset) {
+      this.removeSound();
+      return;
+    }
+
     this._soundAssetUUID = soundAsset.uuid;
   }
   /**

diff --git a/public/corelibs/wick-engine/wickengine.js b/public/corelibs/wick-engine/wickengine.js
@@ -1,5 +1,5 @@
 /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.9.18.12.32.16";
+var WICK_ENGINE_BUILD_VERSION = "2020.9.28.15.26.35";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -55647,6 +55647,11 @@ Wick.Frame = class extends Wick.Tickable {
   }
 
   set sound(soundAsset) {
+    if (!soundAsset) {
+      this.removeSound();
+      return;
+    }
+
     this._soundAssetUUID = soundAsset.uuid;
   }
   /**

diff --git a/src/Editor/Modals/BuiltinLibrary/BuiltinLibrary.jsx b/src/Editor/Modals/BuiltinLibrary/BuiltinLibrary.jsx
@@ -64,7 +64,6 @@ class BuiltinLibrary extends Component {
   importForPreview = (asset, callback) => {
     var path = BuiltinLibrary.ROOT_ASSET_PATH + asset.file;
 
-    console.log(asset, callback, path);
     fetch (path)
     .then((response) => response.blob())
     .then((blob) => {