Skip to content

Commit fac1f96

Browse files
dingpinglvdingpinglv
committed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2844_RenameVersion
Conflicts: cocos2d/sprite_nodes/CCSprite.js
2 parents 5b14c28 + a8eca2f commit fac1f96

File tree

8 files changed

+226
-126
lines changed

8 files changed

+226
-126
lines changed

‎cocos2d/CCDirector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
336336
if (!this._paused)
337337
this._scheduler.update(this._deltaTime);
338338

339-
cc.renderContext.clearRect(0, 0, cc.canvas.width, -cc.canvas.height);
339+
cc.renderContext.clearRect(0, 0, cc.originalCanvasSize.width, -cc.originalCanvasSize.height);
340340

341341
/* to avoid flickr, nextScene MUST be here: after tick and before draw.
342342
XXX: Which bug is this one. It seems that it can't be reproduced with v0.9 */

‎cocos2d/CCLoader.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ cc.LoaderScene = cc.Scene.extend(/** @lends cc.LoaderScene# */{
413413
cc.Scene.prototype.init.call(this);
414414

415415
//logo
416+
var logoWidth = 160;
416417
var logoHeight = 200;
417418
var centerPos = cc.p(this._winSize.width / 2, this._winSize.height / 2);
418419

@@ -423,8 +424,8 @@ cc.LoaderScene = cc.Scene.extend(/** @lends cc.LoaderScene# */{
423424
this.removeEventListener('load', arguments.callee, false);
424425
});
425426
this._logoTexture.src = "data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAAlAAD/4QMpaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjAtYzA2MCA2MS4xMzQ3NzcsIDIwMTAvMDIvMTItMTc6MzI6MDAgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjM4MDBEMDY2QTU1MjExRTFBQTAzQjEzMUNFNzMxRkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjM4MDBEMDY1QTU1MjExRTFBQTAzQjEzMUNFNzMxRkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzUgV2luZG93cyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU2RTk0OEM4OERCNDExRTE5NEUyRkE3M0M3QkE1NTlEIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU2RTk0OEM5OERCNDExRTE5NEUyRkE3M0M3QkE1NTlEIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+/+4ADkFkb2JlAGTAAAAAAf/bAIQADQkJCQoJDQoKDRMMCwwTFhENDREW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";
426-
this._logoTexture.width = 160;
427-
this._logoTexture.height = 200;
427+
this._logoTexture.width = logoWidth;
428+
this._logoTexture.height = logoHeight;
428429

429430
// bg
430431
this._bgLayer = cc.LayerColor.create(cc.c4(32, 32, 32, 255));
@@ -550,4 +551,4 @@ cc.LoaderScene.preload = function (resources, selector, target) {
550551
}
551552

552553
return this._instance;
553-
};
554+
};

‎cocos2d/base_nodes/CCdomNode.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,6 @@ cc.DOM.setTransform = function (x) {
445445
if (x.setAnchorPoint)
446446
x.setAnchorPoint(x.getAnchorPoint());
447447
x.dom.transforms();
448-
x.dom.position.y = -x.getPosition().y;
449-
x.dom.rotation = x.getRotation();
450-
x.dom.scale = {x:x.getScaleX(), y:x.getScaleY()};
451-
x.dom.skew = {x:x.getSkewX(), y:x.getSkewY()};
452-
if (x.setAnchorPoint)
453-
x.setAnchorPoint(x.getAnchorPoint());
454-
x.dom.transforms();
455448
}
456449

457450
};
@@ -537,4 +530,4 @@ cc.DOM.convert = function (nodeObject) {
537530
cc.DOM.setTransform(args[i]);
538531
args[i].setVisible(args[i].isVisible());
539532
}
540-
};
533+
};

‎cocos2d/particle_nodes/CCParticleSystem.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1830,8 +1830,10 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
18301830
// position
18311831
if (this._positionType == cc.PARTICLE_TYPE_FREE)
18321832
particle.startPos = this.convertToWorldSpace(this._pointZeroForParticle);
1833-
else if (this._positionType == cc.PARTICLE_TYPE_RELATIVE)
1834-
particle.startPos = this._position;
1833+
else if (this._positionType == cc.PARTICLE_TYPE_RELATIVE){
1834+
particle.startPos.x = this._position.x;
1835+
particle.startPos.y = this._position.y;
1836+
}
18351837

