@urso/core 0.8.3 → 0.8.5-dev

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.8.3",
+  "version": "0.8.5-dev",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/extra/main.js

@@ -17,3 +17,9 @@ window.gsap = gsap;
 
 import Howler from 'howler';
 window.Howler = Howler;
+
+window.UrsoUtils = {
+    Howler: Howler,
+    gsap: gsap,
+    PIXI: PIXI
+};

package/src/js/modules/soundManager/controller.js

@@ -3,7 +3,6 @@ class SoundManagerController {
         this._systemVolume = 1;
         this._globalVolume = 0;
 
-        this._howler = null;
         this._codecsToCheck = ['ogg', 'm4a', 'mp3', 'wav'];
         this._selectedCodec = null;
         this._sounds = {};
@@ -16,7 +15,7 @@ class SoundManagerController {
 
     _setCodec() {
         for (const codec of this._codecsToCheck) {
-            if (Howler.Howler.codecs(codec)) {
+            if (UrsoUtils.Howler.Howler.codecs(codec)) {
                 this._selectedCodec = codec;
                 return;
             }
@@ -36,7 +35,8 @@ class SoundManagerController {
             const soundSptite = this.getInstance('SoundSprite', {
                 sprite: json.sprite,
                 name: soundKey,
-                audiosprite
+                audiosprite,
+                codec: this._selectedCodec
             });
 
             this._sounds[soundKey] = soundSptite;

package/src/js/modules/soundManager/soundSprite.js

@@ -1,12 +1,13 @@
 const DUMMY_SOUND_DELAY = 500; // ms
 class SoundSprite {
-    constructor({ name, sprite, audiosprite }) {
+    constructor({ name, sprite, audiosprite, codec }) {
         this._player = null;
         this._totalVolume = 0;
         this._makePlayer(sprite, audiosprite);
 
         this._name = name;
         this._sprite = sprite;
+        this._codec = codec;
 
         this._soundsState = this._initSoundsState();
 
@@ -14,9 +15,11 @@ class SoundSprite {
         this._fadeTweens = {};
         this._eventsQueue = [];
         this._isAudioUnlocked = false;
-        this._reactToEvent = this._reactToEvent.bind(this);
         this._timeout = null;
         this._dummy = null;
+
+        this._reactToEvent = this._reactToEvent.bind(this);
+        this._audioUnlockHandler = this._audioUnlockHandler.bind(this);
     };
 
 
@@ -37,7 +40,7 @@ class SoundSprite {
         return soundsStateObj;
     }
 
-    _makePlayer(sprite, audiosprite) {
+    _makePlayer_Bak(sprite, audiosprite) {
         var reader = new FileReader();
         reader.readAsDataURL(audiosprite);
         reader.onloadend = () => {
@@ -50,12 +53,39 @@ class SoundSprite {
         }
     };
 
-    _subscribePlayerEvents() {
-        this._player.on('unlock', () => setTimeout(() => {
-            this._isAudioUnlocked = true;
+    _makePlayer(sprite, audiosprite) {
+        if (!this._codec) {
+            return;
+        }
+
+        const reader = new FileReader();
+        const blob = new Blob([audiosprite], { type: `audio/${this._codec}` });
+
+        reader.onloadend = () => {
+            var { result: src } = reader;
+            this._player = new Howl({ src, sprite });
+            this._subscribePlayerEvents();
+
             this._onUnlock();
-            this.emit(Urso.events.MODULES_SOUND_MANAGER_CONTEXT_UNLOCKED);
-        }, 1000));
+        }
+
+        reader.readAsDataURL(blob);
+    };
+
+    _audioUnlockHandler() {
+        this._isAudioUnlocked = true;
+        this._onUnlock();
+        this.emit(Urso.events.MODULES_SOUND_MANAGER_CONTEXT_UNLOCKED);
+    }
+
+    _subscribePlayerEvents() {
+        if (UrsoUtils.Howler.Howler._audioUnlocked) {
+            this._audioUnlockHandler();
+        } else {
+            this._player.on('unlock', () => setTimeout(() => {
+                this._audioUnlockHandler();
+            }, 1000));
+        }
 
         this._player.on('end', id => {
             const soundState = this._getSoundStateById(id);