From 8c04297b58a863e05da5dd8a3175c0a6c55ffab2 Mon Sep 17 00:00:00 2001 From: janezcarski Date: Tue, 19 Aug 2014 15:13:55 +0200 Subject: [PATCH 1/2] Fix: SkeletonJson now sets mesh color if present in json. --- .../src/com/esotericsoftware/spine/SkeletonJson.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java index 0c50cc950..03d727913 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -215,6 +215,12 @@ public class SkeletonJson { mesh.setRegionUVs(map.require("uvs").asFloatArray()); mesh.updateUVs(); + //Check if color exists + JsonValue meshColor = map.get("color"); + if(meshColor != null) { + mesh.getColor().set(Color.valueOf(meshColor.asString())); + } + if (map.has("hull")) mesh.setHullLength(map.require("hull").asInt() * 2); if (map.has("edges")) mesh.setEdges(map.require("edges").asIntArray()); mesh.setWidth(map.getFloat("width", 0) * scale); From 19272feb4ec94c4214b7b65332802a692d0f3e45 Mon Sep 17 00:00:00 2001 From: Vladislav Cecalenco Date: Wed, 27 Aug 2014 21:02:53 +0300 Subject: [PATCH 2/2] PolygonBatch::flush crash fix --- spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp | 1 + spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp | 1 + spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp b/spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp index a8a227873..b0cc2b431 100644 --- a/spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp +++ b/spine-cocos2dx/3.0/src/spine/PolygonBatch.cpp @@ -94,6 +94,7 @@ void PolygonBatch::flush () { if (!verticesCount) return; GL::bindTexture2D(texture->getName()); + GL::bindVAO(0); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS); diff --git a/spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp b/spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp index a8a227873..b0cc2b431 100644 --- a/spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp +++ b/spine-cocos2dx/3.1/src/spine/PolygonBatch.cpp @@ -94,6 +94,7 @@ void PolygonBatch::flush () { if (!verticesCount) return; GL::bindTexture2D(texture->getName()); + GL::bindVAO(0); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS); diff --git a/spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp b/spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp index a24b5825c..26e35a77d 100644 --- a/spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp +++ b/spine-cocos2dx/3.2/src/spine/PolygonBatch.cpp @@ -94,6 +94,7 @@ void PolygonBatch::flush () { if (!_verticesCount) return; GL::bindTexture2D(_texture->getName()); + GL::bindVAO(0); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS);