2014-10-15 11:23:02 +08:00
|
|
|
/******************************************************************************
|
2017-02-09 16:57:42 +08:00
|
|
|
* Spine Runtimes Software License v2.5
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013-2016, Esoteric Software
|
2014-10-15 11:23:02 +08:00
|
|
|
* All rights reserved.
|
2017-02-09 16:57:42 +08:00
|
|
|
*
|
|
|
|
* You are granted a perpetual, non-exclusive, non-sublicensable, and
|
|
|
|
* non-transferable license to use, install, execute, and perform the Spine
|
|
|
|
* Runtimes software and derivative works solely for personal or internal
|
|
|
|
* use. Without the written permission of Esoteric Software (see Section 2 of
|
|
|
|
* the Spine Software License Agreement), you may not (a) modify, translate,
|
|
|
|
* adapt, or develop new applications using the Spine Runtimes or otherwise
|
|
|
|
* create derivative works or improvements of the Spine Runtimes or (b) remove,
|
|
|
|
* delete, alter, or obscure any trademarks or any copyright, trademark, patent,
|
2015-07-21 01:39:34 +08:00
|
|
|
* or other intellectual property or proprietary rights notices on or in the
|
|
|
|
* Software, including any copy thereof. Redistributions in binary or source
|
|
|
|
* form must include this license and terms.
|
2017-02-09 16:57:42 +08:00
|
|
|
*
|
2014-10-15 11:23:02 +08:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
2015-07-21 01:39:34 +08:00
|
|
|
* EVENT SHALL ESOTERIC SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
2014-10-15 11:23:02 +08:00
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
2017-02-09 16:57:42 +08:00
|
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS INTERRUPTION, OR LOSS OF
|
|
|
|
* USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
|
|
|
|
* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
2014-10-15 11:23:02 +08:00
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
#include <spine/SkeletonRenderer.h>
|
|
|
|
#include <spine/extension.h>
|
2016-07-28 22:25:50 +08:00
|
|
|
#include <spine/SkeletonBatch.h>
|
2017-11-02 09:06:13 +08:00
|
|
|
#include <spine/SkeletonTwoColorBatch.h>
|
2016-07-28 22:25:50 +08:00
|
|
|
#include <spine/AttachmentVertices.h>
|
|
|
|
#include <spine/Cocos2dAttachmentLoader.h>
|
2014-10-15 11:23:02 +08:00
|
|
|
#include <algorithm>
|
|
|
|
|
|
|
|
USING_NS_CC;
|
|
|
|
using std::min;
|
|
|
|
using std::max;
|
|
|
|
|
|
|
|
namespace spine {
|
|
|
|
|
|
|
|
SkeletonRenderer* SkeletonRenderer::createWithData (spSkeletonData* skeletonData, bool ownsSkeletonData) {
|
|
|
|
SkeletonRenderer* node = new SkeletonRenderer(skeletonData, ownsSkeletonData);
|
|
|
|
node->autorelease();
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, spAtlas* 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* node = new SkeletonRenderer(skeletonDataFile, atlasFile, scale);
|
|
|
|
node->autorelease();
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::initialize () {
|
2016-07-28 22:25:50 +08:00
|
|
|
_worldVertices = new float[1000]; // Max number of vertices per mesh.
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
_clipper = spSkeletonClipping_create();
|
2014-10-15 11:23:02 +08:00
|
|
|
|
|
|
|
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
|
|
|
|
setOpacityModifyRGB(true);
|
|
|
|
|
2016-07-28 22:25:50 +08:00
|
|
|
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::setSkeletonData (spSkeletonData *skeletonData, bool ownsSkeletonData) {
|
|
|
|
_skeleton = spSkeleton_create(skeletonData);
|
|
|
|
_ownsSkeletonData = ownsSkeletonData;
|
|
|
|
}
|
|
|
|
|
2015-08-12 18:07:28 +08:00
|
|
|
SkeletonRenderer::SkeletonRenderer ()
|
2017-11-02 09:06:13 +08:00
|
|
|
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _timeScale(1), _effect(nullptr) {
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
|
2015-08-12 18:07:28 +08:00
|
|
|
SkeletonRenderer::SkeletonRenderer (spSkeletonData *skeletonData, bool ownsSkeletonData)
|
2017-11-02 09:06:13 +08:00
|
|
|
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _timeScale(1), _effect(nullptr) {
|
2015-04-14 15:23:16 +08:00
|
|
|
initWithData(skeletonData, ownsSkeletonData);
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
|
2015-08-12 18:07:28 +08:00
|
|
|
SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, spAtlas* atlas, float scale)
|
2017-11-02 09:06:13 +08:00
|
|
|
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _timeScale(1), _effect(nullptr) {
|
2016-10-12 01:56:14 +08:00
|
|
|
initWithJsonFile(skeletonDataFile, atlas, scale);
|
2015-04-14 15:23:16 +08:00
|
|
|
}
|
|
|
|
|
2015-08-12 18:07:28 +08:00
|
|
|
SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale)
|
2017-11-02 09:06:13 +08:00
|
|
|
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _timeScale(1), _effect(nullptr) {
|
2016-10-12 01:56:14 +08:00
|
|
|
initWithJsonFile(skeletonDataFile, atlasFile, scale);
|
2015-04-14 15:23:16 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
SkeletonRenderer::~SkeletonRenderer () {
|
|
|
|
if (_ownsSkeletonData) spSkeletonData_dispose(_skeleton->data);
|
|
|
|
spSkeleton_dispose(_skeleton);
|
2016-07-28 22:25:50 +08:00
|
|
|
if (_atlas) spAtlas_dispose(_atlas);
|
|
|
|
if (_attachmentLoader) spAttachmentLoader_dispose(_attachmentLoader);
|
2016-09-26 14:18:48 +08:00
|
|
|
delete [] _worldVertices;
|
2017-11-02 09:06:13 +08:00
|
|
|
spSkeletonClipping_dispose(_clipper);
|
2015-04-14 15:23:16 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::initWithData (spSkeletonData* skeletonData, bool ownsSkeletonData) {
|
|
|
|
setSkeletonData(skeletonData, ownsSkeletonData);
|
|
|
|
|
2014-10-15 11:23:02 +08:00
|
|
|
initialize();
|
2015-04-14 15:23:16 +08:00
|
|
|
}
|
2014-10-15 11:23:02 +08:00
|
|
|
|
2016-10-12 01:56:14 +08:00
|
|
|
void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, spAtlas* atlas, float scale) {
|
2016-07-28 22:25:50 +08:00
|
|
|
_atlas = atlas;
|
|
|
|
_attachmentLoader = SUPER(Cocos2dAttachmentLoader_create(_atlas));
|
|
|
|
|
|
|
|
spSkeletonJson* json = spSkeletonJson_createWithLoader(_attachmentLoader);
|
2014-10-15 11:23:02 +08:00
|
|
|
json->scale = scale;
|
|
|
|
spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile.c_str());
|
|
|
|
CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data.");
|
|
|
|
spSkeletonJson_dispose(json);
|
|
|
|
|
|
|
|
setSkeletonData(skeletonData, true);
|
|
|
|
|
|
|
|
initialize();
|
2015-04-14 15:23:16 +08:00
|
|
|
}
|
2014-10-15 11:23:02 +08:00
|
|
|
|
2016-10-12 01:56:14 +08:00
|
|
|
void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
|
2014-10-15 11:23:02 +08:00
|
|
|
_atlas = spAtlas_createFromFile(atlasFile.c_str(), 0);
|
|
|
|
CCASSERT(_atlas, "Error reading atlas file.");
|
|
|
|
|
2016-07-28 22:25:50 +08:00
|
|
|
_attachmentLoader = SUPER(Cocos2dAttachmentLoader_create(_atlas));
|
|
|
|
|
|
|
|
spSkeletonJson* json = spSkeletonJson_createWithLoader(_attachmentLoader);
|
2014-10-15 11:23:02 +08:00
|
|
|
json->scale = scale;
|
|
|
|
spSkeletonData* skeletonData = spSkeletonJson_readSkeletonDataFile(json, skeletonDataFile.c_str());
|
|
|
|
CCASSERT(skeletonData, json->error ? json->error : "Error reading skeleton data file.");
|
|
|
|
spSkeletonJson_dispose(json);
|
|
|
|
|
|
|
|
setSkeletonData(skeletonData, true);
|
|
|
|
|
2015-04-14 15:23:16 +08:00
|
|
|
initialize();
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
2016-10-12 01:56:14 +08:00
|
|
|
|
|
|
|
void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, spAtlas* atlas, float scale) {
|
|
|
|
_atlas = atlas;
|
|
|
|
_attachmentLoader = SUPER(Cocos2dAttachmentLoader_create(_atlas));
|
|
|
|
|
|
|
|
spSkeletonBinary* binary = spSkeletonBinary_createWithLoader(_attachmentLoader);
|
|
|
|
binary->scale = scale;
|
|
|
|
spSkeletonData* skeletonData = spSkeletonBinary_readSkeletonDataFile(binary, skeletonDataFile.c_str());
|
|
|
|
CCASSERT(skeletonData, binary->error ? binary->error : "Error reading skeleton data file.");
|
|
|
|
spSkeletonBinary_dispose(binary);
|
|
|
|
|
|
|
|
setSkeletonData(skeletonData, true);
|
|
|
|
|
|
|
|
initialize();
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
|
|
|
|
_atlas = spAtlas_createFromFile(atlasFile.c_str(), 0);
|
|
|
|
CCASSERT(_atlas, "Error reading atlas file.");
|
|
|
|
|
|
|
|
_attachmentLoader = SUPER(Cocos2dAttachmentLoader_create(_atlas));
|
|
|
|
|
|
|
|
spSkeletonBinary* binary = spSkeletonBinary_createWithLoader(_attachmentLoader);
|
|
|
|
binary->scale = scale;
|
|
|
|
spSkeletonData* skeletonData = spSkeletonBinary_readSkeletonDataFile(binary, skeletonDataFile.c_str());
|
|
|
|
CCASSERT(skeletonData, binary->error ? binary->error : "Error reading skeleton data file.");
|
|
|
|
spSkeletonBinary_dispose(binary);
|
|
|
|
|
|
|
|
setSkeletonData(skeletonData, true);
|
|
|
|
|
|
|
|
initialize();
|
|
|
|
}
|
2014-10-15 11:23:02 +08:00
|
|
|
|
2015-04-14 15:23:16 +08:00
|
|
|
|
2014-10-15 11:23:02 +08:00
|
|
|
void SkeletonRenderer::update (float deltaTime) {
|
2017-11-02 09:06:13 +08:00
|
|
|
Node::update(deltaTime);
|
2014-10-15 11:23:02 +08:00
|
|
|
spSkeleton_update(_skeleton, deltaTime * _timeScale);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t transformFlags) {
|
2016-07-28 22:25:50 +08:00
|
|
|
SkeletonBatch* batch = SkeletonBatch::getInstance();
|
2017-11-02 09:06:13 +08:00
|
|
|
SkeletonTwoColorBatch* twoColorBatch = SkeletonTwoColorBatch::getInstance();
|
|
|
|
bool isTwoColorTint = this->isTwoColorTint();
|
|
|
|
|
|
|
|
if (_effect) _effect->begin(_effect, _skeleton);
|
|
|
|
|
|
|
|
Color4F nodeColor;
|
|
|
|
nodeColor.r = getDisplayedColor().r / (float)255;
|
|
|
|
nodeColor.g = getDisplayedColor().g / (float)255;
|
|
|
|
nodeColor.b = getDisplayedColor().b / (float)255;
|
|
|
|
nodeColor.a = getDisplayedOpacity() / (float)255;
|
|
|
|
|
2016-09-06 10:11:54 +08:00
|
|
|
Color4F color;
|
2017-11-02 09:06:13 +08:00
|
|
|
Color4F darkColor;
|
2016-07-28 22:25:50 +08:00
|
|
|
AttachmentVertices* attachmentVertices = nullptr;
|
2017-11-02 09:06:13 +08:00
|
|
|
TwoColorTrianglesCommand* lastTwoColorTrianglesCommand = nullptr;
|
2016-07-28 22:25:50 +08:00
|
|
|
for (int i = 0, n = _skeleton->slotsCount; i < n; ++i) {
|
2014-10-15 11:23:02 +08:00
|
|
|
spSlot* slot = _skeleton->drawOrder[i];
|
2017-11-02 09:06:13 +08:00
|
|
|
if (!slot->attachment) {
|
|
|
|
spSkeletonClipping_clipEnd(_clipper, slot);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
cocos2d::TrianglesCommand::Triangles triangles;
|
|
|
|
TwoColorTriangles trianglesTwoColor;
|
|
|
|
|
2014-10-15 11:23:02 +08:00
|
|
|
switch (slot->attachment->type) {
|
|
|
|
case SP_ATTACHMENT_REGION: {
|
|
|
|
spRegionAttachment* attachment = (spRegionAttachment*)slot->attachment;
|
2016-07-28 22:25:50 +08:00
|
|
|
attachmentVertices = getAttachmentVertices(attachment);
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
if (!isTwoColorTint) {
|
|
|
|
triangles.indices = attachmentVertices->_triangles->indices;
|
|
|
|
triangles.indexCount = attachmentVertices->_triangles->indexCount;
|
|
|
|
triangles.verts = batch->allocateVertices(attachmentVertices->_triangles->vertCount);
|
|
|
|
triangles.vertCount = attachmentVertices->_triangles->vertCount;
|
|
|
|
memcpy(triangles.verts, attachmentVertices->_triangles->verts, sizeof(cocos2d::V3F_C4B_T2F) * attachmentVertices->_triangles->vertCount);
|
|
|
|
spRegionAttachment_computeWorldVertices(attachment, slot->bone, (float*)triangles.verts, 0, 6);
|
|
|
|
} else {
|
|
|
|
trianglesTwoColor.indices = attachmentVertices->_triangles->indices;
|
|
|
|
trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount;
|
|
|
|
trianglesTwoColor.verts = twoColorBatch->allocateVertices(attachmentVertices->_triangles->vertCount);
|
|
|
|
trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount;
|
2017-11-24 10:41:37 +08:00
|
|
|
for (int ii = 0; ii < trianglesTwoColor.vertCount; ii++) {
|
|
|
|
trianglesTwoColor.verts[ii].texCoords = attachmentVertices->_triangles->verts[ii].texCoords;
|
2017-11-02 09:06:13 +08:00
|
|
|
}
|
|
|
|
spRegionAttachment_computeWorldVertices(attachment, slot->bone, (float*)trianglesTwoColor.verts, 0, 7);
|
|
|
|
}
|
|
|
|
|
|
|
|
color.r = attachment->color.r;
|
|
|
|
color.g = attachment->color.g;
|
|
|
|
color.b = attachment->color.b;
|
|
|
|
color.a = attachment->color.a;
|
|
|
|
|
2014-10-15 11:23:02 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case SP_ATTACHMENT_MESH: {
|
|
|
|
spMeshAttachment* attachment = (spMeshAttachment*)slot->attachment;
|
2016-07-28 22:25:50 +08:00
|
|
|
attachmentVertices = getAttachmentVertices(attachment);
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
if (!isTwoColorTint) {
|
|
|
|
triangles.indices = attachmentVertices->_triangles->indices;
|
|
|
|
triangles.indexCount = attachmentVertices->_triangles->indexCount;
|
|
|
|
triangles.verts = batch->allocateVertices(attachmentVertices->_triangles->vertCount);
|
|
|
|
triangles.vertCount = attachmentVertices->_triangles->vertCount;
|
|
|
|
memcpy(triangles.verts, attachmentVertices->_triangles->verts, sizeof(cocos2d::V3F_C4B_T2F) * attachmentVertices->_triangles->vertCount);
|
|
|
|
spVertexAttachment_computeWorldVertices(SUPER(attachment), slot, 0, triangles.vertCount * sizeof(cocos2d::V3F_C4B_T2F) / 4, (float*)triangles.verts, 0, 6);
|
|
|
|
} else {
|
|
|
|
trianglesTwoColor.indices = attachmentVertices->_triangles->indices;
|
|
|
|
trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount;
|
|
|
|
trianglesTwoColor.verts = twoColorBatch->allocateVertices(attachmentVertices->_triangles->vertCount);
|
|
|
|
trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount;
|
2018-01-10 14:34:24 +08:00
|
|
|
for (int ii = 0; ii < trianglesTwoColor.vertCount; ii++) {
|
2017-11-24 10:41:37 +08:00
|
|
|
trianglesTwoColor.verts[ii].texCoords = attachmentVertices->_triangles->verts[ii].texCoords;
|
2017-11-02 09:06:13 +08:00
|
|
|
}
|
|
|
|
spVertexAttachment_computeWorldVertices(SUPER(attachment), slot, 0, trianglesTwoColor.vertCount * sizeof(V3F_C4B_C4B_T2F) / 4, (float*)trianglesTwoColor.verts, 0, 7);
|
|
|
|
}
|
|
|
|
|
|
|
|
color.r = attachment->color.r;
|
|
|
|
color.g = attachment->color.g;
|
|
|
|
color.b = attachment->color.b;
|
|
|
|
color.a = attachment->color.a;
|
|
|
|
|
2014-10-15 11:23:02 +08:00
|
|
|
break;
|
|
|
|
}
|
2017-11-02 09:06:13 +08:00
|
|
|
case SP_ATTACHMENT_CLIPPING: {
|
|
|
|
spClippingAttachment* clip = (spClippingAttachment*)slot->attachment;
|
|
|
|
spSkeletonClipping_clipStart(_clipper, slot, clip);
|
|
|
|
}
|
2016-07-28 22:25:50 +08:00
|
|
|
default:
|
2017-11-02 09:06:13 +08:00
|
|
|
spSkeletonClipping_clipEnd(_clipper, slot);
|
2016-07-28 22:25:50 +08:00
|
|
|
continue;
|
|
|
|
}
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
if (slot->darkColor) {
|
|
|
|
darkColor.r = slot->darkColor->r * 255;
|
|
|
|
darkColor.g = slot->darkColor->g * 255;
|
|
|
|
darkColor.b = slot->darkColor->b * 255;
|
|
|
|
} else {
|
|
|
|
darkColor.r = 0;
|
|
|
|
darkColor.g = 0;
|
|
|
|
darkColor.b = 0;
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
color.a *= nodeColor.a * _skeleton->color.a * slot->color.a * 255;
|
|
|
|
// skip rendering if the color of this attachment is 0
|
|
|
|
if (color.a == 0){
|
|
|
|
spSkeletonClipping_clipEnd(_clipper, slot);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
float multiplier = _premultipliedAlpha ? color.a : 255;
|
|
|
|
color.r *= nodeColor.r * _skeleton->color.r * slot->color.r * multiplier;
|
|
|
|
color.g *= nodeColor.g * _skeleton->color.g * slot->color.g * multiplier;
|
|
|
|
color.b *= nodeColor.b * _skeleton->color.b * slot->color.b * multiplier;
|
|
|
|
|
2016-07-28 22:25:50 +08:00
|
|
|
BlendFunc blendFunc;
|
|
|
|
switch (slot->data->blendMode) {
|
2017-11-02 09:06:13 +08:00
|
|
|
case SP_BLEND_MODE_ADDITIVE:
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
blendFunc.src = _premultipliedAlpha ? backend::BlendFactor::ONE : backend::BlendFactor::SRC_ALPHA;
|
|
|
|
blendFunc.dst = backend::BlendFactor::ONE;
|
2017-11-02 09:06:13 +08:00
|
|
|
break;
|
|
|
|
case SP_BLEND_MODE_MULTIPLY:
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
blendFunc.src = backend::BlendFactor::DST_COLOR;
|
|
|
|
blendFunc.dst = backend::BlendFactor::ONE_MINUS_SRC_ALPHA;
|
2017-11-02 09:06:13 +08:00
|
|
|
break;
|
|
|
|
case SP_BLEND_MODE_SCREEN:
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
blendFunc.src = backend::BlendFactor::ONE;
|
|
|
|
blendFunc.dst = backend::BlendFactor::ONE_MINUS_SRC_COLOR;
|
2017-11-02 09:06:13 +08:00
|
|
|
break;
|
|
|
|
default:
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
blendFunc.src = _premultipliedAlpha ? backend::BlendFactor::ONE : backend::BlendFactor::SRC_ALPHA;
|
|
|
|
blendFunc.dst = backend::BlendFactor::ONE_MINUS_SRC_ALPHA;
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
if (!isTwoColorTint) {
|
|
|
|
if (spSkeletonClipping_isClipping(_clipper)) {
|
|
|
|
spSkeletonClipping_clipTriangles(_clipper, (float*)&triangles.verts[0].vertices, triangles.vertCount * sizeof(cocos2d::V3F_C4B_T2F) / 4, triangles.indices, triangles.indexCount, (float*)&triangles.verts[0].texCoords, 6);
|
|
|
|
batch->deallocateVertices(triangles.vertCount);
|
|
|
|
|
|
|
|
if (_clipper->clippedTriangles->size == 0){
|
|
|
|
spSkeletonClipping_clipEnd(_clipper, slot);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
triangles.vertCount = _clipper->clippedVertices->size >> 1;
|
|
|
|
triangles.verts = batch->allocateVertices(triangles.vertCount);
|
|
|
|
triangles.indexCount = _clipper->clippedTriangles->size;
|
|
|
|
triangles.indices = batch->allocateIndices(triangles.indexCount);
|
|
|
|
memcpy(triangles.indices, _clipper->clippedTriangles->items, sizeof(unsigned short) * _clipper->clippedTriangles->size);
|
|
|
|
|
|
|
|
cocos2d::TrianglesCommand* batchedTriangles = batch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, _glProgramState, blendFunc, triangles, transform, transformFlags);
|
|
|
|
|
|
|
|
float* verts = _clipper->clippedVertices->items;
|
|
|
|
float* uvs = _clipper->clippedUVs->items;
|
|
|
|
if (_effect) {
|
|
|
|
spColor light;
|
|
|
|
spColor dark;
|
|
|
|
light.r = color.r / 255.0f;
|
|
|
|
light.g = color.g / 255.0f;
|
|
|
|
light.b = color.b / 255.0f;
|
|
|
|
light.a = color.a / 255.0f;
|
|
|
|
dark.r = dark.g = dark.b = dark.a = 0;
|
|
|
|
for (int v = 0, vn = batchedTriangles->getTriangles().vertCount, vv = 0; v < vn; ++v, vv+=2) {
|
|
|
|
V3F_C4B_T2F* vertex = batchedTriangles->getTriangles().verts + v;
|
|
|
|
spColor lightCopy = light;
|
|
|
|
spColor darkCopy = dark;
|
|
|
|
vertex->vertices.x = verts[vv];
|
|
|
|
vertex->vertices.y = verts[vv + 1];
|
|
|
|
vertex->texCoords.u = uvs[vv];
|
|
|
|
vertex->texCoords.v = uvs[vv + 1];
|
|
|
|
_effect->transform(_effect, &vertex->vertices.x, &vertex->vertices.y, &vertex->texCoords.u, &vertex->texCoords.v, &lightCopy, &darkCopy);
|
|
|
|
vertex->colors.r = (GLubyte)(lightCopy.r * 255);
|
|
|
|
vertex->colors.g = (GLubyte)(lightCopy.g * 255);
|
|
|
|
vertex->colors.b = (GLubyte)(lightCopy.b * 255);
|
|
|
|
vertex->colors.a = (GLubyte)(lightCopy.a * 255);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (int v = 0, vn = batchedTriangles->getTriangles().vertCount, vv = 0; v < vn; ++v, vv+=2) {
|
|
|
|
V3F_C4B_T2F* vertex = batchedTriangles->getTriangles().verts + v;
|
|
|
|
vertex->vertices.x = verts[vv];
|
|
|
|
vertex->vertices.y = verts[vv + 1];
|
|
|
|
vertex->texCoords.u = uvs[vv];
|
|
|
|
vertex->texCoords.v = uvs[vv + 1];
|
|
|
|
vertex->colors.r = (GLubyte)color.r;
|
|
|
|
vertex->colors.g = (GLubyte)color.g;
|
|
|
|
vertex->colors.b = (GLubyte)color.b;
|
|
|
|
vertex->colors.a = (GLubyte)color.a;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
cocos2d::TrianglesCommand* batchedTriangles = batch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture, _glProgramState, blendFunc, triangles, transform, transformFlags);
|
|
|
|
|
|
|
|
if (_effect) {
|
|
|
|
spColor light;
|
|
|
|
spColor dark;
|
|
|
|
light.r = color.r / 255.0f;
|
|
|
|
light.g = color.g / 255.0f;
|
|
|
|
light.b = color.b / 255.0f;
|
|
|
|
light.a = color.a / 255.0f;
|
|
|
|
dark.r = dark.g = dark.b = dark.a = 0;
|
|
|
|
for (int v = 0, vn = batchedTriangles->getTriangles().vertCount; v < vn; ++v) {
|
|
|
|
V3F_C4B_T2F* vertex = batchedTriangles->getTriangles().verts + v;
|
|
|
|
spColor lightCopy = light;
|
|
|
|
spColor darkCopy = dark;
|
|
|
|
_effect->transform(_effect, &vertex->vertices.x, &vertex->vertices.y, &vertex->texCoords.u, &vertex->texCoords.v, &lightCopy, &darkCopy);
|
|
|
|
vertex->colors.r = (GLubyte)(lightCopy.r * 255);
|
|
|
|
vertex->colors.g = (GLubyte)(lightCopy.g * 255);
|
|
|
|
vertex->colors.b = (GLubyte)(lightCopy.b * 255);
|
|
|
|
vertex->colors.a = (GLubyte)(lightCopy.a * 255);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (int v = 0, vn = batchedTriangles->getTriangles().vertCount; v < vn; ++v) {
|
|
|
|
V3F_C4B_T2F* vertex = batchedTriangles->getTriangles().verts + v;
|
|
|
|
vertex->colors.r = (GLubyte)color.r;
|
|
|
|
vertex->colors.g = (GLubyte)color.g;
|
|
|
|
vertex->colors.b = (GLubyte)color.b;
|
|
|
|
vertex->colors.a = (GLubyte)color.a;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (spSkeletonClipping_isClipping(_clipper)) {
|
|
|
|
spSkeletonClipping_clipTriangles(_clipper, (float*)&trianglesTwoColor.verts[0].position, trianglesTwoColor.vertCount * sizeof(V3F_C4B_C4B_T2F) / 4, trianglesTwoColor.indices, trianglesTwoColor.indexCount, (float*)&trianglesTwoColor.verts[0].texCoords, 7);
|
|
|
|
twoColorBatch->deallocateVertices(trianglesTwoColor.vertCount);
|
|
|
|
|
|
|
|
if (_clipper->clippedTriangles->size == 0){
|
|
|
|
spSkeletonClipping_clipEnd(_clipper, slot);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
trianglesTwoColor.vertCount = _clipper->clippedVertices->size >> 1;
|
|
|
|
trianglesTwoColor.verts = twoColorBatch->allocateVertices(trianglesTwoColor.vertCount);
|
|
|
|
trianglesTwoColor.indexCount = _clipper->clippedTriangles->size;
|
|
|
|
trianglesTwoColor.indices = twoColorBatch->allocateIndices(trianglesTwoColor.indexCount);
|
|
|
|
memcpy(trianglesTwoColor.indices, _clipper->clippedTriangles->items, sizeof(unsigned short) * _clipper->clippedTriangles->size);
|
|
|
|
|
|
|
|
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture->getName(), _glProgramState, blendFunc, trianglesTwoColor, transform, transformFlags);
|
|
|
|
|
|
|
|
float* verts = _clipper->clippedVertices->items;
|
|
|
|
float* uvs = _clipper->clippedUVs->items;
|
|
|
|
|
|
|
|
if (_effect) {
|
|
|
|
spColor light;
|
|
|
|
spColor dark;
|
|
|
|
light.r = color.r / 255.0f;
|
|
|
|
light.g = color.g / 255.0f;
|
|
|
|
light.b = color.b / 255.0f;
|
|
|
|
light.a = color.a / 255.0f;
|
|
|
|
dark.r = darkColor.r / 255.0f;
|
|
|
|
dark.g = darkColor.g / 255.0f;
|
|
|
|
dark.b = darkColor.b / 255.0f;
|
|
|
|
dark.a = darkColor.a / 255.0f;
|
|
|
|
for (int v = 0, vn = batchedTriangles->getTriangles().vertCount, vv = 0; v < vn; ++v, vv += 2) {
|
|
|
|
V3F_C4B_C4B_T2F* vertex = batchedTriangles->getTriangles().verts + v;
|
|
|
|
spColor lightCopy = light;
|
|
|
|
spColor darkCopy = dark;
|
|
|
|
vertex->position.x = verts[vv];
|
|
|
|
vertex->position.y = verts[vv + 1];
|
|
|
|
vertex->texCoords.u = uvs[vv];
|
|
|
|
vertex->texCoords.v = uvs[vv + 1];
|
|
|
|
_effect->transform(_effect, &vertex->position.x, &vertex->position.y, &vertex->texCoords.u, &vertex->texCoords.v, &lightCopy, &darkCopy);
|
|
|
|
vertex->color.r = (GLubyte)(lightCopy.r * 255);
|
|
|
|
vertex->color.g = (GLubyte)(lightCopy.g * 255);
|
|
|
|
vertex->color.b = (GLubyte)(lightCopy.b * 255);
|
|
|
|
vertex->color.a = (GLubyte)(lightCopy.a * 255);
|
|
|
|
vertex->color2.r = (GLubyte)(darkCopy.r * 255);
|
|
|
|
vertex->color2.g = (GLubyte)(darkCopy.g * 255);
|
|
|
|
vertex->color2.b = (GLubyte)(darkCopy.b * 255);
|
|
|
|
vertex->color2.a = 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (int v = 0, vn = batchedTriangles->getTriangles().vertCount, vv = 0; v < vn; ++v, vv += 2) {
|
|
|
|
V3F_C4B_C4B_T2F* vertex = batchedTriangles->getTriangles().verts + v;
|
|
|
|
vertex->position.x = verts[vv];
|
|
|
|
vertex->position.y = verts[vv + 1];
|
|
|
|
vertex->texCoords.u = uvs[vv];
|
|
|
|
vertex->texCoords.v = uvs[vv + 1];
|
|
|
|
vertex->color.r = (GLubyte)color.r;
|
|
|
|
vertex->color.g = (GLubyte)color.g;
|
|
|
|
vertex->color.b = (GLubyte)color.b;
|
|
|
|
vertex->color.a = (GLubyte)color.a;
|
|
|
|
vertex->color2.r = (GLubyte)darkColor.r;
|
|
|
|
vertex->color2.g = (GLubyte)darkColor.g;
|
|
|
|
vertex->color2.b = (GLubyte)darkColor.b;
|
|
|
|
vertex->color2.a = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
TwoColorTrianglesCommand* batchedTriangles = lastTwoColorTrianglesCommand = twoColorBatch->addCommand(renderer, _globalZOrder, attachmentVertices->_texture->getName(), _glProgramState, blendFunc, trianglesTwoColor, transform, transformFlags);
|
|
|
|
|
|
|
|
if (_effect) {
|
|
|
|
spColor light;
|
|
|
|
spColor dark;
|
|
|
|
light.r = color.r / 255.0f;
|
|
|
|
light.g = color.g / 255.0f;
|
|
|
|
light.b = color.b / 255.0f;
|
|
|
|
light.a = color.a / 255.0f;
|
|
|
|
dark.r = darkColor.r / 255.0f;
|
|
|
|
dark.g = darkColor.g / 255.0f;
|
|
|
|
dark.b = darkColor.b / 255.0f;
|
|
|
|
dark.a = darkColor.a / 255.0f;
|
|
|
|
|
|
|
|
for (int v = 0, vn = batchedTriangles->getTriangles().vertCount; v < vn; ++v) {
|
|
|
|
V3F_C4B_C4B_T2F* vertex = batchedTriangles->getTriangles().verts + v;
|
|
|
|
spColor lightCopy = light;
|
|
|
|
spColor darkCopy = dark;
|
|
|
|
_effect->transform(_effect, &vertex->position.x, &vertex->position.y, &vertex->texCoords.u, &vertex->texCoords.v, &lightCopy, &darkCopy);
|
|
|
|
vertex->color.r = (GLubyte)(lightCopy.r * 255);
|
|
|
|
vertex->color.g = (GLubyte)(lightCopy.g * 255);
|
|
|
|
vertex->color.b = (GLubyte)(lightCopy.b * 255);
|
|
|
|
vertex->color.a = (GLubyte)(lightCopy.a * 255);
|
|
|
|
vertex->color2.r = (GLubyte)(darkCopy.r * 255);
|
|
|
|
vertex->color2.g = (GLubyte)(darkCopy.g * 255);
|
|
|
|
vertex->color2.b = (GLubyte)(darkCopy.b * 255);
|
|
|
|
vertex->color2.a = 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (int v = 0, vn = batchedTriangles->getTriangles().vertCount; v < vn; ++v) {
|
|
|
|
V3F_C4B_C4B_T2F* vertex = batchedTriangles->getTriangles().verts + v;
|
|
|
|
vertex->color.r = (GLubyte)color.r;
|
|
|
|
vertex->color.g = (GLubyte)color.g;
|
|
|
|
vertex->color.b = (GLubyte)color.b;
|
|
|
|
vertex->color.a = (GLubyte)color.a;
|
|
|
|
vertex->color2.r = (GLubyte)darkColor.r;
|
|
|
|
vertex->color2.g = (GLubyte)darkColor.g;
|
|
|
|
vertex->color2.b = (GLubyte)darkColor.b;
|
|
|
|
vertex->color2.a = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spSkeletonClipping_clipEnd(_clipper, slot);
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
2017-11-02 09:06:13 +08:00
|
|
|
spSkeletonClipping_clipEnd2(_clipper);
|
|
|
|
|
|
|
|
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.
|
|
|
|
if (!parent || parent->getChildrenCount() > 100 || getChildrenCount() != 0) {
|
|
|
|
lastTwoColorTrianglesCommand->setForceFlush(true);
|
|
|
|
} else {
|
|
|
|
Vector<Node*>& children = parent->getChildren();
|
|
|
|
Node* sibling = nullptr;
|
|
|
|
for (ssize_t i = 0; i < children.size(); i++) {
|
|
|
|
if (children.at(i) == this) {
|
|
|
|
if (i < children.size() - 1) {
|
|
|
|
sibling = children.at(i+1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!sibling) {
|
|
|
|
lastTwoColorTrianglesCommand->setForceFlush(true);
|
|
|
|
} else {
|
|
|
|
SkeletonRenderer* siblingSkeleton = dynamic_cast<SkeletonRenderer*>(sibling);
|
|
|
|
if (!siblingSkeleton || // flush is next sibling isn't a SkeletonRenderer
|
|
|
|
!siblingSkeleton->isTwoColorTint() || // flush if next sibling isn't two color tinted
|
|
|
|
!siblingSkeleton->isVisible() || // flush if next sibling is two color tinted but not visible
|
|
|
|
(siblingSkeleton->getGlobalZOrder() != this->getGlobalZOrder())) { // flush if next sibling is two color tinted but z-order differs
|
|
|
|
lastTwoColorTrianglesCommand->setForceFlush(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_effect) _effect->end(_effect);
|
2014-10-15 11:23:02 +08:00
|
|
|
|
2017-11-02 09:06:13 +08:00
|
|
|
if (_debugSlots || _debugBones || _debugMeshes) {
|
2016-07-28 22:25:50 +08:00
|
|
|
drawDebug(renderer, transform, transformFlags);
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-28 22:25:50 +08:00
|
|
|
void SkeletonRenderer::drawDebug (Renderer* renderer, const Mat4 &transform, uint32_t transformFlags) {
|
|
|
|
|
|
|
|
Director* director = Director::getInstance();
|
|
|
|
director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
|
|
|
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform);
|
|
|
|
|
|
|
|
DrawNode* drawNode = DrawNode::create();
|
|
|
|
|
|
|
|
if (_debugSlots) {
|
|
|
|
// Slots.
|
|
|
|
// DrawPrimitives::setDrawColor4B(0, 0, 255, 255);
|
|
|
|
glLineWidth(1);
|
|
|
|
Vec2 points[4];
|
|
|
|
V3F_C4B_T2F_Quad quad;
|
|
|
|
for (int i = 0, n = _skeleton->slotsCount; i < n; i++) {
|
|
|
|
spSlot* slot = _skeleton->drawOrder[i];
|
|
|
|
if (!slot->attachment || slot->attachment->type != SP_ATTACHMENT_REGION) continue;
|
|
|
|
spRegionAttachment* attachment = (spRegionAttachment*)slot->attachment;
|
2017-11-02 09:06:13 +08:00
|
|
|
spRegionAttachment_computeWorldVertices(attachment, slot->bone, _worldVertices, 0, 2);
|
2016-07-28 22:25:50 +08:00
|
|
|
points[0] = Vec2(_worldVertices[0], _worldVertices[1]);
|
|
|
|
points[1] = Vec2(_worldVertices[2], _worldVertices[3]);
|
|
|
|
points[2] = Vec2(_worldVertices[4], _worldVertices[5]);
|
|
|
|
points[3] = Vec2(_worldVertices[6], _worldVertices[7]);
|
|
|
|
drawNode->drawPoly(points, 4, true, Color4F::BLUE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (_debugBones) {
|
|
|
|
// Bone lengths.
|
|
|
|
glLineWidth(2);
|
|
|
|
for (int i = 0, n = _skeleton->bonesCount; i < n; i++) {
|
|
|
|
spBone *bone = _skeleton->bones[i];
|
|
|
|
float x = bone->data->length * bone->a + bone->worldX;
|
|
|
|
float y = bone->data->length * bone->c + bone->worldY;
|
|
|
|
drawNode->drawLine(Vec2(bone->worldX, bone->worldY), Vec2(x, y), Color4F::RED);
|
|
|
|
}
|
|
|
|
// Bone origins.
|
|
|
|
auto color = Color4F::BLUE; // Root bone is blue.
|
|
|
|
for (int i = 0, n = _skeleton->bonesCount; i < n; i++) {
|
|
|
|
spBone *bone = _skeleton->bones[i];
|
|
|
|
drawNode->drawPoint(Vec2(bone->worldX, bone->worldY), 4, color);
|
|
|
|
if (i == 0) color = Color4F::GREEN;
|
|
|
|
}
|
|
|
|
}
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
if (_debugMeshes) {
|
|
|
|
// Meshes.
|
|
|
|
glLineWidth(1);
|
|
|
|
for (int i = 0, n = _skeleton->slotsCount; i < n; ++i) {
|
|
|
|
spSlot* slot = _skeleton->drawOrder[i];
|
|
|
|
if (!slot->attachment || slot->attachment->type != SP_ATTACHMENT_MESH) continue;
|
|
|
|
spMeshAttachment* attachment = (spMeshAttachment*)slot->attachment;
|
|
|
|
spVertexAttachment_computeWorldVertices(SUPER(attachment), slot, 0, attachment->super.worldVerticesLength, _worldVertices, 0, 2);
|
|
|
|
for (int ii = 0; ii < attachment->trianglesCount;) {
|
|
|
|
Vec2 v1(_worldVertices + (attachment->triangles[ii++] * 2));
|
|
|
|
Vec2 v2(_worldVertices + (attachment->triangles[ii++] * 2));
|
|
|
|
Vec2 v3(_worldVertices + (attachment->triangles[ii++] * 2));
|
|
|
|
drawNode->drawLine(v1, v2, Color4F::YELLOW);
|
|
|
|
drawNode->drawLine(v2, v3, Color4F::YELLOW);
|
|
|
|
drawNode->drawLine(v3, v1, Color4F::YELLOW);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2016-07-28 22:25:50 +08:00
|
|
|
|
|
|
|
drawNode->draw(renderer, transform, transformFlags);
|
|
|
|
director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
|
2016-07-28 22:25:50 +08:00
|
|
|
AttachmentVertices* SkeletonRenderer::getAttachmentVertices (spRegionAttachment* attachment) const {
|
|
|
|
return (AttachmentVertices*)attachment->rendererObject;
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
|
2016-07-28 22:25:50 +08:00
|
|
|
AttachmentVertices* SkeletonRenderer::getAttachmentVertices (spMeshAttachment* attachment) const {
|
|
|
|
return (AttachmentVertices*)attachment->rendererObject;
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
|
2017-11-02 09:06:13 +08:00
|
|
|
Rect SkeletonRenderer::getBoundingBox () const {
|
2016-10-12 01:56:14 +08:00
|
|
|
float minX = FLT_MAX, minY = FLT_MAX, maxX = -FLT_MAX, maxY = -FLT_MAX;
|
2014-10-15 11:23:02 +08:00
|
|
|
float scaleX = getScaleX(), scaleY = getScaleY();
|
|
|
|
for (int i = 0; i < _skeleton->slotsCount; ++i) {
|
|
|
|
spSlot* slot = _skeleton->slots[i];
|
|
|
|
if (!slot->attachment) continue;
|
|
|
|
int verticesCount;
|
|
|
|
if (slot->attachment->type == SP_ATTACHMENT_REGION) {
|
|
|
|
spRegionAttachment* attachment = (spRegionAttachment*)slot->attachment;
|
2017-11-02 09:06:13 +08:00
|
|
|
spRegionAttachment_computeWorldVertices(attachment, slot->bone, _worldVertices, 0, 2);
|
2014-10-15 11:23:02 +08:00
|
|
|
verticesCount = 8;
|
|
|
|
} else if (slot->attachment->type == SP_ATTACHMENT_MESH) {
|
|
|
|
spMeshAttachment* mesh = (spMeshAttachment*)slot->attachment;
|
2017-11-02 09:06:13 +08:00
|
|
|
spVertexAttachment_computeWorldVertices(SUPER(mesh), slot, 0, mesh->super.worldVerticesLength, _worldVertices, 0, 2);
|
2016-07-28 22:25:50 +08:00
|
|
|
verticesCount = mesh->super.worldVerticesLength;
|
2014-10-15 11:23:02 +08:00
|
|
|
} else
|
|
|
|
continue;
|
|
|
|
for (int ii = 0; ii < verticesCount; ii += 2) {
|
|
|
|
float x = _worldVertices[ii] * scaleX, y = _worldVertices[ii + 1] * scaleY;
|
|
|
|
minX = min(minX, x);
|
|
|
|
minY = min(minY, y);
|
|
|
|
maxX = max(maxX, x);
|
|
|
|
maxY = max(maxY, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Vec2 position = getPosition();
|
2017-11-02 09:06:13 +08:00
|
|
|
if (minX == FLT_MAX) minX = minY = maxX = maxY = 0;
|
|
|
|
return Rect(position.x + minX, position.y + minY, maxX - minX, maxY - minY);
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// --- Convenience methods for Skeleton_* functions.
|
|
|
|
|
|
|
|
void SkeletonRenderer::updateWorldTransform () {
|
|
|
|
spSkeleton_updateWorldTransform(_skeleton);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::setToSetupPose () {
|
|
|
|
spSkeleton_setToSetupPose(_skeleton);
|
|
|
|
}
|
|
|
|
void SkeletonRenderer::setBonesToSetupPose () {
|
|
|
|
spSkeleton_setBonesToSetupPose(_skeleton);
|
|
|
|
}
|
|
|
|
void SkeletonRenderer::setSlotsToSetupPose () {
|
|
|
|
spSkeleton_setSlotsToSetupPose(_skeleton);
|
|
|
|
}
|
|
|
|
|
|
|
|
spBone* SkeletonRenderer::findBone (const std::string& boneName) const {
|
|
|
|
return spSkeleton_findBone(_skeleton, boneName.c_str());
|
|
|
|
}
|
|
|
|
|
|
|
|
spSlot* SkeletonRenderer::findSlot (const std::string& slotName) const {
|
|
|
|
return spSkeleton_findSlot(_skeleton, slotName.c_str());
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SkeletonRenderer::setSkin (const std::string& skinName) {
|
2015-04-14 15:23:16 +08:00
|
|
|
return spSkeleton_setSkinByName(_skeleton, skinName.empty() ? 0 : skinName.c_str()) ? true : false;
|
|
|
|
}
|
|
|
|
bool SkeletonRenderer::setSkin (const char* skinName) {
|
|
|
|
return spSkeleton_setSkinByName(_skeleton, skinName) ? true : false;
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
spAttachment* SkeletonRenderer::getAttachment (const std::string& slotName, const std::string& attachmentName) const {
|
|
|
|
return spSkeleton_getAttachmentForSlotName(_skeleton, slotName.c_str(), attachmentName.c_str());
|
|
|
|
}
|
|
|
|
bool SkeletonRenderer::setAttachment (const std::string& slotName, const std::string& attachmentName) {
|
2015-04-14 15:23:16 +08:00
|
|
|
return spSkeleton_setAttachment(_skeleton, slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()) ? true : false;
|
|
|
|
}
|
|
|
|
bool SkeletonRenderer::setAttachment (const std::string& slotName, const char* attachmentName) {
|
|
|
|
return spSkeleton_setAttachment(_skeleton, slotName.c_str(), attachmentName) ? true : false;
|
2014-10-15 11:23:02 +08:00
|
|
|
}
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
void SkeletonRenderer::setTwoColorTint(bool enabled) {
|
|
|
|
if (enabled)
|
|
|
|
setGLProgramState(SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState());
|
|
|
|
else
|
|
|
|
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SkeletonRenderer::isTwoColorTint() {
|
|
|
|
return getGLProgramState() == SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState();
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::setVertexEffect(spVertexEffect *effect) {
|
|
|
|
this->_effect = effect;
|
|
|
|
}
|
2014-10-15 11:23:02 +08:00
|
|
|
|
|
|
|
spSkeleton* SkeletonRenderer::getSkeleton () {
|
|
|
|
return _skeleton;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::setTimeScale (float scale) {
|
|
|
|
_timeScale = scale;
|
|
|
|
}
|
|
|
|
float SkeletonRenderer::getTimeScale () const {
|
|
|
|
return _timeScale;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::setDebugSlotsEnabled (bool enabled) {
|
|
|
|
_debugSlots = enabled;
|
|
|
|
}
|
|
|
|
bool SkeletonRenderer::getDebugSlotsEnabled () const {
|
|
|
|
return _debugSlots;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::setDebugBonesEnabled (bool enabled) {
|
|
|
|
_debugBones = enabled;
|
|
|
|
}
|
|
|
|
bool SkeletonRenderer::getDebugBonesEnabled () const {
|
|
|
|
return _debugBones;
|
|
|
|
}
|
2017-11-02 09:06:13 +08:00
|
|
|
|
|
|
|
void SkeletonRenderer::setDebugMeshesEnabled (bool enabled) {
|
|
|
|
_debugMeshes = enabled;
|
|
|
|
}
|
|
|
|
bool SkeletonRenderer::getDebugMeshesEnabled () const {
|
|
|
|
return _debugMeshes;
|
|
|
|
}
|
2014-10-15 11:23:02 +08:00
|
|
|
|
2015-04-14 15:23:16 +08:00
|
|
|
void SkeletonRenderer::onEnter () {
|
2015-08-12 18:07:28 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) return;
|
|
|
|
#endif
|
2015-04-14 15:23:16 +08:00
|
|
|
Node::onEnter();
|
|
|
|
scheduleUpdate();
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::onExit () {
|
2015-08-12 18:07:28 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit)) return;
|
|
|
|
#endif
|
2015-04-14 15:23:16 +08:00
|
|
|
Node::onExit();
|
|
|
|
unscheduleUpdate();
|
|
|
|
}
|
|
|
|
|
2014-10-15 11:23:02 +08:00
|
|
|
// --- CCBlendProtocol
|
|
|
|
|
|
|
|
const BlendFunc& SkeletonRenderer::getBlendFunc () const {
|
|
|
|
return _blendFunc;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::setBlendFunc (const BlendFunc &blendFunc) {
|
|
|
|
_blendFunc = blendFunc;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SkeletonRenderer::setOpacityModifyRGB (bool value) {
|
|
|
|
_premultipliedAlpha = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SkeletonRenderer::isOpacityModifyRGB () const {
|
|
|
|
return _premultipliedAlpha;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|