@urso/core 0.7.0 → 0.7.1

package/package.json

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

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

@@ -14,7 +14,7 @@ class ComponentsEditorApi {
         const template = Urso.template.get();
         return template.styles;
     }
-    
+
 
     //assets
 
@@ -83,24 +83,44 @@ class ComponentsEditorApi {
     ////////////////  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
+        ATLAS: [{ name: 'key', type: 'text' }, { name: 'path', type: 'file' }], // path to json file
+        BITMAPFONT: [{ name: 'key', type: 'text' }, { name: 'path', type: 'file' }], // path to json file
+        CONTAINER: [{ name: 'key', type: 'text' }],
+        FONT: [{ name: 'key', type: 'text' }, { name: 'path', type: 'file' }], // path to json file
+        IMAGE: [{ name: 'key', type: 'text' }, { name: 'path', type: 'file' }], // path to json file
+        JSON: [{ name: 'key', type: 'text' }, { name: 'path', type: 'file' }], // path to json file
+        SPINE: [{ name: 'key', type: 'text' }, { name: 'path', type: 'file' }], // path to json file
     }
 
-    _commonObjectsKeys = ['id', 'name', 'class', 'x', 'y', 'z', 'anchorX', 'anchorY', 'scaleX', 'scaleY', 'angle', 'visible', 'alpha'];
+    _commonObjectsKeys = [
+        { name: 'id', type: 'text' },
+        { name: 'name', type: 'text' },
+        { name: 'class', type: 'text' },
+        { name: 'x', type: 'number' },
+        { name: 'y', type: 'number' },
+        { name: 'z', type: 'number' },
+        { name: 'anchorX', type: 'number', range: [-1, 1] },
+        { name: 'anchorY', type: 'number', range: [-1, 1] },
+        { name: 'scaleX', type: 'number' },
+        { name: 'scaleY', type: 'number' },
+        { name: 'angle', type: 'number', range: [0, 360] },
+        { name: 'alpha', type: 'number', range: [0, 1] },
+        { name: 'visible', type: 'boolean' },
+    ];
 
     _objectsKeys = {
-        BITMAPTEXT: Urso.helper.mergeArrays(this._commonObjectsKeys, ['text', 'fontName', 'fontSize']),
-        COMPONENT: Urso.helper.mergeArrays(this._commonObjectsKeys, ['componentName']),
+        BITMAPTEXT: Urso.helper.mergeArrays(this._commonObjectsKeys, [{ name: 'text', type: 'text' }, { name: 'fontName', type: 'text' }, { name: 'fontSize', type: 'text' }]),
+        COMPONENT: Urso.helper.mergeArrays(this._commonObjectsKeys, [{ name: 'componentName', type: 'text' }]),
         CONTAINER: this._commonObjectsKeys,
-        GROUP: Urso.helper.mergeArrays(this._commonObjectsKeys, ['groupName']),
-        IMAGE: Urso.helper.mergeArrays(this._commonObjectsKeys, ['assetKey']),
-        TEXT: Urso.helper.mergeArrays(this._commonObjectsKeys, ['text', 'fontFamily', 'fontSize', 'fill', 'stroke'])
+        GROUP: Urso.helper.mergeArrays(this._commonObjectsKeys, [{ name: 'groupName', type: 'text' }]),
+        IMAGE: Urso.helper.mergeArrays(this._commonObjectsKeys, [{ name: 'assetKey', type: 'text' }]),
+        TEXT: Urso.helper.mergeArrays(this._commonObjectsKeys, [
+            { name: 'text', type: 'text' },
+            { name: 'fontFamily', type: 'text' },
+            { name: 'fontSize', type: 'text' },
+            { name: 'fill', type: 'text' },
+            { name: 'stroke', type: 'text' }
+        ])
     }
 }
 

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();
     }