@urso/core 0.6.10 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.6.10",
+  "version": "0.7.0",
   "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/components/editor/api.js

@@ -5,6 +5,15 @@ class ComponentsEditorApi {
     }
 
     //styles
+    //TODO
+    addStyle() {
+        //TODO
+    }
+
+    getCurrentStyles() {
+        const template = Urso.template.get();
+        return template.styles;
+    }
     
 
     //assets
@@ -29,25 +38,41 @@ class ComponentsEditorApi {
 
     /**
      * add new asset into game
-     * @param {String} type 
-     * @param {Object} fields 
+     * @param {String} assetModel
+     * @param {Function} callback
      */
-    addAsset(type, fields) {
-        //return new asset system id
+    addAsset(assetModel, callback) {
+        Urso.assets.preload([assetModel], callback);
     }
 
 
     //objects
+
+    /**
+     * get current objects list
+     * @returns {Array} objects list
+     */
     getCurrentObjects() {
-        return list;
+        const template = Urso.template.get();
+        return template.objects;
     }
 
+    /**
+     * returns types list and keys to create new object
+     * @returns { types, keys }
+     */
     getObjectsTypes() {
-        return list; // with fields keys
+        const types = Urso.types.objects;
+        return { types, keys: this._objectsKeys };
     }
 
-    addObject() {
-        //return id
+    /**
+     * add new object into game
+     * @param {Object} objectModel
+     * @param {Object} parent
+     */
+    addObject(objectModel, parent) {
+        Urso.objects.create(objectModel, parent);
     }
 
     //settings
@@ -67,6 +92,16 @@ class ComponentsEditorApi {
         SPINE: ['key', 'path'], // path to json file
     }
 
+    _commonObjectsKeys = ['id', 'name', 'class', 'x', 'y', 'z', 'anchorX', 'anchorY', 'scaleX', 'scaleY', 'angle', 'visible', 'alpha'];
+
+    _objectsKeys = {
+        BITMAPTEXT: Urso.helper.mergeArrays(this._commonObjectsKeys, ['text', 'fontName', 'fontSize']),
+        COMPONENT: Urso.helper.mergeArrays(this._commonObjectsKeys, ['componentName']),
+        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'])
+    }
 }
 
 module.exports = ComponentsEditorApi;

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

@@ -5,7 +5,7 @@ class ComponentsEditorController extends ComponentsBaseController {
         super(params);
 
         this._api = this.getInstance('Api');
-        window.api = this._api;
+        Urso.helper.recursiveSet('_dev.editorApi', this._api, Urso);
     }
 
 }

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/scenes/service.js

@@ -58,7 +58,7 @@ class ModulesScenesService {
 
         if (newTemplatePart.assets.length) {
             Urso.assets.preload(newTemplatePart.assets, () => this._newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag));
-            return null; //objects will be created soon. Maybe we can return a promice
+            return null; //objects will be created soon. Maybe we can return a promice //todo
         } else
             return this._newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag);
     }

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.`);
         }