18361838
// direction
18371839
var a = cc.DEGREES_TO_RADIANS(this._angle + this._angleVar * locRandomMinus11());
@@ -2056,7 +2058,6 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
20562058
var currentPosition = cc.Particle.TemporaryPoints[0];
20572059
if (this._positionType == cc.PARTICLE_TYPE_FREE) {
20582060
cc.pIn(currentPosition, this.convertToWorldSpace(this._pointZeroForParticle));
2059-
20602061
} else if (this._positionType == cc.PARTICLE_TYPE_RELATIVE) {
20612062
currentPosition.x = this._position.x;
20622063
currentPosition.y = this._position.y;

‎cocos2d/platform/CCApplication.js

+1
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ cc.setup = function (el, width, height) {
179179
cc.container.style.width = (width || 480) + "px";
180180
cc.container.style.height = (height || 320) + "px";
181181
cc.container.setAttribute('id', 'Cocos2dGameContainer');
182+
cc.container.style.margin = "0 auto";
182183
cc.canvas.setAttribute("width", width || 480);
183184
cc.canvas.setAttribute("height", height || 320);
184185
} else {//we must make a new canvas and place into this element

‎cocos2d/platform/CCEGLView.js

+29-21
Original file line numberDiff line numberDiff line change
@@ -337,17 +337,17 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
337337
director._winSizeInPoints = this.getDesignResolutionSize();
338338

339339
if (cc.renderContextType === cc.CANVAS) {
340-
var locWidth = 0, locHeight = 0;
341340
if (this._resolutionPolicy === cc.RESOLUTION_POLICY.SHOW_ALL) {
342-
locWidth = (this._screenSize.width - viewPortW) / 2;
343-
locHeight = -(this._screenSize.height - viewPortH) / 2;
344-
var context = cc.renderContext;
345-
context.beginPath();
346-
context.rect(locWidth, -viewPortH + locHeight, viewPortW, viewPortH);
347-
context.clip();
348-
context.closePath();
341+
var locHeight = Math.abs(this._screenSize.height - viewPortH) / 2;
342+
cc.canvas.width = viewPortW;
343+
cc.canvas.height = viewPortH;
344+
cc.container.style.width = viewPortW + "px";
345+
cc.container.style.height = viewPortH + "px";
346+
cc.renderContext.translate(0, viewPortH);
347+
this._ele.style.paddingTop = locHeight + "px";
348+
this._ele.style.paddingBottom = locHeight + "px";
349+
this._viewPortRect = cc.rect(0, 0, viewPortW, viewPortH);
349350
}
350-
cc.renderContext.translate(locWidth, locHeight);
351351
cc.renderContext.scale(this._scaleX, this._scaleY);
352352
} else {
353353
// reset director's member variables to fit visible rect
@@ -653,10 +653,12 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
653653
var ys = [];
654654

655655
var i = 0;
656+
var touch;
656657
for (var j = 0; j < touches.length; j++) {
657-
ids[i] = j;
658-
xs[i] = touches[j].getLocation().x;
659-
ys[i] = touches[j].getLocation().y;
658+
touch = touches[j];
659+
ids[i] = touch.getId() || j;
660+
xs[i] = touch.getLocation().x;
661+
ys[i] = touch.getLocation().y;
660662
++i;
661663
}
662664
this.handleTouchesBegin(i, ids, xs, ys);
@@ -668,10 +670,12 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
668670
var ys = [];
669671

670672
var i = 0;
673+
var touch;
671674
for (var j = 0; j < touches.length; j++) {
672-
ids[i] = j;
673-
xs[i] = touches[j].getLocation().x;
674-
ys[i] = touches[j].getLocation().y;
675+
touch = touches[j];
676+
ids[i] = touch.getId() || j;
677+
xs[i] = touch.getLocation().x;
678+
ys[i] = touch.getLocation().y;
675679
++i;
676680
}
677681
this.handleTouchesMove(i, ids, xs, ys);
@@ -683,10 +687,12 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
683687
var ys = [];
684688

685689
var i = 0;
690+
var touch;
686691
for (var j = 0; j < touches.length; j++) {
687-
ids[i] = j;
688-
xs[i] = touches[j].getLocation().x;
689-
ys[i] = touches[j].getLocation().y;
692+
touch = touches[j];
693+
ids[i] = touch.getId() || j;
694+
xs[i] = touch.getLocation().x;
695+
ys[i] = touch.getLocation().y;
690696
++i;
691697
}
692698
this.handleTouchesEnd(i, ids, xs, ys);
@@ -698,10 +704,12 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
698704
var ys = [];
699705

700706
var i = 0;
707+
var touch;
701708
for (var j = 0; j < touches.length; j++) {
702-
ids[i] = j;
703-
xs[i] = touches[j].getLocation().x;
704-
ys[i] = touches[j].getLocation().y;
709+
touch = touches[j];
710+
ids[i] = touch.getId() || j;
711+
xs[i] = touch.getLocation().x;
712+
ys[i] = touch.getLocation().y;
705713
++i;
706714
}
707715
this.handleTouchesCancel(i, ids, xs, ys);

‎extensions/GUI/CCScrollView/CCScrollView.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ cc.ScrollViewDelegate = cc.Class.extend({
5151
});
5252

5353
/**
54-
* ScrollView support for cocos2d for iphone.
54+
* ScrollView support for cocos2d -x.
5555
* It provides scroll view functionalities to cocos2d projects natively.
5656
*/
5757
cc.ScrollView = cc.Layer.extend({
@@ -145,7 +145,7 @@ cc.ScrollView = cc.Layer.extend({
145145
* Sets a new content offset. It ignores max/min offset. It just sets what's given. (just like UIKit's UIScrollView)
146146
*
147147
* @param {cc.Point} offset new offset
148-
* @param {Number} [animated=] If YES, the view scrolls to the new offset
148+
* @param {Number} [animated=] If true, the view will scroll to the new offset
149149
*/
150150
setContentOffset: function (offset, animated) {
151151
if (animated) { //animate scrolling
@@ -386,7 +386,7 @@ cc.ScrollView = cc.Layer.extend({
386386
locTouches.push(touch);
387387
//}
388388

389-
if (locTouches.length == 1) { // scrolling
389+
if (locTouches.length === 1) { // scrolling
390390
this._touchPoint = this.convertTouchToNodeSpace(touch);
391391
this._touchMoved = false;
392392
this._dragging = true; //dragging started
@@ -549,8 +549,9 @@ cc.ScrollView = cc.Layer.extend({
549549
// draw children zOrder >= 0
550550
for (; i < childrenLen; i++)
551551
locChildren[i].visit(context);
552-
} else
552+
} else{
553553
this.draw(context); // self draw
554+
}
554555

555556
this._afterDraw();
556557

@@ -582,8 +583,9 @@ cc.ScrollView = cc.Layer.extend({
582583
// draw children zOrder >= 0
583584
for (; i < childrenLen; i++)
584585
locChildren[i].visit();
585-
} else
586+
} else{
586587
this.draw(context);
588+
}
587589

588590
this._afterDraw(context);
589591
if (locGrid && locGrid.isActive())

0 commit comments

Comments
 (0)