Skip to content

Commit 8a493d2

Browse files
pandamicropandamicro
committed
Merge branch 'develop-3.0' of git://github.com/cocos2d/cocos2d-html5 into develop-3.0
Conflicts: cocos2d/core/base-nodes/BaseNodesWebGL.js
2 parents 0fcbe08 + 321bf6b commit 8a493d2

29 files changed

+2393
-2189
lines changed

‎CCBoot.js‎

Lines changed: 283 additions & 279 deletions
Large diffs are not rendered by default.

‎cocos2d/core/CCDirector.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,10 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{
354354
//cleanup scheduler
355355
this.getScheduler().unscheduleAllCallbacks();
356356

357+
// Disable event dispatching
358+
if(cc.eventManager)
359+
cc.eventManager.setEnabled(false);
360+
357361
// don't release the event handlers
358362
// They are needed in case the director is run again
359363

@@ -840,16 +844,15 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
840844
};
841845

842846
_p.setDepthTest = function () {
843-
return;
844847
};
845848

846849
_p.setOpenGLView = function (openGLView) {
847850
// set size
848851
this._winSizeInPoints.width = cc._canvas.width; //this._openGLView.getDesignResolutionSize();
849852
this._winSizeInPoints.height = cc._canvas.height;
850853
this._openGLView = openGLView || cc.view;
851-
852-
return;
854+
if(cc.eventManager)
855+
cc.eventManager.setEnabled(true);
853856
};
854857

855858
_p._clear = function() {

‎cocos2d/core/CCDirectorWebGL.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ if (cc._renderType === cc._RENDER_TYPE_WEBGL) {
133133
}*/
134134

135135
//}
136+
if(cc.eventManager)
137+
cc.eventManager.setEnabled(true);
136138
};
137139

