mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
Add font downloader
This commit is contained in:
@@ -269,15 +269,15 @@ function loadAudioFromExtList (url, typeList, audio, cb){
|
||||
}
|
||||
}
|
||||
|
||||
function downloadAudio (url, callback) {
|
||||
function downloadAudio (item, callback) {
|
||||
if (formatSupport.length === 0) {
|
||||
return callback( new Error('Audio Downloader: audio not supported on this browser!') );
|
||||
}
|
||||
|
||||
var i,
|
||||
var url = item.src,
|
||||
extname = Path.extname(url),
|
||||
typeList = [extname],
|
||||
audio;
|
||||
i, audio;
|
||||
|
||||
// Generate all types
|
||||
for (i = 0; i < formatSupport.length; i++) {
|
||||
|
||||
@@ -45,8 +45,10 @@ function urlAppendTimestamp (url) {
|
||||
return url;
|
||||
}
|
||||
|
||||
function downloadScript (url, callback, isAsync) {
|
||||
var d = document, s = document.createElement('script');
|
||||
function downloadScript (item, callback, isAsync) {
|
||||
var url = item.src,
|
||||
d = document,
|
||||
s = document.createElement('script');
|
||||
s.async = isAsync;
|
||||
s.src = urlAppendTimestamp(url);
|
||||
function loadHandler () {
|
||||
@@ -66,8 +68,9 @@ function downloadScript (url, callback, isAsync) {
|
||||
d.body.appendChild(s);
|
||||
}
|
||||
|
||||
function downloadText (url, callback) {
|
||||
var xhr = Pipeline.getXMLHttpRequest(),
|
||||
function downloadText (item, callback) {
|
||||
var url = item.src,
|
||||
xhr = Pipeline.getXMLHttpRequest(),
|
||||
errInfo = 'Load ' + url + ' failed!',
|
||||
navigator = window.navigator;
|
||||
|
||||
@@ -106,7 +109,8 @@ function downloadText (url, callback) {
|
||||
xhr.send(null);
|
||||
}
|
||||
|
||||
function downloadTextSync (url) {
|
||||
function downloadTextSync (item) {
|
||||
var url = item.src;
|
||||
var xhr = Pipeline.getXMLHttpRequest();
|
||||
xhr.open('GET', url, false);
|
||||
if (/msie/i.test(window.navigator.userAgent) && !/opera/i.test(window.navigator.userAgent)) {
|
||||
@@ -122,12 +126,12 @@ function downloadTextSync (url) {
|
||||
return xhr.responseText;
|
||||
}
|
||||
|
||||
function downloadImage (url, callback, isCrossOrigin) {
|
||||
function downloadImage (item, callback, isCrossOrigin) {
|
||||
if (isCrossOrigin === undefined) {
|
||||
isCrossOrigin = true;
|
||||
}
|
||||
|
||||
url = urlAppendTimestamp(url);
|
||||
var url = urlAppendTimestamp(item.src);
|
||||
var img = new Image();
|
||||
if (isCrossOrigin && window.location.origin !== 'file://') {
|
||||
img.crossOrigin = 'Anonymous';
|
||||
@@ -163,6 +167,76 @@ function downloadImage (url, callback, isCrossOrigin) {
|
||||
img.src = url;
|
||||
}
|
||||
|
||||
var FONT_TYPE = {
|
||||
'.eot' : 'embedded-opentype',
|
||||
'.ttf' : 'truetype',
|
||||
'.ttc' : 'truetype',
|
||||
'.woff' : 'woff',
|
||||
'.svg' : 'svg'
|
||||
};
|
||||
function _loadFont (name, srcs, type){
|
||||
var doc = document,
|
||||
path = cc.path,
|
||||
fontStyle = document.createElement('style');
|
||||
fontStyle.type = 'text/css';
|
||||
doc.body.appendChild(fontStyle);
|
||||
|
||||
var fontStr = '';
|
||||
if (isNaN(name - 0)) {
|
||||
fontStr += '@font-face { font-family:' + name + '; src:';
|
||||
}
|
||||
else {
|
||||
fontStr += '@font-face { font-family:\'' + name + '\'; src:';
|
||||
}
|
||||
if (srcs instanceof Array) {
|
||||
for (var i = 0, li = srcs.length; i < li; i++) {
|
||||
var src = srcs[i];
|
||||
type = path.extname(src).toLowerCase();
|
||||
fontStr += 'url(\'' + srcs[i] + '\') format(\'' + FONT_TYPE[type] + '\')';
|
||||
fontStr += (i === li - 1) ? ';' : ',';
|
||||
}
|
||||
} else {
|
||||
type = type.toLowerCase();
|
||||
fontStr += 'url(\'' + srcs + '\') format(\'' + FONT_TYPE[type] + '\');';
|
||||
}
|
||||
fontStyle.textContent += fontStr + '}';
|
||||
|
||||
//<div style="font-family: PressStart;">.</div>
|
||||
var preloadDiv = document.createElement('div');
|
||||
var _divStyle = preloadDiv.style;
|
||||
_divStyle.fontFamily = name;
|
||||
preloadDiv.innerHTML = '.';
|
||||
_divStyle.position = 'absolute';
|
||||
_divStyle.left = '-100px';
|
||||
_divStyle.top = '-100px';
|
||||
doc.body.appendChild(preloadDiv);
|
||||
}
|
||||
function downloadFont (item, callback){
|
||||
var url = item.src,
|
||||
type = item.type,
|
||||
name = item.name,
|
||||
srcs = item.srcs;
|
||||
if (name && srcs) {
|
||||
if (srcs.indexOf(url) === -1) {
|
||||
srcs.push(url);
|
||||
}
|
||||
_loadFont(name, srcs);
|
||||
} else {
|
||||
type = cc.path.extname(url);
|
||||
name = cc.path.basename(url, type);
|
||||
_loadFont(name, url, type);
|
||||
}
|
||||
if (document.fonts) {
|
||||
document.fonts.load('1em ' + name).then(function () {
|
||||
callback(null, null);
|
||||
}, function(err){
|
||||
callback(err);
|
||||
});
|
||||
} else {
|
||||
callback(null, null);
|
||||
}
|
||||
}
|
||||
|
||||
var defaultMap = {
|
||||
// JS
|
||||
'js' : downloadScript,
|
||||
@@ -194,12 +268,12 @@ var defaultMap = {
|
||||
'json' : downloadText,
|
||||
'ExportJson' : downloadText,
|
||||
|
||||
'font' : downloadText,
|
||||
'eot' : downloadText,
|
||||
'ttf' : downloadText,
|
||||
'woff' : downloadText,
|
||||
'svg' : downloadText,
|
||||
'ttc' : downloadText,
|
||||
'font' : downloadFont,
|
||||
'eot' : downloadFont,
|
||||
'ttf' : downloadFont,
|
||||
'woff' : downloadFont,
|
||||
'svg' : downloadFont,
|
||||
'ttc' : downloadFont,
|
||||
'plist' : downloadText,
|
||||
|
||||
'default' : downloadText
|
||||
@@ -245,7 +319,7 @@ JS.mixin(Downloader.prototype, {
|
||||
|
||||
handle: function (item, callback) {
|
||||
var downloadFunc = this.extMap[item.type] || this.extMap['default'];
|
||||
downloadFunc.call(this, item.src, function (err, result) {
|
||||
downloadFunc.call(this, item, function (err, result) {
|
||||
callback && callback(err, result);
|
||||
});
|
||||
}
|
||||
|
||||
Binary file not shown.
Executable
BIN
Binary file not shown.
@@ -26,7 +26,7 @@ asyncTest('Load', function () {
|
||||
ok(false, 'should not load an unknown url');
|
||||
}
|
||||
}, function (items) {
|
||||
ok(items.isCompleted(), 'Able to load all resources');
|
||||
ok(items.isCompleted(), 'be able to load all resources');
|
||||
|
||||
loader.releaseAll();
|
||||
strictEqual(Object.keys(this.getItems().map).length, 0, 'should clear loading items after releaseAll called');
|
||||
@@ -123,7 +123,49 @@ asyncTest('Load with dependencies', function () {
|
||||
|
||||
loader.load(resources, progressCallback, function (items) {
|
||||
ok(items.isCompleted(), 'be able to load all resources');
|
||||
progressCallback.expect(total, 'should call ' + total + ' times progress callback for 5 resources');
|
||||
progressCallback.expect(total, 'should call ' + total + ' times progress callback for ' + total + ' resources');
|
||||
loader.releaseAll();
|
||||
|
||||
clearTimeout(timeoutId);
|
||||
start();
|
||||
});
|
||||
|
||||
var timeoutId = setTimeout(function () {
|
||||
ok(false, 'time out!');
|
||||
start();
|
||||
}, 5000);
|
||||
});
|
||||
|
||||
asyncTest('Loading font', function () {
|
||||
var image = assetDir + '/button.png';
|
||||
var font = {
|
||||
src: assetDir + '/Thonburi.ttf',
|
||||
type: 'font',
|
||||
name: 'Thonburi',
|
||||
srcs: [assetDir + '/Thonburi.eot']
|
||||
};
|
||||
var resources = [
|
||||
image,
|
||||
font
|
||||
];
|
||||
var total = resources.length;
|
||||
|
||||
var progressCallback = new Callback(function (completedCount, totalCount, item) {
|
||||
if (item.src === image) {
|
||||
ok(item.content instanceof cc.Texture2D, 'image url\'s result should be Texture2D');
|
||||
}
|
||||
else if (item.src === font.src) {
|
||||
strictEqual(item.content, null, 'should set null as content for Font type');
|
||||
}
|
||||
else {
|
||||
ok(false, 'should not load an unknown url');
|
||||
}
|
||||
}).enable();
|
||||
|
||||
loader.load(resources, progressCallback, function (items) {
|
||||
ok(items.isCompleted(), 'be able to load all resources');
|
||||
progressCallback.expect(total, 'should call ' + total + ' times progress callback for ' + total + ' resources');
|
||||
|
||||
clearTimeout(timeoutId);
|
||||
start();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user