@urso/core 0.7.14 → 0.7.16

package/package.json

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

package/src/js/lib/loader.js

@@ -56,12 +56,13 @@ class LibLoader {
             case Urso.types.assets.BITMAPFONT:
                 Urso.cache.addBitmapFont(asset.key, resource);
                 break;
-            case Urso.types.assets.FONT:
-                Urso.cache.addFile(asset.key, resource);
-                break;
             case Urso.types.assets.CONTAINER:
                 Urso.cache.addContainer(asset.key, resource);
                 break;
+            case Urso.types.assets.FONT:
+            case Urso.types.assets.HTML:
+                Urso.cache.addFile(asset.key, resource);
+                break;
             case Urso.types.assets.IMAGE:
                 Urso.cache.addImage(asset.key, resource);
                 break;

package/src/js/modules/assets/models/_info.js

@@ -1,11 +1,12 @@
 Urso.Core.Modules.Assets.Models = {
-    Audiosprite: require('./audiosprite.js'),
     Atlas: require('./atlas.js'),
+    Audiosprite: require('./audiosprite.js'),
     BitmapFont: require('./bitmapFont.js'),
     Container: require('./container.js'),
+    Font: require('./font.js'),
+    Html: require('./html.js'),
     Image: require('./image.js'),
     Json: require('./json.js'),
     Sound: require('./sound.js'),
-    Font: require('./font.js'),
     Spine: require('./spine.js')
 };

package/src/js/modules/assets/models/html.js

@@ -0,0 +1,9 @@
+class ModulesAssetsModelsHtml extends Urso.Core.Modules.Assets.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.assets.HTML;
+    }
+}
+
+module.exports = ModulesAssetsModelsHtml;

package/src/js/modules/assets/service.js

@@ -315,33 +315,36 @@ class ModulesAssetsService {
         let model;
 
         switch (asset.type) {
-            case Urso.types.assets.IMAGE:
-                model = this.getInstance('Models.Image', asset)
-                break;
-            case Urso.types.assets.CONTAINER:
-                model = this.getInstance('Models.Container', asset)
-                break;
             case Urso.types.assets.ATLAS:
                 model = this.getInstance('Models.Atlas', asset)
                 break;
             case Urso.types.assets.AUDIOSPRITE:
                 model = this.getInstance('Models.Audiosprite', asset)
                 break;
-            case Urso.types.assets.JSON:
-                model = this.getInstance('Models.Json', asset)
-                break;
-            case Urso.types.assets.SPINE:
-                model = this.getInstance('Models.Spine', asset)
-                break;
             case Urso.types.assets.BITMAPFONT:
                 model = this.getInstance('Models.BitmapFont', asset)
                 break;
+            case Urso.types.assets.CONTAINER:
+                model = this.getInstance('Models.Container', asset)
+                break;
             case Urso.types.assets.FONT:
                 model = this.getInstance('Models.Font', asset)
                 break;
+            case Urso.types.assets.HTML:
+                model = this.getInstance('Models.Html', asset)
+                break;
+            case Urso.types.assets.IMAGE:
+                model = this.getInstance('Models.Image', asset)
+                break;
+            case Urso.types.assets.JSON:
+                model = this.getInstance('Models.Json', asset)
+                break;
             case Urso.types.assets.SOUND:
                 model = this.getInstance('Models.Sound', asset)
                 break;
+            case Urso.types.assets.SPINE:
+                model = this.getInstance('Models.Spine', asset)
+                break;
             default:
                 Urso.logger.error('ModulesAssetsService asset type error', asset);
                 break;

package/src/js/modules/objects/models/spine.js

@@ -71,6 +71,15 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
         this._baseObject.skeleton.setToSetupPose();
     }
 
+    /**
+     * set skin by name and reset animation to first frame
+     * @param {String} skinName
+     */
+    setSkinByNameAndReset(skinName) {
+        this.setSkinByName(skinName);
+        this.setToSetupPose();
+    }
+
     /**
      * play spine animation and execute function after animation completes
      * @param {String} animation - name of the animation to be played
@@ -130,6 +139,15 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
      * @param {Number} [track] - you can define track number to stop
      */
     stopTrack(track) {
+        this.clearTrack(track);
+        this._baseObject.state.addEmptyAnimation(track, 0.2, 0); //int trackIndex, float mixDuration, float delay
+    }
+
+    /**
+     * clear track animation
+     * @param {Number} [track] - you can define track number to stop
+     */
+    clearTrack(track) {
         this._baseObject.state.clearTrack(track);
     }
 

package/src/js/modules/template/types.js

@@ -10,7 +10,8 @@ class ModulesTemplateTypes {
                 IMAGE: 6,
                 JSON: 7,
                 SOUND: 8,
-                SPINE: 9
+                SPINE: 9,
+                HTML: 100
             },
 
             objects: {