138140
_p._clear = function() {

‎cocos2d/core/base-nodes/BaseNodesPropertyDefine.js‎

Lines changed: 114 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -24,120 +24,122 @@
2424
THE SOFTWARE.
2525
****************************************************************************/
2626

27+
_tmp.PrototypeCCNode = function () {
2728

28-
/*
29-
CCNode
30-
*/
29+
var _p = cc.Node.prototype;
3130

32-
var _p = cc.Node.prototype;
31+
cc.defineGetterSetter(_p, "x", _p.getPositionX, _p.setPositionX);
32+
cc.defineGetterSetter(_p, "y", _p.getPositionY, _p.setPositionY);
33+
/** @expose */
34+
//_p.pos;
35+
//cc.defineGetterSetter(_p, "pos", _p.getPosition, _p.setPosition);
36+
/** @expose */
37+
_p.width;
38+
cc.defineGetterSetter(_p, "width", _p._getWidth, _p._setWidth);
39+
/** @expose */
40+
_p.height;
41+
cc.defineGetterSetter(_p, "height", _p._getHeight, _p._setHeight);
42+
/** @expose */
43+
//_p.size;
44+
//cc.defineGetterSetter(_p, "size", _p.getContentSize, _p.setContentSize);
45+
/** @expose */
46+
//_p.anchor;
47+
//cc.defineGetterSetter(_p, "anchor", _p._getAnchor, _p._setAnchor);
48+
/** @expose */
49+
_p.anchorX;
50+
cc.defineGetterSetter(_p, "anchorX", _p._getAnchorX, _p._setAnchorX);
51+
/** @expose */
52+
_p.anchorY;
53+
cc.defineGetterSetter(_p, "anchorY", _p._getAnchorY, _p._setAnchorY);
54+
/** @expose */
55+
_p.skewX;
56+
cc.defineGetterSetter(_p, "skewX", _p.getSkewX, _p.setSkewX);
57+
/** @expose */
58+
_p.skewY;
59+
cc.defineGetterSetter(_p, "skewY", _p.getSkewY, _p.setSkewY);
60+
/** @expose */
61+
_p.zIndex;
62+
cc.defineGetterSetter(_p, "zIndex", _p.getLocalZOrder, _p.setLocalZOrder);
63+
/** @expose */
64+
_p.vertexZ;
65+
cc.defineGetterSetter(_p, "vertexZ", _p.getVertexZ, _p.setVertexZ);
66+
/** @expose */
67+
_p.rotation;
68+
cc.defineGetterSetter(_p, "rotation", _p.getRotation, _p.setRotation);
69+
/** @expose */
70+
_p.rotationX;
71+
cc.defineGetterSetter(_p, "rotationX", _p.getRotationX, _p.setRotationX);
72+
/** @expose */
73+
_p.rotationY;
74+
cc.defineGetterSetter(_p, "rotationY", _p.getRotationY, _p.setRotationY);
75+
/** @expose */
76+
_p.scale;
77+
cc.defineGetterSetter(_p, "scale", _p.getScale, _p.setScale);
78+
/** @expose */
79+
_p.scaleX;
80+
cc.defineGetterSetter(_p, "scaleX", _p.getScaleX, _p.setScaleX);
81+
/** @expose */
82+
_p.scaleY;
83+
cc.defineGetterSetter(_p, "scaleY", _p.getScaleY, _p.setScaleY);
84+
/** @expose */
85+
_p.children;
86+
cc.defineGetterSetter(_p, "children", _p.getChildren);
87+
/** @expose */
88+
_p.childrenCount;
89+
cc.defineGetterSetter(_p, "childrenCount", _p.getChildrenCount);
90+
/** @expose */
91+
_p.parent;
92+
cc.defineGetterSetter(_p, "parent", _p.getParent, _p.setParent);
93+
/** @expose */
94+
_p.visible;
95+
cc.defineGetterSetter(_p, "visible", _p.isVisible, _p.setVisible);
96+
/** @expose */
97+
_p.running;
98+
cc.defineGetterSetter(_p, "running", _p.isRunning);
99+
/** @expose */
100+
_p.ignoreAnchor;
101+
cc.defineGetterSetter(_p, "ignoreAnchor", _p.isIgnoreAnchorPointForPosition, _p.ignoreAnchorPointForPosition);
102+
/** @expose */
103+
_p.tag;
104+
/** @expose */
105+
_p.userData;
106+
/** @expose */
107+
_p.userObject;
108+
/** @expose */
109+
_p.arrivalOrder;
110+
/** @expose */
111+
_p.actionManager;
112+
cc.defineGetterSetter(_p, "actionManager", _p.getActionManager, _p.setActionManager);
113+
/** @expose */
114+
_p.scheduler;
115+
cc.defineGetterSetter(_p, "scheduler", _p.getScheduler, _p.setScheduler);
116+
//cc.defineGetterSetter(_p, "boundingBox", _p.getBoundingBox);
117+
/** @expose */
118+
_p.shaderProgram;
119+
cc.defineGetterSetter(_p, "shaderProgram", _p.getShaderProgram, _p.setShaderProgram);
120+
/** @expose */
121+
_p.glServerState;
122+
cc.defineGetterSetter(_p, "glServerState", _p.getGLServerState, _p.setGLServerState);
123+
};
33124

34-
cc.defineGetterSetter(_p, "x", _p.getPositionX, _p.setPositionX);
35-
cc.defineGetterSetter(_p, "y", _p.getPositionY, _p.setPositionY);
36-
/** @expose */
37-
//_p.pos;
38-
//cc.defineGetterSetter(_p, "pos", _p.getPosition, _p.setPosition);
39-
/** @expose */
40-
_p.width;
41-
cc.defineGetterSetter(_p, "width", _p._getWidth, _p._setWidth);
42-
/** @expose */
43-
_p.height;
44-
cc.defineGetterSetter(_p, "height", _p._getHeight, _p._setHeight);
45-
/** @expose */
46-
//_p.size;
47-
//cc.defineGetterSetter(_p, "size", _p.getContentSize, _p.setContentSize);
48-
/** @expose */
49-
//_p.anchor;
50-
//cc.defineGetterSetter(_p, "anchor", _p._getAnchor, _p._setAnchor);
51-
/** @expose */
52-
_p.anchorX;
53-
cc.defineGetterSetter(_p, "anchorX", _p._getAnchorX, _p._setAnchorX);
54-
/** @expose */
55-
_p.anchorY;
56-
cc.defineGetterSetter(_p, "anchorY", _p._getAnchorY, _p._setAnchorY);
57-
/** @expose */
58-
_p.skewX;
59-
cc.defineGetterSetter(_p, "skewX", _p.getSkewX, _p.setSkewX);
60-
/** @expose */
61-
_p.skewY;
62-
cc.defineGetterSetter(_p, "skewY", _p.getSkewY, _p.setSkewY);
63-
/** @expose */
64-
_p.zIndex;
65-
cc.defineGetterSetter(_p, "zIndex", _p.getLocalZOrder, _p.setLocalZOrder);
66-
/** @expose */
67-
_p.vertexZ;
68-
cc.defineGetterSetter(_p, "vertexZ", _p.getVertexZ, _p.setVertexZ);
69-
/** @expose */
70-
_p.rotation;
71-
cc.defineGetterSetter(_p, "rotation", _p.getRotation, _p.setRotation);
72-
/** @expose */
73-
_p.rotationX;
74-
cc.defineGetterSetter(_p, "rotationX", _p.getRotationX, _p.setRotationX);
75-
/** @expose */
76-
_p.rotationY;
77-
cc.defineGetterSetter(_p, "rotationY", _p.getRotationY, _p.setRotationY);
78-
/** @expose */
79-
_p.scale;
80-
cc.defineGetterSetter(_p, "scale", _p.getScale, _p.setScale);
81-
/** @expose */
82-
_p.scaleX;
83-
cc.defineGetterSetter(_p, "scaleX", _p.getScaleX, _p.setScaleX);
84-
/** @expose */
85-
_p.scaleY;
86-
cc.defineGetterSetter(_p, "scaleY", _p.getScaleY, _p.setScaleY);
87-
/** @expose */
88-
_p.children;
89-
cc.defineGetterSetter(_p, "children", _p.getChildren);
90-
/** @expose */
91-
_p.childrenCount;
92-
cc.defineGetterSetter(_p, "childrenCount", _p.getChildrenCount);
93-
/** @expose */
94-
_p.parent;
95-
cc.defineGetterSetter(_p, "parent", _p.getParent, _p.setParent);
96-
/** @expose */
97-
_p.visible;
98-
cc.defineGetterSetter(_p, "visible", _p.isVisible, _p.setVisible);
99-
/** @expose */
100-
_p.running;
101-
cc.defineGetterSetter(_p, "running", _p.isRunning);
102-
/** @expose */
103-
_p.ignoreAnchor;
104-
cc.defineGetterSetter(_p, "ignoreAnchor", _p.isIgnoreAnchorPointForPosition, _p.ignoreAnchorPointForPosition);
105-
/** @expose */
106-
_p.tag;
107-
/** @expose */
108-
_p.userData;
109-
/** @expose */
110-
_p.userObject;
111-
/** @expose */
112-
_p.arrivalOrder;
113-
/** @expose */
114-
_p.actionManager;
115-
cc.defineGetterSetter(_p, "actionManager", _p.getActionManager, _p.setActionManager);
116-
/** @expose */
117-
_p.scheduler;
118-
cc.defineGetterSetter(_p, "scheduler", _p.getScheduler, _p.setScheduler);
119-
//cc.defineGetterSetter(_p, "boundingBox", _p.getBoundingBox);
120-
/** @expose */
121-
_p.shaderProgram;
122-
cc.defineGetterSetter(_p, "shaderProgram", _p.getShaderProgram, _p.setShaderProgram);
123-
/** @expose */
124-
_p.glServerState;
125-
cc.defineGetterSetter(_p, "glServerState", _p.getGLServerState, _p.setGLServerState);
125+
_tmp.PrototypeCCNodeRGBA = function () {
126+
127+
var _p = cc.NodeRGBA.prototype;
128+
/** @expose */
129+
_p.opacity;
130+
cc.defineGetterSetter(_p, "opacity", _p.getOpacity, _p.setOpacity);
131+
/** @expose */
132+
_p.opacityModifyRGB;
133+
cc.defineGetterSetter(_p, "opacityModifyRGB", _p.isOpacityModifyRGB, _p.setOpacityModifyRGB);
134+
/** @expose */
135+
_p.cascadeOpacity;
136+
cc.defineGetterSetter(_p, "cascadeOpacity", _p.isCascadeOpacityEnabled, _p.setCascadeOpacityEnabled);
137+
/** @expose */
138+
_p.color;
139+
cc.defineGetterSetter(_p, "color", _p.getColor, _p.setColor);
140+
/** @expose */
141+
_p.cascadeColor;
142+
cc.defineGetterSetter(_p, "cascadeColor", _p.isCascadeColorEnabled, _p.setCascadeColorEnabled);
143+
};
126144

127-
var _p = cc.NodeRGBA.prototype;
128-
/** @expose */
129-
_p.opacity;
130-
cc.defineGetterSetter(_p, "opacity", _p.getOpacity, _p.setOpacity);
131-
/** @expose */
132-
_p.opacityModifyRGB;
133-
cc.defineGetterSetter(_p, "opacityModifyRGB", _p.isOpacityModifyRGB, _p.setOpacityModifyRGB);
134-
/** @expose */
135-
_p.cascadeOpacity;
136-
cc.defineGetterSetter(_p, "cascadeOpacity", _p.isCascadeOpacityEnabled, _p.setCascadeOpacityEnabled);
137-
/** @expose */
138-
_p.color;
139-
cc.defineGetterSetter(_p, "color", _p.getColor, _p.setColor);
140-
/** @expose */
141-
_p.cascadeColor;
142-
cc.defineGetterSetter(_p, "cascadeColor", _p.isCascadeColorEnabled, _p.setCascadeColorEnabled);
143145

‎cocos2d/core/base-nodes/BaseNodesWebGL.js‎

Lines changed: 6 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
THE SOFTWARE.
2525
****************************************************************************/
2626

27-
if (cc._renderType === cc._RENDER_TYPE_WEBGL) {
27+
_tmp.WebGLCCNode = function () {
28+
2829
/**
2930
* CCNode
3031
* @type {Object|Function|cc.Node|*}
@@ -54,7 +55,7 @@ if (cc._renderType === cc._RENDER_TYPE_WEBGL) {
5455
this._transformDirty === false && (this._transformDirty = this._inverseDirty = true);
5556
};
5657

57-
_p.visit = function(){
58+
_p.visit = function () {
5859
var _t = this;
5960
// quick return if not visible
6061
if (!_t._visible)
@@ -106,7 +107,7 @@ if (cc._renderType === cc._RENDER_TYPE_WEBGL) {
106107
_p.transform = function () {
107108
var _t = this;
108109
//optimize performance for javascript
109-
var t4x4 = _t._transform4x4, topMat4 = cc.current_stack.top;
110+
var t4x4 = _t._transform4x4, topMat4 = cc.current_stack.top;
110111

111112
// Convert 3x3 into 4x4 matrix
112113
//cc.CGAffineToGL(_t.nodeToParentTransform(), _t._transform4x4.mat);
@@ -144,72 +145,6 @@ if (cc._renderType === cc._RENDER_TYPE_WEBGL) {
144145
}
145146
};
146147

147-
_p.nodeToParentTransform = function () {
148-
var _t = this;
149-
if (_t._transformDirty) {
150-
// Translate values
151-
var x = _t._position.x;
152-
var y = _t._position.y;
153-
var apx = _t._anchorPointInPoints.x, napx = -apx;
154-
var apy = _t._anchorPointInPoints.y, napy = -apy;
155-
var scx = _t._scaleX, scy = _t._scaleY;
156-
157-
if (_t._ignoreAnchorPointForPosition) {
158-
x += apx;
159-
y += apy;
160-
}
161-
162-
// Rotation values
163-
// Change rotation code to handle X and Y
164-
// If we skew with the exact same value for both x and y then we're simply just rotating
165-
var cx = 1, sx = 0, cy = 1, sy = 0;
166-
if (_t._rotationX !== 0 || _t._rotationY !== 0) {
167-
cx = Math.cos(-_t._rotationRadiansX);
168-
sx = Math.sin(-_t._rotationRadiansX);
169-
cy = Math.cos(-_t._rotationRadiansY);
170-
sy = Math.sin(-_t._rotationRadiansY);
171-
}
172-
var needsSkewMatrix = ( _t._skewX || _t._skewY );
173-
174-
// optimization:
175-
// inline anchor point calculation if skew is not needed
176-
// Adjusted transform calculation for rotational skew
177-
if (!needsSkewMatrix && (apx !== 0 || apy !== 0)) {
178-
x += cy * napx * scx + -sx * napy * scy;
179-
y += sy * napx * scx + cx * napy * scy;
180-
}
181-
182-
// Build Transform Matrix
183-
// Adjusted transform calculation for rotational skew
184-
var t = _t._transform;
185-
t.a = cy * scx;
186-
t.b = sy * scx;
187-
t.c = -sx * scy;
188-
t.d = cx * scy;
189-
t.tx = x;
190-
t.ty = y;
191-
192-
// XXX: Try to inline skew
193-
// If skew is needed, apply skew and then anchor point
194-
if (needsSkewMatrix) {
195-
t = cc.AffineTransformConcat({a: 1.0, b: Math.tan(cc.degreesToRadians(_t._skewY)),
196-
c: Math.tan(cc.degreesToRadians(_t._skewX)), d: 1.0, tx: 0.0, ty: 0.0}, t);
197-
198-
// adjust anchor point
199-
if (apx !== 0 || apy !== 0)
200-
t = cc.AffineTransformTranslate(t, napx, napy);
201-
}
202-
203-
if (_t._additionalTransformDirty) {
204-
t = cc.AffineTransformConcat(t, _t._additionalTransform);
205-
_t._additionalTransformDirty = false;
206-
}
207-
_t._transform = t;
208-
_t._transformDirty = false;
209-
}
210-
return _t._transform;
211-
};
212-
213-
delete _p;
148+
_p.nodeToParentTransform = _p._nodeToParentTransformForWebGL;
214149

215-
}
150+
};

0 commit comments

Comments
 (0)