UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-08 11:46:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't clear VAO on each PolygonBatch flush.

Browse Source
This commit is contained in:
NathanSweet 2014-05-29 19:34:09 +02:00
parent be09165723
commit 37c27ca3f9
9 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-cocos2d-iphone/2/src/spine/PolygonBatch.m
View File

@ -87,7 +87,6 @@
- (void) flush { - (void) flush {
if (!_verticesCount) return; if (!_verticesCount) return;
ccGLBindVAO(0);
ccGLBindTexture2D(_texture.name); ccGLBindTexture2D(_texture.name);
glEnableVertexAttribArray(kCCVertexAttrib_Position); glEnableVertexAttribArray(kCCVertexAttrib_Position);
glEnableVertexAttribArray(kCCVertexAttrib_Color); glEnableVertexAttribArray(kCCVertexAttrib_Color);

1
spine-cocos2d-iphone/2/src/spine/SkeletonRenderer.m
View File

@ -134,6 +134,7 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0};
- (void) draw { - (void) draw {
CC_NODE_DRAW_SETUP(); CC_NODE_DRAW_SETUP();
ccGLBindVAO(0);
ccColor3B nodeColor = self.color; ccColor3B nodeColor = self.color;
_skeleton->r = nodeColor.r / (float)255; _skeleton->r = nodeColor.r / (float)255;

1
spine-cocos2d-iphone/3.0/src/spine/PolygonBatch.m
View File

@ -88,7 +88,6 @@
- (void) flush { - (void) flush {
if (!_verticesCount) return; if (!_verticesCount) return;
ccGLBindVAO(0);
ccGLBindTexture2D(_texture.name); ccGLBindTexture2D(_texture.name);
glEnableVertexAttribArray(kCCVertexAttrib_Position); glEnableVertexAttribArray(kCCVertexAttrib_Position);
glEnableVertexAttribArray(kCCVertexAttrib_Color); glEnableVertexAttribArray(kCCVertexAttrib_Color);

1
spine-cocos2d-iphone/3.0/src/spine/SkeletonRenderer.m
View File

@ -135,6 +135,7 @@ static const int quadTriangles[6] = {0, 1, 2, 2, 3, 0};
- (void) draw { - (void) draw {
CC_NODE_DRAW_SETUP(); CC_NODE_DRAW_SETUP();
ccGLBindVAO(0);
CCColor* nodeColor = self.color; CCColor* nodeColor = self.color;
_skeleton->r = nodeColor.red; _skeleton->r = nodeColor.red;

1
spine-cocos2dx/2/src/spine/PolygonBatch.cpp
View File

@ -93,7 +93,6 @@ void PolygonBatch::add (CCTexture2D* addTexture,
void PolygonBatch::flush () { void PolygonBatch::flush () {
if (!verticesCount) return; if (!verticesCount) return;
ccGLBindVAO(0);
ccGLBindTexture2D(texture->getName()); ccGLBindTexture2D(texture->getName());
glEnableVertexAttribArray(kCCVertexAttrib_Position); glEnableVertexAttribArray(kCCVertexAttrib_Position);
glEnableVertexAttribArray(kCCVertexAttrib_Color); glEnableVertexAttribArray(kCCVertexAttrib_Color);

1
spine-cocos2dx/2/src/spine/SkeletonRenderer.cpp
View File

@ -136,6 +136,7 @@ void SkeletonRenderer::update (float deltaTime) {
void SkeletonRenderer::draw () { void SkeletonRenderer::draw () {
CC_NODE_DRAW_SETUP(); CC_NODE_DRAW_SETUP();
ccGLBindVAO(0);
ccColor3B nodeColor = getColor(); ccColor3B nodeColor = getColor();
skeleton->r = nodeColor.r / (float)255; skeleton->r = nodeColor.r / (float)255;

1
spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp
View File

@ -93,7 +93,6 @@ void PolygonBatch::add (const Texture2D* addTexture,
void PolygonBatch::flush () { void PolygonBatch::flush () {
if (!verticesCount) return; if (!verticesCount) return;
GL::bindVAO(0);
GL::bindTexture2D(texture->getName()); GL::bindTexture2D(texture->getName());
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR);

1
spine-cocos2dx/3.0/src/spine/SkeletonRenderer.cpp
View File

@ -142,6 +142,7 @@ void SkeletonRenderer::draw(Renderer* renderer, const kmMat4& transform, bool tr
void SkeletonRenderer::drawSkeleton (const kmMat4& transform, bool transformUpdated) { void SkeletonRenderer::drawSkeleton (const kmMat4& transform, bool transformUpdated) {
getShaderProgram()->use(); getShaderProgram()->use();
getShaderProgram()->setUniformsForBuiltins(transform); getShaderProgram()->setUniformsForBuiltins(transform);
GL::bindVAO(0);
Color3B nodeColor = getColor(); Color3B nodeColor = getColor();
skeleton->r = nodeColor.r / (float)255; skeleton->r = nodeColor.r / (float)255;

1
spine-cocos2dx/3.1/src/spine/SkeletonRenderer.cpp
View File

@ -142,6 +142,7 @@ void SkeletonRenderer::draw (Renderer* renderer, const Matrix& transform, bool t
void SkeletonRenderer::drawSkeleton (const Matrix &transform, bool transformUpdated) { void SkeletonRenderer::drawSkeleton (const Matrix &transform, bool transformUpdated) {
getGLProgram()->use(); getGLProgram()->use();
getGLProgram()->setUniformsForBuiltins(transform); getGLProgram()->setUniformsForBuiltins(transform);
GL::bindVAO(0);
Color3B nodeColor = getColor(); Color3B nodeColor = getColor();
skeleton->r = nodeColor.r / (float)255; skeleton->r = nodeColor.r / (float)255;