Skip to content

Commit c27abca

Browse files
xingsenmaxingsenma
committed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop_eglvew
2 parents 7eed6cb + 48bc624 commit c27abca

File tree

17 files changed

+140
-50
lines changed

17 files changed

+140
-50
lines changed

‎CocosDenshion/SimpleAudioEngine.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
170170
_maxAudioInstance:10,
171171
_canPlay:true,
172172
_musicListenerBound:null,
173+
_musicIsStopped: false,
173174

174175
/**
175176
* Constructor
@@ -277,6 +278,7 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
277278
au.loop = loop || false;
278279
au.play();
279280
cc.AudioEngine.isMusicPlaying = true;
281+
this._musicIsStopped = false;
280282
},
281283

282284
_musicListener:function(e){
@@ -300,10 +302,10 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
300302
var au = locSoundList[locPlayingMusic].audio;
301303
au.pause();
302304
au.currentTime = au.duration;
303-
if (releaseData) {
305+
if (releaseData)
304306
delete locSoundList[locPlayingMusic];
305-
}
306307
cc.AudioEngine.isMusicPlaying = false;
308+
this._musicIsStopped = true;
307309
}
308310
},
309311

@@ -314,7 +316,7 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
314316
* cc.AudioEngine.getInstance().pauseMusic();
315317
*/
316318
pauseMusic:function () {
317-
if (this._soundList.hasOwnProperty(this._playingMusic)) {
319+
if (!this._musicIsStopped && this._soundList.hasOwnProperty(this._playingMusic)) {
318320
var au = this._soundList[this._playingMusic].audio;
319321
au.pause();
320322
cc.AudioEngine.isMusicPlaying = false;
@@ -328,7 +330,7 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
328330
* cc.AudioEngine.getInstance().resumeMusic();
329331
*/
330332
resumeMusic:function () {
331-
if (this._soundList.hasOwnProperty(this._playingMusic)) {
333+
if (!this._musicIsStopped && this._soundList.hasOwnProperty(this._playingMusic)) {
332334
var au = this._soundList[this._playingMusic].audio;
333335
au.play();
334336
au.addEventListener("pause", this._musicListenerBound , false);
@@ -349,6 +351,7 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
349351
au.play();
350352
au.addEventListener("pause", this._musicListenerBound , false);
351353
cc.AudioEngine.isMusicPlaying = true;
354+
this._musicIsStopped = false;
352355
}
353356
},
354357

@@ -715,6 +718,7 @@ cc.SimpleAudioEngineForMobile = cc.SimpleAudioEngine.extend({
715718
au.loop = loop || false;
716719
au.play();
717720
cc.AudioEngine.isMusicPlaying = true;
721+
this._musicIsStopped = false;
718722
},
719723

720724
_musicListener:function(){
@@ -1818,7 +1822,7 @@ cc.AudioEngine.getInstance = function () {
18181822
if (cc.Browser.supportWebAudio && !(/iPhone OS/.test(ua)||/iPad/.test(ua))) {
18191823
this._instance = new cc.WebAudioEngine();
18201824
} else {
1821-
if(cc.Browser.isMobile()) //TODO construct a supported list for mobile browser
1825+
if(cc.Browser.isMobile) // TODO construct a supported list for mobile browser
18221826
this._instance = new cc.SimpleAudioEngineForMobile();
18231827
else
18241828
this._instance = new cc.SimpleAudioEngine();

‎HelloHTML5World/build.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
<target name="compile">
88
<jscomp compilationLevel="simple" warning="quiet"
9-
debug="false" output="myApp-HelloWorld.js">
9+
debug="false" output="myApp-HelloWorld.js"
10+
sourceMapOutputFile="sourcemap"
11+
sourceMapFormat="V3">
1012
<externs dir="${basedir}/../cocos2d">
1113
<file name="cocos2d_externs.js"/>
1214
</externs>

‎README.mdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Contact us
3232
------------------
3333
* Forum: [http://forum.cocos2d-x.org][5]
3434
* Twitter: [http://www.twitter.com/cocos2dhtml5][6]
35-
* Sina macro-blog: [http://t.sina.com.cn/cocos2dhtml5][7]
35+
* Sina Microblog: [http://t.sina.com.cn/cocos2dhtml5][7]
3636

3737
[1]: http://www.cocos2d-x.org "Cocos2d-html5"
3838
[2]: http://www.cocos2d-x.org "Cocos2d-X"

‎cocos2d/build.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
<target name="compile_Canvas">
88
<jscomp compilationLevel="simple" warning="quiet"
9-
debug="false" output="../lib/Cocos2d-html5-v2.2.1.min.js">
9+
debug="false" output="../lib/Cocos2d-html5-v2.2.1.min.js"
10+
sourceMapOutputFile="sourcemap"
11+
sourceMapFormat="V3">
1012
<externs dir="${basedir}">
1113
<file name="cocos2d_externs.js"/>
1214
</externs>

‎cocos2d/label_nodes/CCLabelTTF.js‎

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
3939
_fontName: null,
4040
_fontSize:0.0,
4141
_string:"",
42+
_originalText: null,
4243
_isMultiLine:false,
4344
_fontStyleStr:null,
4445

@@ -496,14 +497,37 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
496497
*/
497498
setString:function (text) {
498499
text = String(text);
499-
if (this._string != text) {
500-
this._string = text + "";
500+
if (this._originalText != text) {
501+
this._originalText = text + "";
502+
503+
this._updateString();
501504

502505
// Force update
503506
this._needUpdateTexture = true;
504507
}
505508
},
509+
_updateString: function() {
510+
if (this._originalText.length > 1) {
511+
if (this._dimensions.width > 0 && this._dimensions.height > 0) {
512+
var buffer = [];
513+
var maxWidth = 0;
514+
for (var i = 0; i < this._originalText.length ; i ++) {
515+
var width = cc.LabelTTF._getCharWidth(this._originalText.charCodeAt(i), this._fontSize, this._fontName);
516+
517+
if (maxWidth + width > this._dimensions.width) {
518+
buffer.push('\n');
519+
maxWidth = 0;
520+
}
506521

522+
buffer.push(this._originalText[i]);
523+
maxWidth += width;
524+
}
525+
this._string = buffer.join("");
526+
return;
527+
}
528+
}
529+
this._string = this._originalText;
530+
},
507531
/**
508532
* set Horizontal Alignment of cc.LabelTTF
509533
* @param {cc.TEXT_ALIGNMENT_LEFT|cc.TEXT_ALIGNMENT_CENTER|cc.TEXT_ALIGNMENT_RIGHT} alignment Horizontal Alignment
@@ -537,7 +561,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
537561
setDimensions:function (dim) {
538562
if (dim.width != this._dimensions.width || dim.height != this._dimensions.height) {
539563
this._dimensions = dim;
540-
564+
this._updateString();
541565
// Force udpate
542566
this._needUpdateTexture = true;
543567
}
@@ -1008,6 +1032,28 @@ if(cc.USE_LA88_LABELS)
10081032
else
10091033
cc.LabelTTF._SHADER_PROGRAM = cc.SHADER_POSITION_TEXTUREA8COLOR;
10101034

1035+
cc.LabelTTF.__charWidthCache = {};
1036+
cc.LabelTTF._getCharWidth = function(code, fontSize, fontName) {
1037+
if (!cc.LabelTTF.__charWidthCache[fontName + fontSize]) {
1038+
var label = cc.LabelTTF.create("字", fontName, fontSize);
1039+
var width = label.getContentSize().width;
1040+
var label2 = cc.LabelTTF.create("a", fontName, fontSize);
1041+
var width2 = label2.getContentSize().width;
1042+
cc.LabelTTF.__charWidthCache[fontName + fontSize] = {
1043+
double: width,
1044+
single: width2
1045+
};
1046+
}
1047+
1048+
var _charCache = cc.LabelTTF.__charWidthCache[fontName + fontSize];
1049+
var isDouble = code > 255;
1050+
if (isDouble) {
1051+
return _charCache.double;
1052+
}
1053+
else {
1054+
return _charCache.single;
1055+
}
1056+
};
10111057
cc.LabelTTF.__labelHeightDiv = document.createElement("div");
10121058
cc.LabelTTF.__labelHeightDiv.style.fontFamily = "Arial";
10131059
cc.LabelTTF.__labelHeightDiv.style.position = "absolute";

‎cocos2d/misc_nodes/CCProgressTimer.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ cc.ProgressTimer = cc.NodeRGBA.extend(/** @lends cc.ProgressTimer# */{
633633
return;
634634
}
635635
}
636+
this._updateColor();
636637

637638
var locVertexData = this._vertexData;
638639
if (!sameIndexCount) {
@@ -770,6 +771,7 @@ cc.ProgressTimer = cc.NodeRGBA.extend(/** @lends cc.ProgressTimer# */{
770771
locVertexData[5].texCoords = this._textureCoordFromAlphaPoint(cc.p(max.x, min.y));
771772
locVertexData[5].vertices = this._vertexFromAlphaPoint(cc.p(max.x, min.y));
772773
}
774+
this._updateColor();
773775
},
774776

775777
_updateColor:function () {

‎cocos2d/platform/CCApplication.js‎

Lines changed: 50 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -167,62 +167,65 @@ cc.isAddedHiddenEvent = false;
167167
*/
168168
cc.setup = function (el, width, height) {
169169
var element = cc.$(el) || cc.$('#' + el);
170+
var localCanvas, localContainer, localConStyle;
170171
if (element.tagName == "CANVAS") {
171172
width = width || element.width;
172173
height = height || element.height;
173174

174175
//it is already a canvas, we wrap it around with a div
175-
cc.container = cc.$new("DIV");
176-
cc.canvas = element;
177-
cc.canvas.parentNode.insertBefore(cc.container, cc.canvas);
178-
cc.canvas.appendTo(cc.container);
179-
cc.container.style.width = (width || 480) + "px";
180-
cc.container.style.height = (height || 320) + "px";
181-
cc.container.setAttribute('id', 'Cocos2dGameContainer');
182-
cc.container.style.margin = "0 auto";
183-
cc.canvas.setAttribute("width", width || 480);
184-
cc.canvas.setAttribute("height", height || 320);
176+
localContainer = cc.container = cc.$new("DIV");
177+
localConStyle = localContainer.style;
178+
localCanvas = cc.canvas = element;
179+
localCanvas.parentNode.insertBefore(localContainer, localCanvas);
180+
localCanvas.appendTo(localContainer);
181+
localConStyle.width = (width || 480) + "px";
182+
localConStyle.height = (height || 320) + "px";
183+
localContainer.setAttribute('id', 'Cocos2dGameContainer');
184+
localConStyle.margin = "0 auto";
185+
localCanvas.setAttribute("width", width || 480);
186+
localCanvas.setAttribute("height", height || 320);
185187
} else {//we must make a new canvas and place into this element
186188
if (element.tagName != "DIV") {
187189
cc.log("Warning: target element is not a DIV or CANVAS");
188190
}
189191
width = width || element.clientWidth;
190192
height = height || element.clientHeight;
191193

192-
cc.canvas = cc.$new("CANVAS");
193-
cc.canvas.addClass("gameCanvas");
194-
cc.canvas.setAttribute("width", width || 480);
195-
cc.canvas.setAttribute("height", height || 320);
196-
cc.container = element;
197-
element.appendChild(cc.canvas);
198-
cc.container.style.width = (width || 480) + "px";
199-
cc.container.style.height = (height || 320) + "px";
200-
cc.container.style.margin = "0 auto";
194+
localCanvas = cc.canvas = cc.$new("CANVAS");
195+
localCanvas.addClass("gameCanvas");
196+
localCanvas.setAttribute("width", width || 480);
197+
localCanvas.setAttribute("height", height || 320);
198+
localContainer = cc.container = element;
199+
localConStyle = localContainer.style;
200+
element.appendChild(localCanvas);
201+
localConStyle.width = (width || 480) + "px";
202+
localConStyle.height = (height || 320) + "px";
203+
localConStyle.margin = "0 auto";
201204
}
202-
cc.container.style.position = 'relative';
203-
cc.container.style.overflow = 'hidden';
204-
cc.container.top = '100%';
205+
localConStyle.position = 'relative';
206+
localConStyle.overflow = 'hidden';
207+
localContainer.top = '100%';
205208

206209
if(cc.__renderDoesnotSupport)
207210
return;
208211

209212
if (cc.Browser.supportWebGL)
210-
cc.renderContext = cc.webglContext = cc.create3DContext(cc.canvas,{'stencil': true, 'preserveDrawingBuffer': true, 'alpha': false });
213+
cc.renderContext = cc.webglContext = cc.create3DContext(localCanvas,{'stencil': true, 'preserveDrawingBuffer': true, 'alpha': false });
211214
if(cc.renderContext){
212215
cc.renderContextType = cc.WEBGL;
213216
window.gl = cc.renderContext; // global variable declared in CCMacro.js
214217
cc.drawingUtil = new cc.DrawingPrimitiveWebGL(cc.renderContext);
215218
cc.TextureCache.getInstance()._initializingRenderer();
216219
} else {
217-
cc.renderContext = cc.canvas.getContext("2d");
220+
cc.renderContext = localCanvas.getContext("2d");
218221
cc.mainRenderContextBackup = cc.renderContext;
219222
cc.renderContextType = cc.CANVAS;
220-
cc.renderContext.translate(0, cc.canvas.height);
223+
cc.renderContext.translate(0, localCanvas.height);
221224
cc.drawingUtil = new cc.DrawingPrimitiveCanvas(cc.renderContext);
222225
}
223226

224-
cc.originalCanvasSize = cc.size(cc.canvas.width, cc.canvas.height);
225-
cc.gameDiv = cc.container;
227+
cc.originalCanvasSize = cc.size(localCanvas.width, localCanvas.height);
228+
cc.gameDiv = localContainer;
226229

227230
cc.log(cc.ENGINE_VERSION);
228231
cc.Configuration.getInstance();
@@ -250,13 +253,30 @@ cc.setup = function (el, width, height) {
250253
}
251254

252255
function handleVisibilityChange() {
253-
if (!document[hidden])
256+
var audioEngine = cc.AudioEngine.getInstance();
257+
if (!document[hidden]){
254258
cc.Director.getInstance()._resetLastUpdate();
259+
audioEngine.resumeAllEffects();
260+
audioEngine.resumeMusic();
261+
} else{
262+
audioEngine.pauseAllEffects();
263+
audioEngine.pauseMusic();
264+
}
255265
}
256266

257267
if (typeof document.addEventListener === "undefined" ||
258268
typeof hidden === "undefined") {
259269
cc.isAddedHiddenEvent = false;
270+
window.addEventListener("focus", function () {
271+
var audioEngine = cc.AudioEngine.getInstance();
272+
audioEngine.resumeAllEffects();
273+
audioEngine.resumeMusic();
274+
}, false);
275+
window.addEventListener("blur", function () {
276+
var audioEngine = cc.AudioEngine.getInstance();
277+
audioEngine.pauseAllEffects();
278+
audioEngine.pauseMusic();
279+
}, false);
260280
} else {
261281
cc.isAddedHiddenEvent = true;
262282
document.addEventListener(visibilityChange, handleVisibilityChange, false);
@@ -275,7 +295,8 @@ cc._addUserSelectStatus = function(){
275295
cc._addBottomTag = function () {
276296
var bottom = document.createElement("div");
277297
bottom.id = "bottom";
278-
bottom.style.border = bottom.style.margin = bottom.style.padding = bottom.style.height = bottom.style.lineHeight = bottom.style.fontSize = "0px";
298+
var bStyle = bottom.style;
299+
bStyle.border = bStyle.margin = bStyle.padding = bStyle.height = bStyle.lineHeight = bStyle.fontSize = "0px";
279300
document.body.appendChild(bottom);
280301
window.location.href="#bottom";
281302
};

‎cocos2d/platform/CCClass.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ ClassManager.getNewInstanceId=function(){
151151

152152
// The dummy Class constructor
153153
function Class() {
154+
this.__instanceId = ClassManager.getNewInstanceId();
154155
// All construction is actually done in the init method
155156
if (this.ctor)
156157
this.ctor.apply(this, arguments);
157-
this.__instanceId = ClassManager.getNewInstanceId();
158158
}
159159

160160
Class.id = classId;

‎cocos2d/platform/CCCommon.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ cc._logToWebPage = function (message) {
100100
logList = document.createElement("ul");
101101
logDiv.appendChild(logList);
102102
logList.setAttribute("id", "logInfoList");
103-
logList.style.height = "200px";
103+
logList.style.height = cc.canvas.height + "px";
104104
logList.style.color = "#fff";
105105
logList.style.textAlign = "left";
106106
logList.style.listStyle = "disc outside";
@@ -142,7 +142,7 @@ cc._logToWebPage = function (message) {
142142
*/
143143
cc.log = function (message) {
144144
if (!cc.IS_SHOW_DEBUG_ON_PAGE) {
145-
console.log(message);
145+
console.log.apply(console, arguments);
146146
} else {
147147
cc._logToWebPage(message);
148148
}

‎cocos2d/platform/miniFramework.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ cc.create3DContext = function (canvas, opt_attribs) {
5252
* @type {Object}
5353
*/
5454
cc.Browser = {};
55+
56+
/**
57+
* Browsers that Cocos2d-HTML5 support well in WebGL render mode
58+
* @type {Array}
59+
*/
60+
cc.Browser.webglWhiteList = ["baidubrowser", "opera", "firefox", "chrome", "safari"];
61+
5562
(function () {
5663
var ua = navigator.userAgent;
5764
cc.Browser.ua = ua.toLowerCase();
@@ -77,7 +84,8 @@ cc.Browser = {};
7784
// check supportWebGL item
7885
cc._userRenderMode = parseInt(c["renderMode"]) || 0;
7986

80-
if (cc._userRenderMode === 1 || (cc._userRenderMode === 0 && cc.Browser.isMobile)) {
87+
var notInWhiteList = cc.Browser.webglWhiteList.indexOf(cc.Browser.type) == -1;
88+
if (cc._userRenderMode === 1 || (cc._userRenderMode === 0 && (cc.Browser.isMobile || notInWhiteList))) {
8189
//canvas only
8290
cc.Browser.supportWebGL = false;
8391
} else {

0 commit comments

Comments
 (0)