@urso/core 0.1.95 → 0.2.3-dev

package/src/js/modules/assets/service.js

@@ -1,330 +1,330 @@
-class ModulesAssetsService {
-    constructor() {
-        this.singleton = true;
-        
-        this.assets = {};
-
-        this._currentQuality = 'auto';
-        this._addedAssetsCache = [];
-    };
-
-    getQuality(){
-        return this._currentQuality;
-    }
-
-    updateQuality(){
-        this._currentQuality = this._detectQuality();
-        Urso.addInstancesMode(this._currentQuality);
-    }
-
-    sortAssets(assets) {
-        this.assets[this.getInstance('Config').loadingGroups.initial] = [];
-
-        if (Array.isArray(assets))
-            for (let asset of assets)
-                this._addAsset(asset);
-        else
-            this._addAsset(assets);
-    }
-
-    startLoad(callback) {
-        this.loadGroup(
-            this.getInstance('Config').loadingGroups.initial,
-            (() => { callback(); this._continueLazyLoad(); }).bind(this)
-        )
-    }
-
-    loadUpdate(param) {
-        Urso.scenes.loadUpdate(Math.floor(param.progress));
-    }
-
-    loadGroup(group, callback) {
-        if (!this.assets[group])
-            return Urso.logger.error('ModulesAssetsService group error, no assets:' + group + ' Check ModulesAssetsConfig please');
-
-        //we need load and parse atlases at first (!)
-        this._loadGroupAtlases(group, () => { this._loadGroupRestAssets(group, callback) });
-    }
-
-    _loadGroupAtlases(group, callback) {
-        const atlases = this.assets[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS);
-
-        if (!atlases.length)
-            return callback();
-
-        let loader = Urso.getInstance('Lib.Loader');
-
-        for (let assetModel of atlases)
-            this._addAssetToLoader(assetModel, loader);
-
-        loader.start(() => { this._processLoadedAtlases(group); callback(); });
-    }
-
-    _loadGroupRestAssets(group, callback) {
-        let loader = Urso.getInstance('Lib.Loader');
-        loader.setOnLoadUpdate(this.loadUpdate.bind(this));
-
-        for (let assetModel of this.assets[group])
-            if (assetModel.type !== Urso.types.assets.ATLAS)
-                if (!Urso.cache.getFile(assetModel.path))
-                    this._addAssetToLoader(assetModel, loader);
-
-        loader.start(() => { this._processLoadedAssets(group); this.emit(Urso.events.MODULES_ASSETS_GROUP_LOADED, group); callback(); });
-    }
-
-    _processLoadedAtlases(group) {
-        const atlases = this.assets[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS);
-        
-        for (let assetModel of atlases) {
-            const assetKey = assetModel.key;
-            let imageData = Urso.cache.getAtlas(assetKey);
-            const folderPath = imageData.url.split('/').slice(0, -1).join('/');
-
-            for (let i = 0; i < imageData.spritesheet._frames.length; i++) {
-                let frame = imageData.spritesheet._frames[i];
-                let texture = imageData.textures[i];
-                let newFilename = frame.filename;
-
-                if(frame.filename.indexOf('/') === -1)
-                    newFilename = folderPath + '/' + frame.filename;
-
-                Urso.cache.addFile(newFilename, texture);
-            }
-        }
-    }
-
-    _processLoadedAssets(group) {
-        for (let assetModel of this.assets[group]) {
-            if (assetModel.type === Urso.types.assets.IMAGE)
-                this._processLoadedImage(assetModel);
-
-            if (assetModel.type === Urso.types.assets.BITMAPFONT)
-                this._processLoadedBitmapFont(assetModel);
-
-            if (assetModel.type === Urso.types.assets.FONT)
-                this._processLoadedFont(assetModel);
-        }
-
-        delete this.assets[group];
-    }
-
-    _processLoadedFont(source) {
-        const data = Urso.cache.getFile(source.key);
-        const font = new FontFace(source.key, data.data);
-        font.load().then(() => {
-            document.fonts.add(font);
-        });
-    }
-
-    _processLoadedBitmapFont(assetModel) {
-        this._updateFontKey(assetModel.key)
-    }
-
-    _updateFontKey(fontName) {
-        const fontData = Urso.cache.getBitmapFont(fontName);
-
-        if (PIXI.BitmapFont.available[fontName] || !fontData)
-            return;
-
-        const savedFont = PIXI.BitmapFont.available[fontData.bitmapFont.font];
-
-        if (savedFont) {
-            PIXI.BitmapFont.available[fontName] = savedFont;
-            delete PIXI.BitmapFont.available[fontData.bitmapFont.font];
-        }
-    }
-
-    _processLoadedImage(assetModel) {
-        const { qualityFactors } = this.getInstance('Config');
-
-        const resolution = qualityFactors[this._currentQuality] || 1;
-
-        const assetKey = assetModel.key;
-        //textures cache
-        let imageData = Urso.cache.getImage(assetKey);
-
-        if (!imageData) {
-            //from atlas ?!
-            let texture = Urso.cache.getFile(assetModel.path);
-            
-            if (!texture)
-                return Urso.logger.error('ModulesAssetsService process Loaded Image error: no image ', assetModel);
-
-            Urso.cache.addTexture(assetKey, texture); //TODO change resolution of base texture
-        } else {
-            //regular image
-            const baseTexture = new PIXI.BaseTexture(imageData.data, { resolution });
-            const texture = new PIXI.Texture(baseTexture);
-            Urso.cache.addTexture(assetKey, texture);
-        }
-
-        if (assetModel.preloadGPU) {
-            let tempOblect = Urso.objects.create({
-                type: Urso.types.objects.IMAGE,
-                assetKey: assetKey,
-                x: -10000, y: -10000
-            }, false, true);
-
-            setTimeout(() => { tempOblect.destroy() }, 1)
-        }
-    }
-
-    _addAsset(asset, loadingGroup) {
-        //cache for all assets. We do not need to load same assets twice or more
-        if (asset.type !== Urso.types.assets.CONTAINER) {
-            let addedAssetKey = `${asset.type}_${asset.key}`;
-
-            if (this._addedAssetsCache.includes(addedAssetKey))
-                return;
-
-            this._addedAssetsCache.push(addedAssetKey);
-        }
-
-        let model;
-
-        switch (asset.type) {
-            case Urso.types.assets.IMAGE:
-                model = this.getInstance('Models.Image', asset)
-                break;
-            case Urso.types.assets.CONTAINER:
-                model = this.getInstance('Models.Container', asset)
-                break;
-            case Urso.types.assets.DRAGONBONES:
-                model = this.getInstance('Models.DragonBones', asset)
-                break;
-            case Urso.types.assets.ATLAS:
-                model = this.getInstance('Models.Atlas', asset)
-                break;
-            case Urso.types.assets.AUDIOSPRITE:
-                model = this.getInstance('Models.Audiosprite', asset)
-                break;
-            case Urso.types.assets.JSON:
-                model = this.getInstance('Models.Json', asset)
-                break;
-            case Urso.types.assets.SPINE:
-                model = this.getInstance('Models.Spine', asset)
-                break;
-            case Urso.types.assets.BITMAPFONT:
-                model = this.getInstance('Models.BitmapFont', asset)
-                break;
-            case Urso.types.assets.FONT:
-                model = this.getInstance('Models.Font', asset)
-                break;
-            case Urso.types.assets.SOUND:
-                model = this.getInstance('Models.Sound', asset)
-                break;
-            default:
-                Urso.logger.error('ModulesAssetsService asset type error', asset);
-                break;
-        };
-
-        //set loadingGroup
-        model.loadingGroup = loadingGroup || model.loadingGroup || this.getInstance('Config').loadingGroups.initial;
-
-        //check if container or dragonbones
-        if (model.contents) {
-            for (let content of model.contents) {
-                this._addAsset(content, model.loadingGroup);
-            }
-
-            return;
-        }
-
-        //add single asset to loading group
-        if (!this.assets[model.loadingGroup])
-            this.assets[model.loadingGroup] = [];
-
-        this.assets[model.loadingGroup].push(model);
-    }
-
-    _continueLazyLoad(step) {
-        if (!step)
-            step = 0;
-
-        const lazyLoadGroups = this.getInstance('Config').lazyLoadGroups;
-
-        if (step >= lazyLoadGroups.length) {
-            this.emit(Urso.events.MODULES_ASSETS_LAZYLOAD_FINISHED);
-            return;
-        }
-
-        let groupName = lazyLoadGroups[step];
-
-        if (!groupName)
-            Urso.logger.error('ModulesAssetsService lazy loading groupName error');
-
-        this.loadGroup(groupName, () => { this._continueLazyLoad(step + 1); })
-    }
-
-    _qualityReducer(qualityFactors, widthFactor){
-        return [(acc, val) => {
-            if (acc === null) {
-                return val;
-            }
-
-            const currentQuality = qualityFactors[acc];
-            const qualityFactor = qualityFactors[val];
-
-            const nextQuality = (currentQuality > qualityFactor && qualityFactor >= widthFactor)
-                || (qualityFactor >= widthFactor && widthFactor > currentQuality)
-                || (widthFactor >= qualityFactor && qualityFactor > currentQuality);
-            
-            return nextQuality ? val : acc;
-                
-        }, null]
-    }
-
-    _detectQuality(){
-        const { qualityFactors } = this.getInstance('Config');
-        const userQuality = Urso.helper.parseGetParams()['quality'];
-        
-        if(userQuality && qualityFactors[userQuality]){
-            return userQuality;
-        }
-        
-        return this._calculateQuality(qualityFactors);
-    }
-
-    _calculateQuality(qualityFactors){
-        const { android, iOS, iPad, macOS } = Urso.device;
-        const isMobile = android || iOS || iPad;
-
-        if (macOS && !isMobile) {
-            return 'high';
-        }
-
-        if(macOS && iPad) {
-            return 'medium';
-        }
-
-        const resCfg = Urso.getInstance('Modules.Scenes.ResolutionsConfig').contents[0];
-        
-        const { devicePixelRatio } = window;
-        let { width, height } = screen;
-
-        if (isMobile) {
-            width = (width > height) ? width : height;
-        }
-
-        if (iOS) {
-            width *= devicePixelRatio;
-        }
-
-        const widthFactor = width / resCfg.width;
-    
-        return Object
-            .keys(qualityFactors)
-            .reduce(...this._qualityReducer(qualityFactors, widthFactor));
-    }
-
-    _addAssetToLoader(assetModel, loader) {
-        if (assetModel.path)
-            loader.addAsset(assetModel);
-        else if (assetModel.contents) {
-            //do nothing, its a container
-        } else
-            Urso.logger.error('ModulesAssetsService model error', assetModel);
-    };
-}
-
-module.exports = ModulesAssetsService;
+class ModulesAssetsService {
+    constructor() {
+        this.singleton = true;
+        
+        this.assets = {};
+
+        this._currentQuality = 'auto';
+        this._addedAssetsCache = [];
+    };
+
+    getQuality(){
+        return this._currentQuality;
+    }
+
+    updateQuality(){
+        this._currentQuality = this._detectQuality();
+        Urso.addInstancesMode(this._currentQuality);
+    }
+
+    sortAssets(assets) {
+        this.assets[this.getInstance('Config').loadingGroups.initial] = [];
+
+        if (Array.isArray(assets))
+            for (let asset of assets)
+                this._addAsset(asset);
+        else
+            this._addAsset(assets);
+    }
+
+    startLoad(callback) {
+        this.loadGroup(
+            this.getInstance('Config').loadingGroups.initial,
+            (() => { callback(); this._continueLazyLoad(); }).bind(this)
+        )
+    }
+
+    loadUpdate(param) {
+        Urso.scenes.loadUpdate(Math.floor(param.progress));
+    }
+
+    loadGroup(group, callback) {
+        if (!this.assets[group])
+            return Urso.logger.error('ModulesAssetsService group error, no assets:' + group + ' Check ModulesAssetsConfig please');
+
+        //we need load and parse atlases at first (!)
+        this._loadGroupAtlases(group, () => { this._loadGroupRestAssets(group, callback) });
+    }
+
+    _loadGroupAtlases(group, callback) {
+        const atlases = this.assets[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS);
+
+        if (!atlases.length)
+            return callback();
+
+        let loader = Urso.getInstance('Lib.Loader');
+
+        for (let assetModel of atlases)
+            this._addAssetToLoader(assetModel, loader);
+
+        loader.start(() => { this._processLoadedAtlases(group); callback(); });
+    }
+
+    _loadGroupRestAssets(group, callback) {
+        let loader = Urso.getInstance('Lib.Loader');
+        loader.setOnLoadUpdate(this.loadUpdate.bind(this));
+
+        for (let assetModel of this.assets[group])
+            if (assetModel.type !== Urso.types.assets.ATLAS)
+                if (!Urso.cache.getFile(assetModel.path))
+                    this._addAssetToLoader(assetModel, loader);
+
+        loader.start(() => { this._processLoadedAssets(group); this.emit(Urso.events.MODULES_ASSETS_GROUP_LOADED, group); callback(); });
+    }
+
+    _processLoadedAtlases(group) {
+        const atlases = this.assets[group].filter(assetModel => assetModel.type === Urso.types.assets.ATLAS);
+        
+        for (let assetModel of atlases) {
+            const assetKey = assetModel.key;
+            let imageData = Urso.cache.getAtlas(assetKey);
+            const folderPath = imageData.url.split('/').slice(0, -1).join('/');
+
+            for (let i = 0; i < imageData.spritesheet._frames.length; i++) {
+                let frame = imageData.spritesheet._frames[i];
+                let texture = imageData.textures[i];
+                let newFilename = frame.filename;
+
+                if(frame.filename.indexOf('/') === -1)
+                    newFilename = folderPath + '/' + frame.filename;
+
+                Urso.cache.addFile(newFilename, texture);
+            }
+        }
+    }
+
+    _processLoadedAssets(group) {
+        for (let assetModel of this.assets[group]) {
+            if (assetModel.type === Urso.types.assets.IMAGE)
+                this._processLoadedImage(assetModel);
+
+            if (assetModel.type === Urso.types.assets.BITMAPFONT)
+                this._processLoadedBitmapFont(assetModel);
+
+            if (assetModel.type === Urso.types.assets.FONT)
+                this._processLoadedFont(assetModel);
+        }
+
+        delete this.assets[group];
+    }
+
+    _processLoadedFont(source) {
+        const data = Urso.cache.getFile(source.key);
+        const font = new FontFace(source.key, data.data);
+        font.load().then(() => {
+            document.fonts.add(font);
+        });
+    }
+
+    _processLoadedBitmapFont(assetModel) {
+        this._updateFontKey(assetModel.key)
+    }
+
+    _updateFontKey(fontName) {
+        const fontData = Urso.cache.getBitmapFont(fontName);
+
+        if (PIXI.BitmapFont.available[fontName] || !fontData)
+            return;
+
+        const savedFont = PIXI.BitmapFont.available[fontData.bitmapFont.font];
+
+        if (savedFont) {
+            PIXI.BitmapFont.available[fontName] = savedFont;
+            delete PIXI.BitmapFont.available[fontData.bitmapFont.font];
+        }
+    }
+
+    _processLoadedImage(assetModel) {
+        const { qualityFactors } = this.getInstance('Config');
+
+        const resolution = qualityFactors[this._currentQuality] || 1;
+
+        const assetKey = assetModel.key;
+        //textures cache
+        let imageData = Urso.cache.getImage(assetKey);
+
+        if (!imageData) {
+            //from atlas ?!
+            let texture = Urso.cache.getFile(assetModel.path);
+            
+            if (!texture)
+                return Urso.logger.error('ModulesAssetsService process Loaded Image error: no image ', assetModel);
+
+            Urso.cache.addTexture(assetKey, texture); //TODO change resolution of base texture
+        } else {
+            //regular image
+            const baseTexture = new PIXI.BaseTexture(imageData.data, { resolution });
+            const texture = new PIXI.Texture(baseTexture);
+            Urso.cache.addTexture(assetKey, texture);
+        }
+
+        if (assetModel.preloadGPU) {
+            let tempOblect = Urso.objects.create({
+                type: Urso.types.objects.IMAGE,
+                assetKey: assetKey,
+                x: -10000, y: -10000
+            }, false, true);
+
+            setTimeout(() => { tempOblect.destroy() }, 1)
+        }
+    }
+
+    _addAsset(asset, loadingGroup) {
+        //cache for all assets. We do not need to load same assets twice or more
+        if (asset.type !== Urso.types.assets.CONTAINER) {
+            let addedAssetKey = `${asset.type}_${asset.key}`;
+
+            if (this._addedAssetsCache.includes(addedAssetKey))
+                return;
+
+            this._addedAssetsCache.push(addedAssetKey);
+        }
+
+        let model;
+
+        switch (asset.type) {
+            case Urso.types.assets.IMAGE:
+                model = this.getInstance('Models.Image', asset)
+                break;
+            case Urso.types.assets.CONTAINER:
+                model = this.getInstance('Models.Container', asset)
+                break;
+            case Urso.types.assets.DRAGONBONES:
+                model = this.getInstance('Models.DragonBones', asset)
+                break;
+            case Urso.types.assets.ATLAS:
+                model = this.getInstance('Models.Atlas', asset)
+                break;
+            case Urso.types.assets.AUDIOSPRITE:
+                model = this.getInstance('Models.Audiosprite', asset)
+                break;
+            case Urso.types.assets.JSON:
+                model = this.getInstance('Models.Json', asset)
+                break;
+            case Urso.types.assets.SPINE:
+                model = this.getInstance('Models.Spine', asset)
+                break;
+            case Urso.types.assets.BITMAPFONT:
+                model = this.getInstance('Models.BitmapFont', asset)
+                break;
+            case Urso.types.assets.FONT:
+                model = this.getInstance('Models.Font', asset)
+                break;
+            case Urso.types.assets.SOUND:
+                model = this.getInstance('Models.Sound', asset)
+                break;
+            default:
+                Urso.logger.error('ModulesAssetsService asset type error', asset);
+                break;
+        };
+
+        //set loadingGroup
+        model.loadingGroup = loadingGroup || model.loadingGroup || this.getInstance('Config').loadingGroups.initial;
+
+        //check if container or dragonbones
+        if (model.contents) {
+            for (let content of model.contents) {
+                this._addAsset(content, model.loadingGroup);
+            }
+
+            return;
+        }
+
+        //add single asset to loading group
+        if (!this.assets[model.loadingGroup])
+            this.assets[model.loadingGroup] = [];
+
+        this.assets[model.loadingGroup].push(model);
+    }
+
+    _continueLazyLoad(step) {
+        if (!step)
+            step = 0;
+
+        const lazyLoadGroups = this.getInstance('Config').lazyLoadGroups;
+
+        if (step >= lazyLoadGroups.length) {
+            this.emit(Urso.events.MODULES_ASSETS_LAZYLOAD_FINISHED);
+            return;
+        }
+
+        let groupName = lazyLoadGroups[step];
+
+        if (!groupName)
+            Urso.logger.error('ModulesAssetsService lazy loading groupName error');
+
+        this.loadGroup(groupName, () => { this._continueLazyLoad(step + 1); })
+    }
+
+    _qualityReducer(qualityFactors, widthFactor){
+        return [(acc, val) => {
+            if (acc === null) {
+                return val;
+            }
+
+            const currentQuality = qualityFactors[acc];
+            const qualityFactor = qualityFactors[val];
+
+            const nextQuality = (currentQuality > qualityFactor && qualityFactor >= widthFactor)
+                || (qualityFactor >= widthFactor && widthFactor > currentQuality)
+                || (widthFactor >= qualityFactor && qualityFactor > currentQuality);
+            
+            return nextQuality ? val : acc;
+                
+        }, null]
+    }
+
+    _detectQuality(){
+        const { qualityFactors } = this.getInstance('Config');
+        const userQuality = Urso.helper.parseGetParams()['quality'];
+        
+        if(userQuality && qualityFactors[userQuality]){
+            return userQuality;
+        }
+        
+        return this._calculateQuality(qualityFactors);
+    }
+
+    _calculateQuality(qualityFactors){
+        const { android, iOS, iPad, macOS } = Urso.device;
+        const isMobile = android || iOS || iPad;
+
+        if (macOS && !isMobile) {
+            return 'high';
+        }
+
+        if(macOS && iPad) {
+            return 'medium';
+        }
+
+        const resCfg = Urso.getInstance('Modules.Scenes.ResolutionsConfig').contents[0];
+        
+        const { devicePixelRatio } = window;
+        let { width, height } = screen;
+
+        if (isMobile) {
+            width = (width > height) ? width : height;
+        }
+
+        if (iOS) {
+            width *= devicePixelRatio;
+        }
+
+        const widthFactor = width / resCfg.width;
+    
+        return Object
+            .keys(qualityFactors)
+            .reduce(...this._qualityReducer(qualityFactors, widthFactor));
+    }
+
+    _addAssetToLoader(assetModel, loader) {
+        if (assetModel.path)
+            loader.addAsset(assetModel);
+        else if (assetModel.contents) {
+            //do nothing, its a container
+        } else
+            Urso.logger.error('ModulesAssetsService model error', assetModel);
+    };
+}
+
+module.exports = ModulesAssetsService;

package/src/js/modules/instances/_info.js

@@ -1,3 +1,3 @@
-Urso.Core.Modules.Instances = {
-    Controller: require('./controller.js')
-};
+Urso.Core.Modules.Instances = {
+    Controller: require('./controller.js')
+};