@urso/core 0.8.21 → 0.9.1-dev

package/src/js/lib/cache.js

@@ -1,125 +1,199 @@
-class LibCache {
-    constructor() {
-        this.assetsList = {
-            atlas: {},
-            binary: {},
-            bitmapFont: {},
-            file: {},
-            image: {},
-            json: {},
-            jsonAtlas: {},
-            sound: {},
-            spine: {},
-            texture: {}
-        };
-
-        this.globalAtlas = new PIXI.spine.TextureAtlas();
-    };
-
-    _setDataToAssetsList(assetType, key, data) {
-        if (this.assetsList[assetType][key])
-            console.warn(`LibCache ${assetType}: key already exists: `, key, data);
-
-        this.assetsList[assetType][key] = data;
-    }
-
-    addFile(key, someData) {
-        this._setDataToAssetsList('file', key, someData);
-    };
-
-    addAtlas(key, someData) {
-        this._setDataToAssetsList('atlas', key, someData);
-    };
-
-    addBinary(key, someData) {
-        this._setDataToAssetsList('binary', key, someData);
-    };
-
-    addBitmapFont(key, someData) {
-        this._setDataToAssetsList('bitmapFont', key, someData);
-    };
-
-    addContainer(key, someData) {
-        this._setDataToAssetsList('container', key, someData);
-    };
-
-    addImage(key, someData) {
-        this._setDataToAssetsList('image', key, someData);
-    };
-
-    addJson(key, someData) {
-        this._setDataToAssetsList('json', key, someData);
-    };
-
-    addJsonAtlas(key, someData) {
-        this._setDataToAssetsList('jsonAtlas', key, someData);
-    };
-
-    addSound(key, someData) {
-        this._setDataToAssetsList('sound', key, someData);
-    };
-
-    addTexture(key, someData) {
-        this._setDataToAssetsList('texture', key, someData);
-        this.globalAtlas.addTexture(key, someData);
-    };
-
-    addSpine(key, someData) {
-        this._setDataToAssetsList('spine', key, someData);
-    };
-
-    getFile(key) {
-        return this.assetsList.file[key];
-    };
-
-    getAtlas(key) {
-        return this.assetsList.atlas[key];
-    };
-
-    getBinary(key) {
-        return this.assetsList.binary[key];
-    };
-
-    getBitmapFont(key) {
-        return this.assetsList.bitmapFont[key];
-    };
-
-    getContainer(key) {
-        return this.assetsList.container[key];
-    };
-
-    getImage(key) {
-        return this.assetsList.image[key];
-    };
-
-    getJson(key) {
-        return this.assetsList.json[key];
-    };
-
-    getJsonAtlas(key) {
-        return this.assetsList.jsonAtlas[key];
-    };
-
-    getJsonAtlases() {
-        return this.assetsList.jsonAtlas;
-    };
-
-    getSound(key) {
-        return this.assetsList.sound[key];
-    };
-
-    getSpine(key) {
-        return this.assetsList.spine[key];
-    };
-
-    getTexture(key) {
-        return this.assetsList.texture[key];
-    };
-
-    getGlobalAtlas() {
-        return this.globalAtlas;
-    }
-
-};
-
-module.exports = LibCache;
+import * as spine from '@esotericsoftware/spine-pixi-v8';
+
+class LibCache {
+    _globalAtlas = null
+
+    constructor() {
+        this.assetsList = {
+            atlas: {},
+            binary: {},
+            bitmapFont: {},
+            file: {},
+            image: {},
+            json: {},
+            jsonAtlas: {},
+            sound: {},
+            spine: {},
+            spineAtlas: {},
+            texture: {},
+        };
+    };
+
+    clearGlobalAtlas() {
+        this._globalAtlas = null;
+    }
+
+    get globalAtlas() {
+        if (!this._globalAtlas) {
+            this._globalAtlas = this._createGlobalAtlas();
+        }
+        
+        return this._globalAtlas;
+    }
+
+    _createGlobalAtlas() {
+        const textureAtlas = new spine.TextureAtlas('');
+        const atlases = Urso.cache.assetsList.atlas;
+
+        for (const key in atlases) {
+            const atlas = atlases[key];
+            
+            const page = new spine.TextureAtlasPage(key);
+            const { w, h } = atlas.data.meta.size;
+            
+            const baseTexture = new spine.SpineTexture(atlas.textureSource);
+
+            page.width = w;
+            page.height = h;
+            page.texture = baseTexture;
+            page.minFilter = page.magFilter = 9729;
+            page.uWrap = page.vWrap = 33071;
+            textureAtlas.pages.push(page);
+
+            for (const frameName in atlas._frames) {
+                const frame = atlas._frames[frameName];
+                const region = new spine.TextureAtlasRegion(page, frameName);
+                
+                region.width = frame.frame.w;
+                region.height = frame.frame.h;
+                region.u = frame.frame.x / baseTexture.texture.width;
+                region.v = frame.frame.y / baseTexture.texture.height;
+                region.u2 = (frame.frame.x + frame.frame.w) / baseTexture.texture.width;
+                region.v2 = (frame.frame.y + frame.frame.h) / baseTexture.texture.height;
+                region.rotate = false;
+                region.originalWidth = frame.sourceSize.w;
+                region.originalHeight = frame.sourceSize.h;
+                region.texture = baseTexture;
+
+                textureAtlas.regions.push(region);
+            }
+        }
+        
+        for (const key in Urso.cache.assetsList.spineAtlas) {
+            const { pages, regions } = Urso.cache.assetsList.spineAtlas[key];
+
+            for (const page of pages) {
+                textureAtlas.pages.push(page);
+            }
+            for (const region of regions) {
+                textureAtlas.regions.push(region);
+            }
+        }
+
+        return textureAtlas;
+    }
+
+    _setDataToAssetsList(assetType, key, data) {
+        if (this.assetsList[assetType][key])
+            console.warn(`LibCache ${assetType}: key already exists: `, key, data);
+
+        this.assetsList[assetType][key] = data;
+    }
+
+    addFile(key, someData) {
+        this._setDataToAssetsList('file', key, someData);
+    };
+
+    addAtlas(key, someData) {
+        this._setDataToAssetsList('atlas', key, someData);
+        this.clearGlobalAtlas();
+    };
+
+    addBinary(key, someData) {
+        this._setDataToAssetsList('binary', key, someData);
+    };
+
+    addBitmapFont(key, someData) {
+        this._setDataToAssetsList('bitmapFont', key, someData);
+    };
+
+    addContainer(key, someData) {
+        this._setDataToAssetsList('container', key, someData);
+    };
+
+    addImage(key, someData) {
+        this._setDataToAssetsList('image', key, someData);
+    };
+
+    addJson(key, someData) {
+        this._setDataToAssetsList('json', key, someData);
+    };
+
+    addJsonAtlas(key, someData) {
+        this._setDataToAssetsList('jsonAtlas', key, someData);
+    };
+
+    addSound(key, someData) {
+        this._setDataToAssetsList('sound', key, someData);
+    };
+
+    addTexture(key, someData) {
+        this._setDataToAssetsList('texture', key, someData);
+    };
+
+    addSpine(key, someData) {
+        this._setDataToAssetsList('spine', key, someData);
+    };
+
+    addSpineAtlas(key, someData) {
+        this._setDataToAssetsList('spineAtlas', key, someData);
+    }
+
+    getFile(key) {
+        return this.assetsList.file[key];
+    };
+
+    getAtlas(key) {
+        return this.assetsList.atlas[key];
+    };
+
+    getBinary(key) {
+        return this.assetsList.binary[key];
+    };
+
+    getBitmapFont(key) {
+        return this.assetsList.bitmapFont[key];
+    };
+
+    getContainer(key) {
+        return this.assetsList.container[key];
+    };
+
+    getImage(key) {
+        return this.assetsList.image[key];
+    };
+
+    getJson(key) {
+        return this.assetsList.json[key];
+    };
+
+    getJsonAtlas(key) {
+        return this.assetsList.jsonAtlas[key];
+    };
+
+    getJsonAtlases() {
+        return this.assetsList.jsonAtlas;
+    };
+
+    getSound(key) {
+        return this.assetsList.sound[key];
+    };
+
+    getSpine(key) {
+        return this.assetsList.spine[key];
+    };
+
+    getSpineAtlas(key) {
+        return this.assetsList.spineAtlas[key];
+    };
+
+    getTexture(key) {
+        return this.assetsList.texture[key];
+    };
+
+    getGlobalAtlas() {
+        return this.globalAtlas;
+    }
+};
+
+export default LibCache;

