mirror of https://github.com/axmolengine/axmol.git
fix #234, spine custom shader doesn't work.
This commit is contained in:
halx99
parent
dcc4c8d385
commit
82c864f2ed
|
|
@ -34,10 +34,9 @@
|
|||
|
||||
USING_NS_CC;
|
||||
|
||||
|
||||
namespace spine {
|
||||
|
||||
namespace {
|
||||
namespace {
|
||||
Cocos2dTextureLoader textureLoader;
|
||||
|
||||
int computeTotalCoordCount(Skeleton& skeleton, int startSlotIndex, int endSlotIndex);
|
||||
|
|
@ -49,46 +48,45 @@ namespace spine {
|
|||
Color4B ColorToColor4B(const Color& color);
|
||||
bool slotIsOutRange(Slot& slot, int startSlotIndex, int endSlotIndex);
|
||||
bool nothingToDraw(Slot& slot, int startSlotIndex, int endSlotIndex);
|
||||
}
|
||||
}
|
||||
|
||||
// C Variable length array
|
||||
#ifdef _MSC_VER
|
||||
// VLA not supported, use _malloca
|
||||
#define VLA(type, arr, count) \
|
||||
// VLA not supported, use _malloca
|
||||
#define VLA(type, arr, count) \
|
||||
type* arr = static_cast<type*>( _malloca(sizeof(type) * count) )
|
||||
#define VLA_FREE(arr) do { _freea(arr); } while(false)
|
||||
#define VLA_FREE(arr) do { _freea(arr); } while(false)
|
||||
#else
|
||||
#define VLA(type, arr, count) \
|
||||
#define VLA(type, arr, count) \
|
||||
type arr[count]
|
||||
#define VLA_FREE(arr)
|
||||
#define VLA_FREE(arr)
|
||||
#endif
|
||||
|
||||
|
||||
SkeletonRenderer* SkeletonRenderer::createWithSkeleton(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData) {
|
||||
SkeletonRenderer* SkeletonRenderer::createWithSkeleton(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData) {
|
||||
SkeletonRenderer* node = new SkeletonRenderer(skeleton, ownsSkeleton, ownsSkeletonData);
|
||||
node->autorelease();
|
||||
return node;
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer* SkeletonRenderer::createWithData (SkeletonData* skeletonData, bool ownsSkeletonData) {
|
||||
SkeletonRenderer* SkeletonRenderer::createWithData (SkeletonData* skeletonData, bool ownsSkeletonData) {
|
||||
SkeletonRenderer* node = new SkeletonRenderer(skeletonData, ownsSkeletonData);
|
||||
node->autorelease();
|
||||
return node;
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
|
||||
SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
|
||||
SkeletonRenderer* node = new SkeletonRenderer(skeletonDataFile, atlas, scale);
|
||||
node->autorelease();
|
||||
return node;
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
|
||||
SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
|
||||
SkeletonRenderer* node = new SkeletonRenderer(skeletonDataFile, atlasFile, scale);
|
||||
node->autorelease();
|
||||
return node;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::initialize () {
|
||||
void SkeletonRenderer::initialize () {
|
||||
_clipper = new (__FILE__, __LINE__) SkeletonClipping();
|
||||
|
||||
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
|
||||
|
|
@ -98,9 +96,9 @@ namespace spine {
|
|||
|
||||
_skeleton->setToSetupPose();
|
||||
_skeleton->updateWorldTransform();
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setupGLProgramState (bool twoColorTintEnabled) {
|
||||
void SkeletonRenderer::setupGLProgramState (bool twoColorTintEnabled) {
|
||||
if (twoColorTintEnabled) {
|
||||
#if COCOS2D_VERSION < 0x00040000
|
||||
setGLProgramState(SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState());
|
||||
|
|
@ -119,8 +117,7 @@ namespace spine {
|
|||
} else if (attachment->getRTTI().isExactly(MeshAttachment::rtti)) {
|
||||
MeshAttachment* meshAttachment = static_cast<MeshAttachment*>(attachment);
|
||||
texture = static_cast<AttachmentVertices*>(meshAttachment->getRendererObject())->_texture;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -131,60 +128,60 @@ namespace spine {
|
|||
#if COCOS2D_VERSION < 0x00040000
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP, texture));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setSkeletonData (SkeletonData *skeletonData, bool ownsSkeletonData) {
|
||||
void SkeletonRenderer::setSkeletonData (SkeletonData *skeletonData, bool ownsSkeletonData) {
|
||||
_skeleton = new (__FILE__, __LINE__) Skeleton(skeletonData);
|
||||
_ownsSkeletonData = ownsSkeletonData;
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer::SkeletonRenderer ()
|
||||
SkeletonRenderer::SkeletonRenderer ()
|
||||
: _atlas(nullptr), _attachmentLoader(nullptr), _timeScale(1), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer::SkeletonRenderer(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData, bool ownsAtlas)
|
||||
SkeletonRenderer::SkeletonRenderer(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData, bool ownsAtlas)
|
||||
: _atlas(nullptr), _attachmentLoader(nullptr), _timeScale(1), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
|
||||
initWithSkeleton(skeleton, ownsSkeleton, ownsSkeletonData, ownsAtlas);
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer::SkeletonRenderer (SkeletonData *skeletonData, bool ownsSkeletonData)
|
||||
SkeletonRenderer::SkeletonRenderer (SkeletonData *skeletonData, bool ownsSkeletonData)
|
||||
: _atlas(nullptr), _attachmentLoader(nullptr), _timeScale(1), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
|
||||
initWithData(skeletonData, ownsSkeletonData);
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, Atlas* atlas, float scale)
|
||||
SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, Atlas* atlas, float scale)
|
||||
: _atlas(nullptr), _attachmentLoader(nullptr), _timeScale(1), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
|
||||
initWithJsonFile(skeletonDataFile, atlas, scale);
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale)
|
||||
SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale)
|
||||
: _atlas(nullptr), _attachmentLoader(nullptr), _timeScale(1), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
|
||||
initWithJsonFile(skeletonDataFile, atlasFile, scale);
|
||||
}
|
||||
}
|
||||
|
||||
SkeletonRenderer::~SkeletonRenderer () {
|
||||
SkeletonRenderer::~SkeletonRenderer () {
|
||||
if (_ownsSkeletonData) delete _skeleton->getData();
|
||||
if (_ownsSkeleton) delete _skeleton;
|
||||
if (_ownsAtlas && _atlas) delete _atlas;
|
||||
if (_attachmentLoader) delete _attachmentLoader;
|
||||
delete _clipper;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::initWithSkeleton(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData, bool ownsAtlas) {
|
||||
void SkeletonRenderer::initWithSkeleton(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData, bool ownsAtlas) {
|
||||
_skeleton = skeleton;
|
||||
_ownsSkeleton = ownsSkeleton;
|
||||
_ownsSkeletonData = ownsSkeletonData;
|
||||
_ownsAtlas = ownsAtlas;
|
||||
initialize();
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::initWithData (SkeletonData* skeletonData, bool ownsSkeletonData) {
|
||||
void SkeletonRenderer::initWithData (SkeletonData* skeletonData, bool ownsSkeletonData) {
|
||||
_ownsSkeleton = true;
|
||||
setSkeletonData(skeletonData, ownsSkeletonData);
|
||||
initialize();
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
|
||||
void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
|
||||
_atlas = atlas;
|
||||
_attachmentLoader = new (__FILE__, __LINE__) Cocos2dAtlasAttachmentLoader(_atlas);
|
||||
|
||||
|
|
@ -197,9 +194,9 @@ namespace spine {
|
|||
setSkeletonData(skeletonData, true);
|
||||
|
||||
initialize();
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
|
||||
void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
|
||||
_atlas = new (__FILE__, __LINE__) Atlas(atlasFile.c_str(), &textureLoader, true);
|
||||
CCASSERT(_atlas, "Error reading atlas file.");
|
||||
|
||||
|
|
@ -215,9 +212,9 @@ namespace spine {
|
|||
setSkeletonData(skeletonData, true);
|
||||
|
||||
initialize();
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
|
||||
void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
|
||||
_atlas = atlas;
|
||||
_attachmentLoader = new (__FILE__, __LINE__) Cocos2dAtlasAttachmentLoader(_atlas);
|
||||
|
||||
|
|
@ -229,9 +226,9 @@ namespace spine {
|
|||
setSkeletonData(skeletonData, true);
|
||||
|
||||
initialize();
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
|
||||
void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
|
||||
_atlas = new (__FILE__, __LINE__) Atlas(atlasFile.c_str(), &textureLoader, true);
|
||||
CCASSERT(_atlas, "Error reading atlas file.");
|
||||
|
||||
|
|
@ -246,16 +243,16 @@ namespace spine {
|
|||
setSkeletonData(skeletonData, true);
|
||||
|
||||
initialize();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void SkeletonRenderer::update (float deltaTime) {
|
||||
void SkeletonRenderer::update (float deltaTime) {
|
||||
Node::update(deltaTime);
|
||||
if (_ownsSkeleton) _skeleton->update(deltaTime * _timeScale);
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t transformFlags) {
|
||||
// Early exit if the skeleton is invisible
|
||||
void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t transformFlags) {
|
||||
// Early exit if the skeleton is invisible.
|
||||
if (getDisplayedOpacity() == 0 || _skeleton->getColor().a == 0) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -269,14 +266,14 @@ namespace spine {
|
|||
VLA(float, worldCoords, coordCount);
|
||||
transformWorldVertices(worldCoords, coordCount, *_skeleton, _startSlotIndex, _endSlotIndex);
|
||||
|
||||
#if CC_USE_CULLING
|
||||
#if CC_USE_CULLING
|
||||
const cocos2d::Rect bb = computeBoundingRect(worldCoords, coordCount / 2);
|
||||
|
||||
if (cullRectangle(renderer, transform, bb)) {
|
||||
VLA_FREE(worldCoords);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
const float* worldCoordPtr = worldCoords;
|
||||
SkeletonBatch* batch = SkeletonBatch::getInstance();
|
||||
|
|
@ -337,7 +334,7 @@ namespace spine {
|
|||
dstTriangleVertices = reinterpret_cast<float*>(trianglesTwoColor.verts);
|
||||
dstStride = sizeof(V3F_C4B_C4B_T2F) / sizeof(float);
|
||||
}
|
||||
// Copy world vertices to triangle vertices
|
||||
// Copy world vertices to triangle vertices.
|
||||
interleaveCoordinates(dstTriangleVertices, worldCoordPtr, 4, dstStride);
|
||||
worldCoordPtr += 8;
|
||||
|
||||
|
|
@ -372,7 +369,7 @@ namespace spine {
|
|||
dstVertexCount = trianglesTwoColor.vertCount;
|
||||
}
|
||||
|
||||
// Copy world vertices to triangle vertices
|
||||
// Copy world vertices to triangle vertices.
|
||||
//assert(dstVertexCount * 2 == attachment->super.worldVerticesLength);
|
||||
interleaveCoordinates(dstTriangleVertices, worldCoordPtr, dstVertexCount, dstStride);
|
||||
worldCoordPtr += dstVertexCount * 2;
|
||||
|
|
@ -398,16 +395,14 @@ namespace spine {
|
|||
darkColor.a = darkPremultipliedAlpha;
|
||||
|
||||
color.a *= nodeColor.a * _skeleton->getColor().a * slot->getColor().a;
|
||||
// skip rendering if the color of this attachment is 0
|
||||
if (color.a == 0){
|
||||
if (color.a == 0) {
|
||||
_clipper->clipEnd(*slot);
|
||||
continue;
|
||||
}
|
||||
color.r *= nodeColor.r * _skeleton->getColor().r * slot->getColor().r;
|
||||
color.g *= nodeColor.g * _skeleton->getColor().g * slot->getColor().g;
|
||||
color.b *= nodeColor.b * _skeleton->getColor().b * slot->getColor().b;
|
||||
if (_premultipliedAlpha)
|
||||
{
|
||||
if (_premultipliedAlpha) {
|
||||
color.r *= color.a;
|
||||
color.g *= color.a;
|
||||
color.b *= color.a;
|
||||
|
|
@ -423,7 +418,7 @@ namespace spine {
|
|||
_clipper->clipTriangles((float*)&triangles.verts[0].vertices, triangles.indices, triangles.indexCount, (float*)&triangles.verts[0].texCoords, sizeof(cocos2d::V3F_C4B_T2F) / 4);
|
||||
batch->deallocateVertices(triangles.vertCount);
|
||||
|
||||
if (_clipper->getClippedTriangles().size() == 0){
|
||||
if (_clipper->getClippedTriangles().size() == 0) {
|
||||
_clipper->clipEnd(*slot);
|
||||
continue;
|
||||
}
|
||||
|
|
@ -438,7 +433,7 @@ namespace spine {
|
|||
#if COCOS2D_VERSION < 0x00040000
|
||||
cocos2d::TrianglesCommand* batchedTriangles = batch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, _glProgramState, blendFunc, triangles, transform, transformFlags);
|
||||
#else
|
||||
cocos2d::TrianglesCommand* batchedTriangles = batch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, blendFunc, triangles, transform, transformFlags);
|
||||
cocos2d::TrianglesCommand* batchedTriangles = batch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, _programState, blendFunc, triangles, transform, transformFlags);
|
||||
#endif
|
||||
|
||||
const float* verts = _clipper->getClippedVertices().buffer();
|
||||
|
|
@ -466,11 +461,11 @@ namespace spine {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
// Not clipping
|
||||
// Not clipping.
|
||||
#if COCOS2D_VERSION < 0x00040000
|
||||
cocos2d::TrianglesCommand* batchedTriangles = batch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, _glProgramState, blendFunc, triangles, transform, transformFlags);
|
||||
#else
|
||||
cocos2d::TrianglesCommand* batchedTriangles = batch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, blendFunc, triangles, transform, transformFlags);
|
||||
cocos2d::TrianglesCommand* batchedTriangles = batch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, _programState, blendFunc, triangles, transform, transformFlags);
|
||||
#endif
|
||||
|
||||
if (_effect) {
|
||||
|
|
@ -489,13 +484,13 @@ namespace spine {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
// Two tints
|
||||
// Two color tinting.
|
||||
|
||||
if (_clipper->isClipping()) {
|
||||
_clipper->clipTriangles((float*)&trianglesTwoColor.verts[0].position, trianglesTwoColor.indices, trianglesTwoColor.indexCount, (float*)&trianglesTwoColor.verts[0].texCoords, sizeof(V3F_C4B_C4B_T2F) / 4);
|
||||
twoColorBatch->deallocateVertices(trianglesTwoColor.vertCount);
|
||||
|
||||
if (_clipper->getClippedTriangles().size() == 0){
|
||||
if (_clipper->getClippedTriangles().size() == 0) {
|
||||
_clipper->clipEnd(*slot);
|
||||
continue;
|
||||
}
|
||||
|
|
@ -509,7 +504,7 @@ namespace spine {
|
|||
#if COCOS2D_VERSION < 0x00040000
|
||||
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture->getName(), _glProgramState, blendFunc, trianglesTwoColor, transform, transformFlags);
|
||||
#else
|
||||
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, blendFunc, trianglesTwoColor, transform, transformFlags);
|
||||
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, _programState, blendFunc, trianglesTwoColor, transform, transformFlags);
|
||||
#endif
|
||||
|
||||
const float* verts = _clipper->getClippedVertices().buffer();
|
||||
|
|
@ -544,7 +539,7 @@ namespace spine {
|
|||
#if COCOS2D_VERSION < 0x00040000
|
||||
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture->getName(), _glProgramState, blendFunc, trianglesTwoColor, transform, transformFlags);
|
||||
#else
|
||||
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, blendFunc, trianglesTwoColor, transform, transformFlags);
|
||||
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, _programState, blendFunc, trianglesTwoColor, transform, transformFlags);
|
||||
#endif
|
||||
|
||||
if (_effect) {
|
||||
|
|
@ -572,13 +567,10 @@ namespace spine {
|
|||
if (lastTwoColorTrianglesCommand) {
|
||||
Node* parent = this->getParent();
|
||||
|
||||
// We need to decide if we can postpone flushing the current
|
||||
// batch. We can postpone if the next sibling node is a
|
||||
// two color tinted skeleton with the same global-z.
|
||||
// The parent->getChildrenCount() > 100 check is a hack
|
||||
// as checking for a sibling is an O(n) operation, and if
|
||||
// all children of this nodes parent are skeletons, we
|
||||
// are in O(n2) territory.
|
||||
// We need to decide if we can postpone flushing the current batch. We can postpone if the next sibling node is a two color
|
||||
// tinted skeleton with the same global-z.
|
||||
// The parent->getChildrenCount() > 100 check is a hack as checking for a sibling is an O(n) operation, and if all children
|
||||
// of this nodes parent are skeletons, we are in O(n2) territory.
|
||||
if (!parent || parent->getChildrenCount() > 100 || getChildrenCount() != 0) {
|
||||
lastTwoColorTrianglesCommand->setForceFlush(true);
|
||||
} else {
|
||||
|
|
@ -613,10 +605,10 @@ namespace spine {
|
|||
}
|
||||
|
||||
VLA_FREE(worldCoords);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void SkeletonRenderer::drawDebug (Renderer* renderer, const Mat4 &transform, uint32_t transformFlags) {
|
||||
void SkeletonRenderer::drawDebug (Renderer* renderer, const Mat4 &transform, uint32_t transformFlags) {
|
||||
|
||||
#if !defined(USE_MATRIX_STACK_PROJECTION_ONLY)
|
||||
Director* director = Director::getInstance();
|
||||
|
|
@ -737,9 +729,9 @@ namespace spine {
|
|||
#if !defined(USE_MATRIX_STACK_PROJECTION_ONLY)
|
||||
director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
cocos2d::Rect SkeletonRenderer::getBoundingBox () const {
|
||||
cocos2d::Rect SkeletonRenderer::getBoundingBox () const {
|
||||
const int coordCount = computeTotalCoordCount(*_skeleton, _startSlotIndex, _endSlotIndex);
|
||||
if (coordCount == 0) return { 0, 0, 0, 0 };
|
||||
VLA(float, worldCoords, coordCount);
|
||||
|
|
@ -747,152 +739,152 @@ namespace spine {
|
|||
const cocos2d::Rect bb = computeBoundingRect(worldCoords, coordCount / 2);
|
||||
VLA_FREE(worldCoords);
|
||||
return bb;
|
||||
}
|
||||
}
|
||||
|
||||
// --- Convenience methods for Skeleton_* functions.
|
||||
// --- Convenience methods for Skeleton_* functions.
|
||||
|
||||
void SkeletonRenderer::updateWorldTransform() {
|
||||
void SkeletonRenderer::updateWorldTransform() {
|
||||
_skeleton->updateWorldTransform();
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setToSetupPose () {
|
||||
void SkeletonRenderer::setToSetupPose () {
|
||||
_skeleton->setToSetupPose();
|
||||
}
|
||||
void SkeletonRenderer::setBonesToSetupPose () {
|
||||
}
|
||||
void SkeletonRenderer::setBonesToSetupPose () {
|
||||
_skeleton->setBonesToSetupPose();
|
||||
}
|
||||
void SkeletonRenderer::setSlotsToSetupPose () {
|
||||
}
|
||||
void SkeletonRenderer::setSlotsToSetupPose () {
|
||||
_skeleton->setSlotsToSetupPose();
|
||||
}
|
||||
}
|
||||
|
||||
Bone* SkeletonRenderer::findBone (const std::string& boneName) const {
|
||||
Bone* SkeletonRenderer::findBone (const std::string& boneName) const {
|
||||
return _skeleton->findBone(boneName.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
Slot* SkeletonRenderer::findSlot (const std::string& slotName) const {
|
||||
Slot* SkeletonRenderer::findSlot (const std::string& slotName) const {
|
||||
return _skeleton->findSlot( slotName.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setSkin (const std::string& skinName) {
|
||||
void SkeletonRenderer::setSkin (const std::string& skinName) {
|
||||
_skeleton->setSkin(skinName.empty() ? 0 : skinName.c_str());
|
||||
}
|
||||
void SkeletonRenderer::setSkin (const char* skinName) {
|
||||
}
|
||||
void SkeletonRenderer::setSkin (const char* skinName) {
|
||||
_skeleton->setSkin(skinName);
|
||||
}
|
||||
}
|
||||
|
||||
Attachment* SkeletonRenderer::getAttachment (const std::string& slotName, const std::string& attachmentName) const {
|
||||
Attachment* SkeletonRenderer::getAttachment (const std::string& slotName, const std::string& attachmentName) const {
|
||||
return _skeleton->getAttachment(slotName.c_str(), attachmentName.c_str());
|
||||
}
|
||||
bool SkeletonRenderer::setAttachment (const std::string& slotName, const std::string& attachmentName) {
|
||||
}
|
||||
bool SkeletonRenderer::setAttachment (const std::string& slotName, const std::string& attachmentName) {
|
||||
bool result = _skeleton->getAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()) ? true : false;
|
||||
_skeleton->setAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str());
|
||||
return result;
|
||||
}
|
||||
bool SkeletonRenderer::setAttachment (const std::string& slotName, const char* attachmentName) {
|
||||
}
|
||||
bool SkeletonRenderer::setAttachment (const std::string& slotName, const char* attachmentName) {
|
||||
bool result = _skeleton->getAttachment(slotName.c_str(), attachmentName) ? true : false;
|
||||
_skeleton->setAttachment(slotName.c_str(), attachmentName);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setTwoColorTint(bool enabled) {
|
||||
void SkeletonRenderer::setTwoColorTint(bool enabled) {
|
||||
#if COCOS2D_VERSION >= 0x00040000
|
||||
_twoColorTint = enabled;
|
||||
#endif
|
||||
setupGLProgramState(enabled);
|
||||
}
|
||||
}
|
||||
|
||||
bool SkeletonRenderer::isTwoColorTint() {
|
||||
bool SkeletonRenderer::isTwoColorTint() {
|
||||
#if COCOS2D_VERSION < 0x00040000
|
||||
return getGLProgramState() == SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState();
|
||||
#else
|
||||
return _twoColorTint;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setVertexEffect(VertexEffect *effect) {
|
||||
void SkeletonRenderer::setVertexEffect(VertexEffect *effect) {
|
||||
this->_effect = effect;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setSlotsRange(int startSlotIndex, int endSlotIndex) {
|
||||
void SkeletonRenderer::setSlotsRange(int startSlotIndex, int endSlotIndex) {
|
||||
_startSlotIndex = startSlotIndex == -1 ? 0 : startSlotIndex;
|
||||
_endSlotIndex = endSlotIndex == -1 ? std::numeric_limits<int>::max() : endSlotIndex;
|
||||
}
|
||||
}
|
||||
|
||||
Skeleton* SkeletonRenderer::getSkeleton () const {
|
||||
Skeleton* SkeletonRenderer::getSkeleton () const {
|
||||
return _skeleton;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setTimeScale (float scale) {
|
||||
void SkeletonRenderer::setTimeScale (float scale) {
|
||||
_timeScale = scale;
|
||||
}
|
||||
float SkeletonRenderer::getTimeScale () const {
|
||||
}
|
||||
float SkeletonRenderer::getTimeScale () const {
|
||||
return _timeScale;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setDebugSlotsEnabled (bool enabled) {
|
||||
void SkeletonRenderer::setDebugSlotsEnabled (bool enabled) {
|
||||
_debugSlots = enabled;
|
||||
}
|
||||
bool SkeletonRenderer::getDebugSlotsEnabled () const {
|
||||
}
|
||||
bool SkeletonRenderer::getDebugSlotsEnabled () const {
|
||||
return _debugSlots;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setDebugBonesEnabled (bool enabled) {
|
||||
void SkeletonRenderer::setDebugBonesEnabled (bool enabled) {
|
||||
_debugBones = enabled;
|
||||
}
|
||||
bool SkeletonRenderer::getDebugBonesEnabled () const {
|
||||
}
|
||||
bool SkeletonRenderer::getDebugBonesEnabled () const {
|
||||
return _debugBones;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setDebugMeshesEnabled (bool enabled) {
|
||||
void SkeletonRenderer::setDebugMeshesEnabled (bool enabled) {
|
||||
_debugMeshes = enabled;
|
||||
}
|
||||
bool SkeletonRenderer::getDebugMeshesEnabled () const {
|
||||
}
|
||||
bool SkeletonRenderer::getDebugMeshesEnabled () const {
|
||||
return _debugMeshes;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setDebugBoundingRectEnabled(bool enabled) {
|
||||
void SkeletonRenderer::setDebugBoundingRectEnabled(bool enabled) {
|
||||
_debugBoundingRect = enabled;
|
||||
}
|
||||
}
|
||||
|
||||
bool SkeletonRenderer::getDebugBoundingRectEnabled() const {
|
||||
bool SkeletonRenderer::getDebugBoundingRectEnabled() const {
|
||||
return _debugBoundingRect;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::onEnter () {
|
||||
void SkeletonRenderer::onEnter () {
|
||||
#if CC_ENABLE_SCRIPT_BINDING && COCOS2D_VERSION < 0x00040000
|
||||
if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) return;
|
||||
#endif
|
||||
Node::onEnter();
|
||||
scheduleUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::onExit () {
|
||||
void SkeletonRenderer::onExit () {
|
||||
#if CC_ENABLE_SCRIPT_BINDING && COCOS2D_VERSION < 0x00040000
|
||||
if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit)) return;
|
||||
#endif
|
||||
Node::onExit();
|
||||
unscheduleUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
// --- CCBlendProtocol
|
||||
// --- CCBlendProtocol
|
||||
|
||||
const BlendFunc& SkeletonRenderer::getBlendFunc () const {
|
||||
const BlendFunc& SkeletonRenderer::getBlendFunc () const {
|
||||
return _blendFunc;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setBlendFunc (const BlendFunc &blendFunc) {
|
||||
void SkeletonRenderer::setBlendFunc (const BlendFunc &blendFunc) {
|
||||
_blendFunc = blendFunc;
|
||||
}
|
||||
}
|
||||
|
||||
void SkeletonRenderer::setOpacityModifyRGB (bool value) {
|
||||
void SkeletonRenderer::setOpacityModifyRGB (bool value) {
|
||||
_premultipliedAlpha = value;
|
||||
}
|
||||
}
|
||||
|
||||
bool SkeletonRenderer::isOpacityModifyRGB () const {
|
||||
bool SkeletonRenderer::isOpacityModifyRGB () const {
|
||||
return _premultipliedAlpha;
|
||||
}
|
||||
}
|
||||
|
||||
namespace {
|
||||
namespace {
|
||||
cocos2d::Rect computeBoundingRect(const float* coords, int vertexCount) {
|
||||
assert(coords);
|
||||
assert(vertexCount > 0);
|
||||
|
|
@ -1077,6 +1069,6 @@ namespace spine {
|
|||
Color4B ColorToColor4B(const Color& color) {
|
||||
return { (uint8_t)(color.r * 255.f), (uint8_t)(color.g * 255.f), (uint8_t)(color.b * 255.f), (uint8_t)(color.a * 255.f) };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ char *Cocos2dExtension::_readFile(const spine::String &path, int *length) {
|
|||
return ret;
|
||||
#else
|
||||
*length = static_cast<int>(data.getSize());
|
||||
char* bytes = MALLOC(char, *length);
|
||||
auto bytes = SpineExtension::alloc<char>(*length, __FILE__, __LINE__);
|
||||
memcpy(bytes, data.getBytes(), *length);
|
||||
return bytes;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -60,22 +60,8 @@ void SkeletonBatch::destroyInstance () {
|
|||
SkeletonBatch::SkeletonBatch () {
|
||||
|
||||
auto program = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_TEXTURE_COLOR);
|
||||
_programState = std::make_shared<backend::ProgramState>(program);
|
||||
|
||||
auto vertexLayout = _programState->getVertexLayout();
|
||||
|
||||
auto locPosition = _programState->getAttributeLocation("a_position");
|
||||
auto locTexcoord = _programState->getAttributeLocation("a_texCoord");
|
||||
auto locColor = _programState->getAttributeLocation("a_color");
|
||||
vertexLayout->setAttribute("a_position", locPosition, backend::VertexFormat::FLOAT3, offsetof(V3F_C4B_T2F, vertices), false);
|
||||
vertexLayout->setAttribute("a_color", locColor, backend::VertexFormat::UBYTE4, offsetof(V3F_C4B_T2F, colors), true);
|
||||
vertexLayout->setAttribute("a_texCoord", locTexcoord, backend::VertexFormat::FLOAT2, offsetof(V3F_C4B_T2F, texCoords), false);
|
||||
vertexLayout->setLayout(sizeof(_vertices[0]));
|
||||
|
||||
|
||||
_locMVP = _programState->getUniformLocation("u_MVPMatrix");
|
||||
_locTexture = _programState->getUniformLocation("u_texture");
|
||||
|
||||
_programState = new backend::ProgramState(program); // new default program state
|
||||
updateProgramStateLayout(_programState);
|
||||
for (unsigned int i = 0; i < INITIAL_SIZE; i++) {
|
||||
_commandsPool.push_back(createNewTrianglesCommand());
|
||||
}
|
||||
|
|
@ -95,6 +81,25 @@ SkeletonBatch::~SkeletonBatch () {
|
|||
delete _commandsPool[i];
|
||||
_commandsPool[i] = nullptr;
|
||||
}
|
||||
|
||||
CC_SAFE_RELEASE(_programState);
|
||||
}
|
||||
|
||||
void SkeletonBatch::updateProgramStateLayout(cocos2d::backend::ProgramState* programState)
|
||||
{
|
||||
auto vertexLayout = programState->getVertexLayout();
|
||||
|
||||
auto locPosition = programState->getAttributeLocation("a_position");
|
||||
auto locTexcoord = programState->getAttributeLocation("a_texCoord");
|
||||
auto locColor = programState->getAttributeLocation("a_color");
|
||||
vertexLayout->setAttribute("a_position", locPosition, backend::VertexFormat::FLOAT3, offsetof(V3F_C4B_T2F, vertices), false);
|
||||
vertexLayout->setAttribute("a_color", locColor, backend::VertexFormat::UBYTE4, offsetof(V3F_C4B_T2F, colors), true);
|
||||
vertexLayout->setAttribute("a_texCoord", locTexcoord, backend::VertexFormat::FLOAT2, offsetof(V3F_C4B_T2F, texCoords), false);
|
||||
vertexLayout->setLayout(sizeof(_vertices[0]));
|
||||
|
||||
|
||||
_locMVP = programState->getUniformLocation("u_MVPMatrix");
|
||||
_locTexture = programState->getUniformLocation("u_texture");
|
||||
}
|
||||
|
||||
void SkeletonBatch::update (float delta) {
|
||||
|
|
@ -148,15 +153,27 @@ void SkeletonBatch::deallocateIndices(uint32_t numIndices) {
|
|||
}
|
||||
|
||||
|
||||
cocos2d::TrianglesCommand* SkeletonBatch::addCommand(cocos2d::Renderer* renderer, float globalOrder, cocos2d::Texture2D* texture, cocos2d::BlendFunc blendType, const cocos2d::TrianglesCommand::Triangles& triangles, const cocos2d::Mat4& mv, uint32_t flags) {
|
||||
cocos2d::TrianglesCommand* SkeletonBatch::addCommand(cocos2d::Renderer* renderer, float globalOrder, cocos2d::Texture2D* texture, backend::ProgramState* programState, cocos2d::BlendFunc blendType, const cocos2d::TrianglesCommand::Triangles& triangles, const cocos2d::Mat4& mv, uint32_t flags) {
|
||||
TrianglesCommand* command = nextFreeCommand();
|
||||
const cocos2d::Mat4& projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
|
||||
|
||||
auto programState = command->getPipelineDescriptor().programState;
|
||||
if (programState == nullptr)
|
||||
programState = _programState;
|
||||
|
||||
CCASSERT(programState, "programState should not be null");
|
||||
|
||||
programState->setUniform(_locMVP, projectionMat.m, sizeof(projectionMat.m));
|
||||
programState->setTexture(_locTexture, 0, texture->getBackendTexture());
|
||||
auto& pipelinePS = command->getPipelineDescriptor().programState;
|
||||
if (pipelinePS != programState)
|
||||
{
|
||||
CC_SAFE_RELEASE(pipelinePS);
|
||||
pipelinePS = programState;
|
||||
CC_SAFE_RETAIN(pipelinePS);
|
||||
|
||||
updateProgramStateLayout(pipelinePS);
|
||||
}
|
||||
|
||||
pipelinePS->setUniform(_locMVP, projectionMat.m, sizeof(projectionMat.m));
|
||||
pipelinePS->setTexture(_locTexture, 0, texture->getBackendTexture());
|
||||
|
||||
command->init(globalOrder, texture, blendType, triangles, mv, flags);
|
||||
renderer->addCommand(command);
|
||||
|
|
@ -177,12 +194,6 @@ cocos2d::TrianglesCommand* SkeletonBatch::nextFreeCommand() {
|
|||
}
|
||||
}
|
||||
auto* command = _commandsPool[_nextFreeCommand++];
|
||||
auto& pipelineDescriptor = command->getPipelineDescriptor();
|
||||
if (pipelineDescriptor.programState == nullptr)
|
||||
{
|
||||
CCASSERT(_programState, "programState should not be null");
|
||||
pipelineDescriptor.programState = _programState->clone();
|
||||
}
|
||||
return command;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
|
||||
#include <spine/spine.h>
|
||||
#include <vector>
|
||||
#include "renderer/backend/ProgramState.h"
|
||||
|
||||
namespace spine {
|
||||
|
||||
|
|
@ -50,7 +51,9 @@ namespace spine {
|
|||
void deallocateVertices(uint32_t numVertices);
|
||||
unsigned short* allocateIndices(uint32_t numIndices);
|
||||
void deallocateIndices(uint32_t numVertices);
|
||||
cocos2d::TrianglesCommand* addCommand(cocos2d::Renderer* renderer, float globalOrder, cocos2d::Texture2D* texture, cocos2d::BlendFunc blendType, const cocos2d::TrianglesCommand::Triangles& triangles, const cocos2d::Mat4& mv, uint32_t flags);
|
||||
cocos2d::TrianglesCommand* addCommand(cocos2d::Renderer* renderer, float globalOrder, cocos2d::Texture2D* texture, cocos2d::backend::ProgramState* programState, cocos2d::BlendFunc blendType, const cocos2d::TrianglesCommand::Triangles& triangles, const cocos2d::Mat4& mv, uint32_t flags);
|
||||
|
||||
void updateProgramStateLayout(cocos2d::backend::ProgramState* programState);
|
||||
|
||||
protected:
|
||||
SkeletonBatch ();
|
||||
|
|
@ -61,7 +64,9 @@ namespace spine {
|
|||
cocos2d::TrianglesCommand* nextFreeCommand ();
|
||||
|
||||
cocos2d::TrianglesCommand* createNewTrianglesCommand();
|
||||
std::shared_ptr<cocos2d::backend::ProgramState> _programState = nullptr;
|
||||
|
||||
// the default program state for batch draw
|
||||
cocos2d::backend::ProgramState* _programState = nullptr;
|
||||
cocos2d::backend::UniformLocation _locMVP;
|
||||
cocos2d::backend::UniformLocation _locTexture;
|
||||
|
||||
|
|
|
|||
|
|
@ -99,16 +99,7 @@ namespace {
|
|||
backend::UniformLocation __locPMatrix;
|
||||
backend::UniformLocation __locTexture;
|
||||
|
||||
void initTwoColorProgramState()
|
||||
{
|
||||
if (__twoColorProgramState)
|
||||
{
|
||||
return;
|
||||
}
|
||||
auto program = backend::Device::getInstance()->newProgram(TWO_COLOR_TINT_VERTEX_SHADER, TWO_COLOR_TINT_FRAGMENT_SHADER);
|
||||
auto* programState = new backend::ProgramState(program);
|
||||
program->autorelease();
|
||||
|
||||
static void updateProgramStateLayout(backend::ProgramState* programState) {
|
||||
__locPMatrix = programState->getUniformLocation("u_PMatrix");
|
||||
__locTexture = programState->getUniformLocation("u_texture");
|
||||
|
||||
|
|
@ -124,6 +115,19 @@ namespace {
|
|||
layout->setAttribute("a_color2", locColor2, backend::VertexFormat::UBYTE4, offsetof(spine::V3F_C4B_C4B_T2F, color2), true);
|
||||
layout->setAttribute("a_texCoords", locTexcoord, backend::VertexFormat::FLOAT2, offsetof(spine::V3F_C4B_C4B_T2F, texCoords), false);
|
||||
layout->setLayout(sizeof(spine::V3F_C4B_C4B_T2F));
|
||||
}
|
||||
|
||||
static void initTwoColorProgramState()
|
||||
{
|
||||
if (__twoColorProgramState)
|
||||
{
|
||||
return;
|
||||
}
|
||||
auto program = backend::Device::getInstance()->newProgram(TWO_COLOR_TINT_VERTEX_SHADER, TWO_COLOR_TINT_FRAGMENT_SHADER);
|
||||
auto* programState = new backend::ProgramState(program);
|
||||
program->release();
|
||||
|
||||
updateProgramStateLayout(programState);
|
||||
|
||||
__twoColorProgramState = std::shared_ptr<backend::ProgramState>(programState);
|
||||
}
|
||||
|
|
@ -136,9 +140,9 @@ TwoColorTrianglesCommand::TwoColorTrianglesCommand() :_materialID(0), _texture(n
|
|||
_type = RenderCommand::Type::CUSTOM_COMMAND;
|
||||
}
|
||||
|
||||
void TwoColorTrianglesCommand::init(float globalOrder, cocos2d::Texture2D *texture, BlendFunc blendType, const TwoColorTriangles& triangles, const Mat4& mv, uint32_t flags) {
|
||||
void TwoColorTrianglesCommand::init(float globalOrder, cocos2d::Texture2D *texture, cocos2d::backend::ProgramState* programState, BlendFunc blendType, const TwoColorTriangles& triangles, const Mat4& mv, uint32_t flags) {
|
||||
|
||||
updateCommandPipelineDescriptor();
|
||||
updateCommandPipelineDescriptor(programState);
|
||||
const cocos2d::Mat4& projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
|
||||
|
||||
auto finalMatrix = projectionMat * mv;
|
||||
|
|
@ -177,18 +181,39 @@ void TwoColorTrianglesCommand::init(float globalOrder, cocos2d::Texture2D *textu
|
|||
|
||||
|
||||
|
||||
void TwoColorTrianglesCommand::updateCommandPipelineDescriptor()
|
||||
void TwoColorTrianglesCommand::updateCommandPipelineDescriptor(cocos2d::backend::ProgramState* programState)
|
||||
{
|
||||
// OPTIMIZE ME: all commands belong a same Node should share a same programState like SkeletonBatch
|
||||
if (!__twoColorProgramState)
|
||||
{
|
||||
initTwoColorProgramState();
|
||||
}
|
||||
|
||||
CC_SAFE_RELEASE_NULL(_programState);
|
||||
bool needsUpdateStateLayout = false;
|
||||
auto& pipelinePS = _pipelineDescriptor.programState;
|
||||
if (programState != nullptr)
|
||||
{
|
||||
if (_programState != programState) {
|
||||
CC_SAFE_RELEASE(_programState);
|
||||
_programState = programState; // Because the programState belong to Node, so no need to clone
|
||||
CC_SAFE_RETAIN(_programState);
|
||||
needsUpdateStateLayout = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
needsUpdateStateLayout = _programState != nullptr && _programState->getProgram() != __twoColorProgramState->getProgram();
|
||||
CC_SAFE_RELEASE(_programState);
|
||||
_programState = __twoColorProgramState->clone();
|
||||
}
|
||||
|
||||
CCASSERT(_programState, "programState should not be null");
|
||||
pipelinePS = _programState;
|
||||
|
||||
if (needsUpdateStateLayout)
|
||||
updateProgramStateLayout(pipelinePS);
|
||||
|
||||
_locPMatrix = __locPMatrix;
|
||||
_locTexture = __locTexture;
|
||||
_pipelineDescriptor.programState = _programState;
|
||||
}
|
||||
|
||||
TwoColorTrianglesCommand::~TwoColorTrianglesCommand()
|
||||
|
|
@ -330,9 +355,9 @@ void SkeletonTwoColorBatch::deallocateIndices(uint32_t numIndices) {
|
|||
_indices.setSize(_indices.size() - numIndices, 0);
|
||||
}
|
||||
|
||||
TwoColorTrianglesCommand* SkeletonTwoColorBatch::addCommand(cocos2d::Renderer* renderer, float globalOrder, cocos2d::Texture2D* texture, cocos2d::BlendFunc blendType, const TwoColorTriangles& triangles, const cocos2d::Mat4& mv, uint32_t flags) {
|
||||
TwoColorTrianglesCommand* SkeletonTwoColorBatch::addCommand(cocos2d::Renderer* renderer, float globalOrder, cocos2d::Texture2D* texture, backend::ProgramState* programState, cocos2d::BlendFunc blendType, const TwoColorTriangles& triangles, const cocos2d::Mat4& mv, uint32_t flags) {
|
||||
TwoColorTrianglesCommand* command = nextFreeCommand();
|
||||
command->init(globalOrder, texture, blendType, triangles, mv, flags);
|
||||
command->init(globalOrder, texture, programState, blendType, triangles, mv, flags);
|
||||
command->updateVertexAndIndexBuffer(renderer, triangles.verts, triangles.vertCount, triangles.indices, triangles.indexCount);
|
||||
renderer->addCommand(command);
|
||||
return command;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
|
||||
#include <spine/spine.h>
|
||||
#include <vector>
|
||||
#include "renderer/backend/ProgramState.h"
|
||||
|
||||
namespace spine {
|
||||
struct V3F_C4B_C4B_T2F {
|
||||
|
|
@ -57,9 +58,9 @@ namespace spine {
|
|||
|
||||
~TwoColorTrianglesCommand();
|
||||
|
||||
void init(float globalOrder, cocos2d::Texture2D* texture, cocos2d::BlendFunc blendType, const TwoColorTriangles& triangles, const cocos2d::Mat4& mv, uint32_t flags);
|
||||
void init(float globalOrder, cocos2d::Texture2D* texture, cocos2d::backend::ProgramState* programState, cocos2d::BlendFunc blendType, const TwoColorTriangles& triangles, const cocos2d::Mat4& mv, uint32_t flags);
|
||||
|
||||
void updateCommandPipelineDescriptor();
|
||||
void updateCommandPipelineDescriptor(cocos2d::backend::ProgramState* programState);
|
||||
|
||||
inline cocos2d::backend::TextureBackend* getTexture() const { return _texture; }
|
||||
|
||||
|
|
@ -118,7 +119,7 @@ namespace spine {
|
|||
unsigned short* allocateIndices(uint32_t numIndices);
|
||||
void deallocateIndices(uint32_t numIndices);
|
||||
|
||||
TwoColorTrianglesCommand* addCommand(cocos2d::Renderer* renderer, float globalOrder, cocos2d::Texture2D* texture, cocos2d::BlendFunc blendType, const TwoColorTriangles& triangles, const cocos2d::Mat4& mv, uint32_t flags);
|
||||
TwoColorTrianglesCommand* addCommand(cocos2d::Renderer* renderer, float globalOrder, cocos2d::Texture2D* texture, cocos2d::backend::ProgramState* programState, cocos2d::BlendFunc blendType, const TwoColorTriangles& triangles, const cocos2d::Mat4& mv, uint32_t flags);
|
||||
|
||||
void batch(cocos2d::Renderer* renderer, TwoColorTrianglesCommand* command);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue