@urso/core 0.4.50 → 0.4.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.4.50",
+  "version": "0.4.53",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",
@@ -23,6 +23,7 @@
   "homepage": "https://github.com/megbrimef/urso#readme",
   "dependencies": {
     "@pixi/filter-drop-shadow": "^3.2.0",
+    "@urso/revolt-fx": "^0.1.0",
     "gsap": "^3.1.1",
     "howler": "^2.2.1",
     "pixi-particles": "^4.3.0",

package/src/js/config/main.js

@@ -2,6 +2,7 @@ let ConfigMain = {
     title: 'Urso', //game title
     appVersion: 0, //app version, also used as anticache  "appVersion=${appVersion}" when not 0
     mode: "development", // development/production/testing
+    defaultLogLevel: 'ERROR,WARNING,INFO,LOG', //setup custom log level with:  ?logLevel=1,2,3,4  OR  ?logLevel=ERROR,WARNING,INFO,LOG
     extendingChain: ['Urso.Core'], //chain that will be set as Urso.Game
     defaultScene: 'play', //default scene to display
     useBinPath: false, // use assets from bin directory

package/src/js/extra/_info.js

@@ -2,6 +2,8 @@ import * as PIXI from 'pixi.js';
 window.PIXI = PIXI;
 window.PIXI.particles = require('pixi-particles');
 
+window.PIXI.particlesFx = require('@urso/revolt-fx');
+
 import { DropShadowFilter } from '@pixi/filter-drop-shadow';
 PIXI.filters['DropShadowFilter'] = DropShadowFilter;
 

package/src/js/lib/logger.js

@@ -1,23 +1,69 @@
-class LibLogger {
+//setup custom log level with:  ?logLevel=1,2,3,4  OR  ?logLevel=ERROR,WARNING,INFO,LOG
+
+const LEVELS = [
+    'ERROR',
+    'WARNING',
+    'INFO',
+    'LOG'
+];
 
+class LibLogger {
     constructor() {
+        this._logLevel = {};
+        this._setupLevels();
+
         //log
-        window.log = console.log.bind(console);  //todo this.log ?!
+        if (this._logLevel['LOG']) {
+            window.log = console.log.bind(console);
+        } else {
+            window.log = console.log = () => { }
+        }
     }
 
     //todo set log level (dev/prod)
 
     log() {
+        if (!this._logLevel['LOG']) return;
+
         console.log.apply(console, arguments);
     }
 
+    info() {
+        if (!this._logLevel['INFO']) return;
+
+        console.info.apply(this, arguments);
+    }
+
     warn() {
+        if (!this._logLevel['WARNING']) return;
+
         console.warn.apply(this, arguments);
     }
 
     error() {
+        if (!this._logLevel['ERROR']) return;
+
         console.error.apply(this, arguments);
     }
+
+    /**
+     * setup logging levels
+     */
+    _setupLevels() {
+        const logLevelsString = Urso.helper.parseGetParams('logLevel') || Urso.config.defaultLogLevel;
+        const logLevelsArray = logLevelsString.split(',');
+
+        for (const [index, level] of Object.entries(LEVELS)) {
+            let levelValue = false;
+
+            if (logLevelsArray.includes(index) || logLevelsArray.includes(level))
+                levelValue = true;
+
+            this._logLevel[level] = levelValue;
+        }
+
+        console.log(`LibLogger log Level: ${JSON.stringify(this._logLevel)}`);
+    }
 }
 
-module.exports = LibLogger;
+module.exports = LibLogger;

package/src/js/modules/objects/create.js

@@ -101,6 +101,9 @@ class ModulesObjectsCreate {
             case Urso.types.objects.NINESLICEPLANE:
                 model = this.getInstance('Models.NineSlicePlane', object);
                 break;
+            case Urso.types.objects.EMITTERFX:
+                model = this.getInstance('Models.EmitterFx', object);
+                break;
 
             default:
                 const objectName = Urso.helper.capitaliseFirstLetter(

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

@@ -8,6 +8,7 @@ Urso.Core.Modules.Objects.Models = {
     Component: require('./component.js'),
     Container: require('./container.js'),
     Emitter: require('./emitter.js'),
+    EmitterFx: require('./emitterFx.js'),
     Graphics: require('./graphics.js'),
     Group: require('./group.js'),
     HitArea: require('./hitArea.js'),

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

@@ -0,0 +1,99 @@
+class ModulesObjectsModelsEmitterFx extends Urso.Core.Modules.Objects.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.objects.EMITTERFX;
+
+        this.emitter = null;
+        this.update = this.update.bind(this);
+
+        this._addBaseObject();
+        this._createBundle();   
+    }
+
+    /**
+     * 
+     * @param {Object} params
+     * 
+     * - Params have to contain 'cfg' which is a key of JSON config made via 
+     * https://editor.revoltfx.electronauts.net editor.
+     * - In a case config doesn't have textures described in it, you can use spritesheetFilter which should be a
+     * string, described common part of texures asset keys. That string will be used as filter to get textures from cache.
+     * If textures should be animated, texture's asset key have to be of the next format:
+     * mc_commonPart_01 - where 'mc' stands for 'movieclips' allows us use animation, commonPart - described all textures in a spriteSheet,
+     * and _01 - number of frame.
+     */
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.autostart = Urso.helper.recursiveGet('autostart', params, false);
+        this.cfg = Urso.helper.recursiveGet('cfg', params, false);
+        this.spritesheetFilter = Urso.helper.recursiveGet('spritesheetFilter', params, false);
+    }
+
+    update(deltaTime) {
+        if (this._emitter) {
+            this._bundle.update(deltaTime * PIXI.settings.TARGET_FPMS);
+        }
+    }
+
+    /**
+     * @param {String} emitterName
+     * Inits emitter by it's name. If no name given - inits first emitter from config.
+     */
+    play(emitterName) {
+        this._isActive = true;
+
+        emitterName = emitterName || this._defaultEmitterName;
+
+        this._emitter = this._bundle.getParticleEmitter(emitterName);
+        this._emitter.init(this._baseObject, true, 1);
+    }
+
+    /**
+     * 
+     * Stops emitter. If new emitter wasn't inited before particles disappears - clears this._emitter to stop bundle update.
+     */
+    stop() {
+        if(!this._emitter)
+            return;
+
+        this._emitter.stop();
+        this._emitter.on.completed.add(() => {
+            if(!this._isActive)
+                this._emitter = null;
+        });
+        
+        this._isActive = false;
+    }
+
+    _addBaseObject() {
+        this._baseObject = new PIXI.Container();
+    };
+
+    _createBundle() {
+        this._bundle = new PIXI.particlesFx.FX();
+        let fx_settings_data = Urso.cache.getJson(this.cfg).data;
+
+        if(this.spritesheetFilter)
+            fx_settings_data.spritesheetFilter = this.spritesheetFilter;
+
+        this._defaultEmitterName = fx_settings_data.emitters[0].name;
+
+        this._bundle.initBundle(fx_settings_data);
+        this.autostart && this.play();
+    }
+
+    _subscribeOnce() {
+        this.addListener(Urso.events.MODULES_SCENES_UPDATE, this.update);
+    }
+
+    _customDestroy() {
+        this.removeListener(Urso.events.MODULES_SCENES_UPDATE, this.update);
+        this._emitter.stop(false);
+        this._bundle = null;
+        this._emitter = null;
+    }
+}
+
+module.exports = ModulesObjectsModelsEmitterFx;

package/src/js/modules/objects/propertyAdapter.js

@@ -39,6 +39,7 @@ class PropertyAdapter {
         this._typesWithoutAnchor = [
             Urso.types.objects.CHECKBOX,
             Urso.types.objects.EMITTER,
+            Urso.types.objects.EMITTERFX,
             Urso.types.objects.GRAPHICS,
             Urso.types.objects.HITAREA,
             Urso.types.objects.MASK,

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

@@ -36,7 +36,8 @@ class ModulesTemplateTypes {
                 CHECKBOX: 20,
                 SCROLLBOX: 21,
                 TEXTINPUT: 22,
-                NINESLICEPLANE: 23
+                NINESLICEPLANE: 23,
+                EMITTERFX: 24
             }
         }
     }