UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

SkeletonTwoColorBatch also support custom program

Browse Source
This commit is contained in:
halx99 2020-10-16 18:42:45 +08:00
parent 84b0af8ac5
commit 5bacfcd733
5 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-cocos2dx/src/spine/SkeletonRenderer.cpp
View File

@ -504,7 +504,7 @@ void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t
#if COCOS2D_VERSION < 0x00040000 #if COCOS2D_VERSION < 0x00040000
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture->getName(), _glProgramState, blendFunc, trianglesTwoColor, transform, transformFlags); TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture->getName(), _glProgramState, blendFunc, trianglesTwoColor, transform, transformFlags);
#else #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 #endif
const float* verts = _clipper->getClippedVertices().buffer(); const float* verts = _clipper->getClippedVertices().buffer();
@ -539,7 +539,7 @@ void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t
#if COCOS2D_VERSION < 0x00040000 #if COCOS2D_VERSION < 0x00040000
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture->getName(), _glProgramState, blendFunc, trianglesTwoColor, transform, transformFlags); TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture->getName(), _glProgramState, blendFunc, trianglesTwoColor, transform, transformFlags);
#else #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 #endif
if (_effect) { if (_effect) {

1
spine-cocos2dx/src/spine/v4/SkeletonBatch.cpp
View File

@ -40,7 +40,6 @@ using std::max;
#include "renderer/ccShaders.h" #include "renderer/ccShaders.h"
#include "renderer/backend/Device.h" #include "renderer/backend/Device.h"
#include "renderer/backend/ProgramState.h"
namespace spine { namespace spine {

7
spine-cocos2dx/src/spine/v4/SkeletonBatch.h
View File

@ -35,12 +35,7 @@
#include <spine/spine.h> #include <spine/spine.h>
#include <vector> #include <vector>
#include "renderer/backend/ProgramState.h"
namespace cocos2d {
namespace backend {
class ProgramState;
}
}
namespace spine { namespace spine {

61
spine-cocos2dx/src/spine/v4/SkeletonTwoColorBatch.cpp
View File

@ -99,16 +99,7 @@ namespace {
backend::UniformLocation __locPMatrix; backend::UniformLocation __locPMatrix;
backend::UniformLocation __locTexture; backend::UniformLocation __locTexture;
void initTwoColorProgramState() static void updateProgramStateLayout(backend::ProgramState* programState) {
{
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();
__locPMatrix = programState->getUniformLocation("u_PMatrix"); __locPMatrix = programState->getUniformLocation("u_PMatrix");
__locTexture = programState->getUniformLocation("u_texture"); __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_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->setAttribute("a_texCoords", locTexcoord, backend::VertexFormat::FLOAT2, offsetof(spine::V3F_C4B_C4B_T2F, texCoords), false);
layout->setLayout(sizeof(spine::V3F_C4B_C4B_T2F)); 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); __twoColorProgramState = std::shared_ptr<backend::ProgramState>(programState);
} }
@ -136,9 +140,9 @@ TwoColorTrianglesCommand::TwoColorTrianglesCommand() :_materialID(0), _texture(n
_type = RenderCommand::Type::CUSTOM_COMMAND; _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); const cocos2d::Mat4& projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
auto finalMatrix = projectionMat * mv; 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) if (!__twoColorProgramState)
{ {
initTwoColorProgramState(); initTwoColorProgramState();
} }
CC_SAFE_RELEASE_NULL(_programState); bool needsUpdateStateLayout = false;
_programState = __twoColorProgramState->clone(); 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->getProgramType() != __twoColorProgramState->getProgramType();
CC_SAFE_RELEASE(_programState);
_programState = __twoColorProgramState->clone();
}
CCASSERT(_programState, "programState should not be null");
pipelinePS = _programState;
if (needsUpdateStateLayout)
updateProgramStateLayout(pipelinePS);
_locPMatrix = __locPMatrix; _locPMatrix = __locPMatrix;
_locTexture = __locTexture; _locTexture = __locTexture;
_pipelineDescriptor.programState = _programState;
} }
TwoColorTrianglesCommand::~TwoColorTrianglesCommand() TwoColorTrianglesCommand::~TwoColorTrianglesCommand()
@ -330,9 +355,9 @@ void SkeletonTwoColorBatch::deallocateIndices(uint32_t numIndices) {
_indices.setSize(_indices.size() - numIndices, 0); _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(); 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); command->updateVertexAndIndexBuffer(renderer, triangles.verts, triangles.vertCount, triangles.indices, triangles.indexCount);
renderer->addCommand(command); renderer->addCommand(command);
return command; return command;

7
spine-cocos2dx/src/spine/v4/SkeletonTwoColorBatch.h
View File

@ -35,6 +35,7 @@
#include <spine/spine.h> #include <spine/spine.h>
#include <vector> #include <vector>
#include "renderer/backend/ProgramState.h"
namespace spine { namespace spine {
struct V3F_C4B_C4B_T2F { struct V3F_C4B_C4B_T2F {
@ -57,9 +58,9 @@ namespace spine {
~TwoColorTrianglesCommand(); ~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; } inline cocos2d::backend::TextureBackend* getTexture() const { return _texture; }
@ -118,7 +119,7 @@ namespace spine {
unsigned short* allocateIndices(uint32_t numIndices); unsigned short* allocateIndices(uint32_t numIndices);
void deallocateIndices(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); void batch(cocos2d::Renderer* renderer, TwoColorTrianglesCommand* command);