@urso/core 0.4.44 → 0.4.48

package/package.json

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

package/src/js/components/editor/_info.js

@@ -0,0 +1,4 @@
+Urso.Core.Components.Editor = {
+    Controller: require('./controller.js'),
+    Api: require('./api.js')
+};

package/src/js/components/editor/api.js

@@ -0,0 +1,72 @@
+class ComponentsEditorApi {
+
+    constructor() {
+
+    }
+
+    //styles
+    
+
+    //assets
+
+    /**
+     * returns types list and keys to create new asset
+     * @returns { types, keys }
+     */
+    getAssetTypes() {
+        const types = Urso.types.assets;
+        return { types, keys: this._assetsKeys };
+    }
+
+    /**
+     * get current assets list
+     * @returns {Array} assets list
+     */
+    getCurrentAssets() {
+        const template = Urso.template.get();
+        return template.assets;
+    }
+
+    /**
+     * add new asset into game
+     * @param {String} type 
+     * @param {Object} fields 
+     */
+    addAsset(type, fields) {
+        //return new asset system id
+    }
+
+
+    //objects
+    getCurrentObjects() {
+        return list;
+    }
+
+    getObjectsTypes() {
+        return list; // with fields keys
+    }
+
+    addObject() {
+        //return id
+    }
+
+    //settings
+    editObject(id, key, value) {
+
+    }
+
+    ////////////////  sys
+
+    _assetsKeys = {
+        ATLAS: ['key', 'path'], // path to json file
+        BITMAPFONT: ['key', 'path'], // path to json file
+        CONTAINER: ['name'],
+        FONT: ['key', 'path'],
+        IMAGE: ['key', 'path'],
+        JSON: ['key', 'path'],
+        SPINE: ['key', 'path'], // path to json file
+    }
+
+}
+
+module.exports = ComponentsEditorApi;

package/src/js/components/editor/controller.js

@@ -0,0 +1,13 @@
+ComponentsBaseController = require('./../base/controller.js');
+
+class ComponentsEditorController extends ComponentsBaseController {
+    constructor(params) {
+        super(params);
+
+        this._api = this.getInstance('Api');
+        window.api = this._api;
+    }
+
+}
+
+module.exports = ComponentsEditorController;

package/src/js/config/main.js

@@ -1,5 +1,6 @@
 let ConfigMain = {
     title: 'Urso', //game title
+    appVersion: 0, //app version, also used as anticache  "appVersion=${appVersion}" when not 0
     mode: "development", // development/production/testing
     extendingChain: ['Urso.Core'], //chain that will be set as Urso.Game
     defaultScene: 'play', //default scene to display

package/src/js/lib/loader.js

@@ -97,8 +97,13 @@ class LibLoader {
             return false;
 
         this._isRunning = true;
-
         const loader = new PIXI.Loader();
+        const appVersion = Urso.config.appVersion;
+
+        if (appVersion) {
+            loader.defaultQueryString = `appVersion=${appVersion}`;
+        }
+
         this._assetsQuery.forEach(asset => {
             // TODO: check to load
 

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

@@ -41,7 +41,20 @@ class ModulesObjectsModelsEmitter extends Urso.Core.Modules.Objects.BaseModel {
             if (texture)
                 textures.push(texture);
         }
-        this.emitter = new PIXI.particles.Emitter(this._baseObject, textures, cfg.data);
+
+        if (textures.length > 1) {
+            const texturesOptions = {
+                framerate: 20,
+                loop: true,
+                textures
+            };
+
+            this.emitter = new PIXI.particles.Emitter(this._baseObject, texturesOptions, cfg.data);
+            this.emitter.particleConstructor = PIXI.particles.AnimatedParticle; //import { AnimatedParticle } from "pixi-particles";
+        } else {
+            this.emitter = new PIXI.particles.Emitter(this._baseObject, textures, cfg.data);
+        }
+
         this.emitter.emit = this.autostart;
         this.emitter.autoUpdate = true;
     }

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

@@ -64,6 +64,24 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
      * @param {String[]} animations - names of the animations to be played
      */
     playInSequence(animations) {
+        this._playInSequenceAndThen(animations);
+    }
+
+    /**
+     * play spine animations in sequence and execute function after last animation completes
+     * @param {String[]} animations - names of the animations to be played
+     * @param {Function} func - function to be executed
+     */
+    playInSequenceAndThen(animations, func) {
+        this._playInSequenceAndThen(animations, func);
+    }
+
+    /**
+     * play spine animations in sequence and execute function after last animation completes
+     * @param {String[]} animations - names of the animations to be played
+     * @param {Function} func - function to be executed
+     */
+    _playInSequenceAndThen(animations, func) {
         this.stop();
         let removeSelf = () => { };
         let animationCount = 0;
@@ -75,6 +93,7 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
                 if (animations[animationCount])
                     this.play(animations[animationCount])
                 else {
+                    func && func();
                     removeSelf();
                 }
             }
@@ -85,29 +104,6 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
         this.play(animations[0]);
     }
 
-    /**
-     * play spine animations in sequence and execute function after last animation completes
-     * @param {String[]} animations - names of the animations to be played
-     * @param {Function} func - function to be executed
-     */
-    playInSequenceAndThen(animations, func) {
-        let animationsLeft = animations.length;
-        let removeSelf = () => { };
-
-        let completer = {
-            complete: () => {
-                if (--animationsLeft === 0) {
-                    func && func();
-                    removeSelf();
-                }
-            }
-        };
-
-        removeSelf = () => this._baseObject.state.removeListener(completer);
-        this._baseObject.state.addListener(completer);
-        this.playInSequence(animations);
-    }
-
     /**
      * stop track animation
      * @param {Number} [track] - you can define track number to stop
@@ -192,7 +188,7 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
     findSlot(name) {
         return this._baseObject.skeleton.findSlot(name)
     }
-    
+
     /**
      * returns skeleton's bone by it's name
      * @param {string} name 
@@ -211,7 +207,7 @@ class ModulesObjectsModelsSpine extends Urso.Core.Modules.Objects.BaseModel {
         return this._baseObject.spineData.findAnimation(name)
     }
 
-    
+
     /**
      * returns event from spineData by it's name
      * @param {string} name