package/src/js/lib/composition.js

@@ -1,85 +1,85 @@
-// Class for creating multi inheritance.
-class LibComposition {
-	// Inherit method to create base classes.
-	static inherit(..._bases) {
-		class classes {
-
-			// The base classes
-			get base() { return _bases; }
-
-			constructor(..._args) {
-				let index = 0;
-
-				for (let b of this.base) {
-					let obj = new b(_args[index++]);
-					LibComposition.copy(this, obj);
-				}
-			}
-
-		}
-
-		// Copy over properties and methods
-		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, 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));
-		}
-	}
-}
-
-module.exports = LibComposition;
-
-
-/**
- *
- example:
-
-
-class ages
-{
-	constructor(_age) {	this.age = _age; }
-	set age(_a) { this._age = _a; }
-	get age() { return this._age; }
-	increase() { this.age++; }
-}
-
-class genders
-{
-	constructor(_gender) { this.gender = _gender; }
-	set gender(_g) { this._gender = _g; }
-	get gender() { return this._gender; }
-	male() { this._gender = 'M'; }
-	female() { this._gender = 'F'; }
-}
-
-class person extends Urso.Game.Lib.Composition.inherit(ages, genders)
-{
-	constructor(...args)
-	{
-		super(18, 'M');
-		this.name = args[0];
-	}
-
-	set name(_n) { this._name = _n; }
-	get name() { return this._name; }
-}
-
-let p = new person('Adam');
-console.log(p.name, p.age, p.gender);
-
-*/
+// Class for creating multi inheritance.
+class LibComposition {
+	// Inherit method to create base classes.
+	static inherit(..._bases) {
+		class classes {
+
+			// The base classes
+			get base() { return _bases; }
+
+			constructor(..._args) {
+				let index = 0;
+
+				for (let b of this.base) {
+					let obj = new b(_args[index++]);
+					LibComposition.copy(this, obj);
+				}
+			}
+
+		}
+
+		// Copy over properties and methods
+		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, 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));
+		}
+	}
+}
+
+export default LibComposition;
+
+
+/**
+ *
+ example:
+
+
+class ages
+{
+	constructor(_age) {	this.age = _age; }
+	set age(_a) { this._age = _a; }
+	get age() { return this._age; }
+	increase() { this.age++; }
+}
+
+class genders
+{
+	constructor(_gender) { this.gender = _gender; }
+	set gender(_g) { this._gender = _g; }
+	get gender() { return this._gender; }
+	male() { this._gender = 'M'; }
+	female() { this._gender = 'F'; }
+}
+
+class person extends Urso.Game.Lib.Composition.inherit(ages, genders)
+{
+	constructor(...args)
+	{
+		super(18, 'M');
+		this.name = args[0];
+	}
+
+	set name(_n) { this._name = _n; }
+	get name() { return this._name; }
+}
+
+let p = new person('Adam');
+console.log(p.name, p.age, p.gender);
+
+*/