@urso/core 0.6.10 → 0.6.12

package/package.json

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

package/src/js/components/_info.js

@@ -3,6 +3,7 @@ Urso.Core.Components = {};
 require('./base/_info.js');
 require('./debug/_info.js');
 require('./deviceRotate/_info.js');
+//require('./editor/_info.js');
 require('./fullscreen/_info.js');
 require('./layersSwitcher/_info.js');
 require('./loader/_info.js');

package/src/js/modules/scenes/pixiWrapper.js

@@ -42,7 +42,7 @@ class ModulesScenesPixiWrapper {
         this._createWorld();
 
         // setup interaction
-        this.interaction = new PIXI.InteractionManager(this.renderer);
+        this.interaction = Urso.helper.recursiveGet('plugins.interaction', this.renderer) || new PIXI.InteractionManager(this.renderer);
 
         this._loaderScene = this.getInstance('Model');
         this._requestAnimFrame(this._loop);

package/src/js/modules/statesManager/action.js

@@ -3,6 +3,7 @@ class ModulesStatesManagerAction {
     constructor(name) {
         this.name = name;
 
+        this._running = false;
         this._terminating = false;
         this.finished = false;
         this._onFinishCallback = false;
@@ -12,10 +13,11 @@ class ModulesStatesManagerAction {
 
     //can we start this action?
     guard() {
-        return this.getInstance('Controller').checkActionGuard(this.name);
+        return !this._running && this.getInstance('Controller').checkActionGuard(this.name);
     }
 
     run(onFinishCallback) {
+        this._running = true;
         log(`%c action run ---> ${this.name}`, 'color: blue');
 
         this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_START, this.name);
@@ -31,6 +33,11 @@ class ModulesStatesManagerAction {
     }
 
     terminate() {
+        if (!this._running) {
+            Urso.logger.warn('ModulesStatesManagerAction: action run from terminating', this.name);
+            this.run(() => { });
+        }
+
         if (this._terminating) {
             Urso.logger.error('ModulesStatesManagerAction: action alredy terminating', this.name);
             return;
@@ -47,11 +54,12 @@ class ModulesStatesManagerAction {
             return;
         }
 
+        this._running = false;
         this._terminating = false;
         this.finished = true;
 
         this.emit(Urso.events.MODULES_STATES_MANAGER_ACTION_FINISH, this.name);
-        
+
         log(`%c action finish <--- ${this.name}`, 'color: blue');
         this._onFinishCallback();
     }

package/src/js/modules/template/service.js

@@ -87,7 +87,7 @@ class ModulesTemplateService {
         let componentInstance = Urso.getInstance(path, obj.options);
 
         if (!componentInstance) {
-            Urso.logger.error(`ModulesTemplateController Component error. Component ${obj.componentName} not found. Please check components _info.js file.`);
+            Urso.logger.error(`ModulesTemplateController Component error. Component "${obj.componentName}" not found. Please check components _info.js file.`);
             Urso.logger.error(`To use only templates use Groups please.`);
         }
 

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

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

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

@@ -1,72 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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;