@urso/core 0.3.12 → 0.4.0

package/package.json

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

package/src/js/lib/composition.js

@@ -1,48 +1,44 @@
 // Class for creating multi inheritance.
-class LibComposition
-{
+class LibComposition {
 	// Inherit method to create base classes.
-	static inherit(..._bases)
-	{
+	static inherit(..._bases) {
 		class classes {
 
 			// The base classes
-  			get base() { return _bases; }
+			get base() { return _bases; }
 
-			constructor(..._args)
-			{
+			constructor(..._args) {
 				let index = 0;
 
-				for (let b of this.base) 
-				{
+				for (let b of this.base) {
 					let obj = new b(_args[index++]);
-                    LibComposition.copy(this, obj);
+					LibComposition.copy(this, obj);
 				}
 			}
-		
+
 		}
 
 		// Copy over properties and methods
-		for (let base of _bases) 
-		{
-            LibComposition.copy(classes, base);
-            LibComposition.copy(classes.prototype, base.prototype);
+		for (let base of _bases) {
+			LibComposition.copy(classes, base);
+			LibComposition.copy(classes.prototype, base.prototype, true);
 		}
 
 		return classes;
 	}
 
 	// Copies the properties from one class to another
-	static copy(_target, _source) 
-	{
-    		for (let key of Reflect.ownKeys(_source)) 
-			{
-        		if (key !== "constructor" && key !== "prototype" && key !== "name") 
-				{
-	        	    let desc = Object.getOwnPropertyDescriptor(_source, key);
-	        	    Object.defineProperty(_target, key, desc);
-        		}
-    		}
+	static copy(_target, _source, protoFlag) {
+		for (let key of Reflect.ownKeys(_source)) {
+			if (key !== "constructor" && key !== "prototype" && key !== "name") {
+				let desc = Object.getOwnPropertyDescriptor(_source, key);
+				Object.defineProperty(_target, key, desc);
+			}
+		}
+
+		if (protoFlag && Object.getPrototypeOf(_source) !== Object.prototype) {
+			LibComposition.copy(_target, Object.getPrototypeOf(_source));
+		}
 	}
 }
 
@@ -50,7 +46,7 @@ module.exports = LibComposition;
 
 
 /**
- * 
+ *
  example:
 
 

package/src/js/modules/instances/controller.js

@@ -1,3 +1,6 @@
+const MODES_NAMESPACE = 'modifications';
+const MIXINS_NAMESPACE = 'mixins';
+
 class ModulesInstancesController {
     constructor() {
         this._modes = [];
@@ -181,10 +184,18 @@ class ModulesInstancesController {
     _checkPathExist(entitiesArray, noModes) {
         let currentTestObject = window;
         let testMode;
+        let mixins = [];
 
         for (let entitiesIndex = 0; entitiesIndex < entitiesArray.length; entitiesIndex++) {
-            if (!noModes && this._modes && entitiesIndex === entitiesArray.length - 1)
-                testMode = this._checkPathWithModes(currentTestObject, entitiesArray, entitiesIndex);
+            const lastElementModesCondition = !noModes && this._modes && entitiesIndex === entitiesArray.length - 1;
+
+            //get path modification
+            if (lastElementModesCondition && currentTestObject[MODES_NAMESPACE])
+                testMode = this._checkPathWithModes(currentTestObject[MODES_NAMESPACE], entitiesArray, entitiesIndex);
+
+            //get path mixins
+            if (lastElementModesCondition && currentTestObject[MIXINS_NAMESPACE])
+                mixins = this._getMixins(currentTestObject[MIXINS_NAMESPACE], entitiesArray, entitiesIndex);
 
             if (testMode)
                 currentTestObject = testMode;
@@ -194,6 +205,13 @@ class ModulesInstancesController {
                 return false;
         }
 
+        //mixins
+        mixins.forEach((mixin) => {
+            //use this mixin constructions:
+            //const ComponentsMixinEntitie = (superclass) => class extends superclass { ... }
+            currentTestObject = mixin(currentTestObject);
+        })
+
         return currentTestObject;
     }
 
@@ -214,6 +232,20 @@ class ModulesInstancesController {
 
         return false;
     }
+
+    _getMixins(currentTestObject, entitiesArray, entitiesIndex) {
+        const mixins = [];
+
+        for (let mode of this._modes) {
+            const capMode = Urso.helper.capitaliseFirstLetter(mode);
+
+            if (currentTestObject[capMode] && currentTestObject[capMode][entitiesArray[entitiesIndex]]) {
+                mixins.push(currentTestObject[capMode][entitiesArray[entitiesIndex]]);
+            }
+        }
+
+        return mixins;
+    }
 }
 
 module.exports = ModulesInstancesController;

package/src/js/modules/objects/baseModel.js

@@ -12,6 +12,7 @@ class ModulesObjectsBaseModel {
         this._baseObject = null; //link to pixi object
         this._uid = Urso.helper.recursiveGet('_uid', params, false); //will setup on create
         this._templatePath = false;
+        this._parsed = false;
     }
 
     setupParams(params) {

package/src/js/modules/objects/controller.js

@@ -11,16 +11,17 @@ class ModulesObjectsController {
         this._applyClassesToWorld = this._applyClassesToWorld.bind(this);
     };
 
-    create(objects, parent, doNotRefreshStylesFlag) { //TODO parse template for assets and objects (groups, components)
+    create(objects, parent, doNotRefreshStylesFlag) {
         let result;
 
         if (Array.isArray(objects)) {
             result = [];
+
             for (const object of objects) {
-                result.push(this.getInstance('Create').add(object, parent));
+                result.push(this._createSingleObject(object, parent, doNotRefreshStylesFlag));
             }
         } else
-            result = this.getInstance('Create').add(objects, parent);
+            result = this._createSingleObject(objects, parent, doNotRefreshStylesFlag);
 
         if (!doNotRefreshStylesFlag)
             this.refreshStyles(parent);
@@ -28,6 +29,15 @@ class ModulesObjectsController {
         return result;
     }
 
+    _createSingleObject(object, parent, doNotRefreshStylesFlag) {
+        //parse template for assets and objects (groups, components)
+        if (!object._parsed) { //todo only for objects, contains components && groups in future
+            return Urso.scenes.addObject(object, parent, doNotRefreshStylesFlag);
+        }
+
+        return this.getInstance('Create').add(object, parent);
+    }
+
     find(selector) {
         return this.getInstance('Find').do(selector);
     }

package/src/js/modules/scenes/controller.js

@@ -30,6 +30,10 @@ class ModulesScenesController {
         return this.getInstance('PixiWrapper').getCachedMouseCoords();
     }
 
+    addObject(objects, parent, doNotRefreshStylesFlag) {
+        this._service.addObject(objects, parent, doNotRefreshStylesFlag);
+    }
+
     get timeScale() {
         return this._service.timeScale;
     }

package/src/js/modules/scenes/service.js

@@ -26,6 +26,19 @@ class ModulesScenesService {
         gsap.globalTimeline.timeScale(this.timeScale);
     }
 
+    addObject(objects, parent, doNotRefreshStylesFlag) {
+        const newTemplatePart = Urso.template.parse({ objects: [objects] }, true);
+        Urso.assets.preload(newTemplatePart.assets, () => this._newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag));
+    }
+
+    _newTemplateAssetsLoadedHandler(newTemplatePart, parent, doNotRefreshStylesFlag) {
+        Urso.objects.create(newTemplatePart.objects, parent, doNotRefreshStylesFlag);
+
+        //components create
+        newTemplatePart.components.forEach(component => component.create());
+        this._currentSceneTemplate.components = Urso.helper.mergeArrays(this._currentSceneTemplate.components, newTemplatePart.components);
+    }
+
     display(name) {
         if (this._displayInProgress) {
             console.warn("Scenes.display is busy ", this._currentSceneName);
@@ -68,12 +81,12 @@ class ModulesScenesService {
         this.emit(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, name);
 
         Urso.assets.preload(this._currentSceneTemplate.assets, this._assetsLoadedHandler);
-
     }
 
     loadUpdate(loadProgress) {
         if (!this._sceneModel)
             return;
+
         this._sceneModel.loadUpdate(loadProgress);
         this.emit(Urso.events.MODULES_ASSETS_LOAD_PROGRESS, loadProgress);
     }

package/src/js/modules/template/controller.js

@@ -19,8 +19,8 @@ class ModulesTemplateController {
     };
 
     //make template
-    parse(template) {
-        return this.getInstance('Service').parse(template);
+    parse(template, additionalTemplateFlag) {
+        return this.getInstance('Service').parse(template, additionalTemplateFlag);
     }
 
 }

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

@@ -3,10 +3,11 @@ class ModulesTemplateService {
         this.singleton = true;
 
         this._currentTemplate = this.getInstance('Model');
+        this._actualTemplate;
     };
 
     getTemplate() {
-        return this._currentTemplate;
+        return this._actualTemplate;
     }
 
     getSceneOrGroup(name, namespace) {
@@ -17,12 +18,21 @@ class ModulesTemplateService {
         return entity;
     }
 
-    parse(template) {
+    parse(template, additionalTemplateFlag) {
         this._currentTemplate = Urso.helper.mergeObjectsRecursive(this.getInstance('Model'), template);
 
         this._parseAssets(this._currentTemplate.assets, template._templatePath);
         this._parseObjects(this._currentTemplate.objects, template._templatePath);
 
+        if (additionalTemplateFlag) {
+            this._actualTemplate.assets = Urso.helper.mergeArrays(this._actualTemplate.assets, this._currentTemplate.assets);
+            this._actualTemplate.components = Urso.helper.mergeArrays(this._actualTemplate.components, this._currentTemplate.components);
+            this._actualTemplate.objects = Urso.helper.mergeArrays(this._actualTemplate.objects, this._currentTemplate.objects);
+            Urso.helper.mergeObjectsRecursive(this._actualTemplate.styles, this._currentTemplate.styles);
+        } else {
+            this._actualTemplate = this._currentTemplate;
+        }
+
         return this._currentTemplate;
     }
 
@@ -49,6 +59,8 @@ class ModulesTemplateService {
 
             if (obj.type === Urso.types.objects.COMPONENT)
                 this._processComponent(obj);
+
+            obj._parsed = true;
         }
     }