Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修改粒子特效bug #3560

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

修改粒子特效bug #3560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0794748
修改粒子特效重力被改变的问题
pengchengZenjoy Aug 7, 2018
a1779d4
修改粒子特效错误影响其他混合方法的问题
pengchengZenjoy Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
this._glProgramState.apply(this._matrix);
cc.glBlendFuncForParticle(_t._blendFunc.src, _t._blendFunc.dst);
_t.textureAtlas.drawQuads();
cc.glBlendResetToCache();
};

proto._initWithTexture = function () {
Expand Down
3 changes: 2 additions & 1 deletion cocos2d/particle/CCParticleSystem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
setGravity: function (gravity) {
if (this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY)
cc.log("cc.ParticleBatchNode.setGravity() : Particle Mode should be Gravity");
this.modeA.gravity = gravity;
this.modeA.gravity.x = gravity.x;
this.modeA.gravity.y = gravity.y;
},

/**
Expand Down
1 change: 1 addition & 0 deletions cocos2d/particle/CCParticleSystemWebGLRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@

gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]);
gl.drawElements(gl.TRIANGLES, node._particleIdx * 6, gl.UNSIGNED_SHORT, 0);
cc.glBlendResetToCache();
};

proto.initTexCoordsWithRect = function (pointRect) {
Expand Down