2013-06-06 12:02:54 +08:00
|
|
|
/****************************************************************************
|
2018-01-29 16:25:32 +08:00
|
|
|
Copyright (c) 2013-2016 Chukong Technologies Inc.
|
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
2013-06-06 12:02:54 +08:00
|
|
|
|
|
|
|
http://www.cocos2d-x.org
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
|
|
in the Software without restriction, including without limitation the rights
|
|
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
THE SOFTWARE.
|
|
|
|
****************************************************************************/
|
|
|
|
|
2016-03-20 21:53:44 +08:00
|
|
|
#include "editor-support/cocostudio/CCArmature.h"
|
|
|
|
#include "editor-support/cocostudio/CCArmatureDataManager.h"
|
|
|
|
#include "editor-support/cocostudio/CCArmatureDefine.h"
|
|
|
|
#include "editor-support/cocostudio/CCDataReaderHelper.h"
|
|
|
|
#include "editor-support/cocostudio/CCDatas.h"
|
|
|
|
#include "editor-support/cocostudio/CCSkin.h"
|
2014-01-17 13:35:58 +08:00
|
|
|
|
2014-04-30 08:37:36 +08:00
|
|
|
#include "renderer/CCRenderer.h"
|
|
|
|
#include "renderer/CCGroupCommand.h"
|
|
|
|
#include "base/CCDirector.h"
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-09-13 18:07:37 +08:00
|
|
|
#if ENABLE_PHYSICS_BOX2D_DETECT
|
|
|
|
#include "Box2D/Box2D.h"
|
|
|
|
#elif ENABLE_PHYSICS_CHIPMUNK_DETECT
|
2016-03-01 05:53:00 +08:00
|
|
|
#include "chipmunk/chipmunk.h"
|
2013-09-13 18:07:37 +08:00
|
|
|
#endif
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-10-15 18:00:03 +08:00
|
|
|
using namespace cocos2d;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-10-15 18:00:03 +08:00
|
|
|
|
|
|
|
namespace cocostudio {
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
Armature *Armature::create()
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
Armature *armature = new (std::nothrow) Armature();
|
2013-06-06 12:02:54 +08:00
|
|
|
if (armature && armature->init())
|
|
|
|
{
|
|
|
|
armature->autorelease();
|
|
|
|
return armature;
|
|
|
|
}
|
|
|
|
CC_SAFE_DELETE(armature);
|
2013-11-05 15:32:13 +08:00
|
|
|
return nullptr;
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
Armature *Armature::create(const std::string& name)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
Armature *armature = new (std::nothrow) Armature();
|
2013-09-13 18:07:37 +08:00
|
|
|
if (armature && armature->init(name))
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
|
|
|
armature->autorelease();
|
|
|
|
return armature;
|
|
|
|
}
|
|
|
|
CC_SAFE_DELETE(armature);
|
2013-11-05 15:32:13 +08:00
|
|
|
return nullptr;
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
Armature *Armature::create(const std::string& name, Bone *parentBone)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
Armature *armature = new (std::nothrow) Armature();
|
2013-06-07 10:52:32 +08:00
|
|
|
if (armature && armature->init(name, parentBone))
|
|
|
|
{
|
|
|
|
armature->autorelease();
|
|
|
|
return armature;
|
|
|
|
}
|
|
|
|
CC_SAFE_DELETE(armature);
|
2013-11-05 15:32:13 +08:00
|
|
|
return nullptr;
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
Armature::Armature()
|
2013-11-05 15:32:13 +08:00
|
|
|
: _armatureData(nullptr)
|
|
|
|
, _batchNode(nullptr)
|
|
|
|
, _parentBone(nullptr)
|
2013-09-15 20:24:25 +08:00
|
|
|
, _armatureTransformDirty(true)
|
2013-11-05 15:32:13 +08:00
|
|
|
, _animation(nullptr)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-07-22 09:38:46 +08:00
|
|
|
Armature::~Armature()
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
_boneDic.clear();
|
|
|
|
_topBoneList.clear();
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
CC_SAFE_DELETE(_animation);
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
bool Armature::init()
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2014-01-07 20:53:44 +08:00
|
|
|
return init("");
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
bool Armature::init(const std::string& name)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
|
|
|
bool bRet = false;
|
|
|
|
do
|
|
|
|
{
|
2013-06-07 10:52:32 +08:00
|
|
|
removeAllChildren();
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
CC_SAFE_DELETE(_animation);
|
2014-08-28 07:31:57 +08:00
|
|
|
_animation = new (std::nothrow) ArmatureAnimation();
|
2013-06-15 14:03:30 +08:00
|
|
|
_animation->init(this);
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-12-16 14:34:09 +08:00
|
|
|
_boneDic.clear();
|
|
|
|
_topBoneList.clear();
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2014-07-23 20:07:33 +08:00
|
|
|
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
_name = name;
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-09-16 15:16:05 +08:00
|
|
|
ArmatureDataManager *armatureDataManager = ArmatureDataManager::getInstance();
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-12-24 11:05:53 +08:00
|
|
|
if(!_name.empty())
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-20 14:15:53 +08:00
|
|
|
AnimationData *animationData = armatureDataManager->getAnimationData(name);
|
2013-09-16 12:02:57 +08:00
|
|
|
CCASSERT(animationData, "AnimationData not exist! ");
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_animation->setAnimationData(animationData);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
ArmatureData *armatureData = armatureDataManager->getArmatureData(name);
|
2015-07-14 15:28:36 +08:00
|
|
|
CCASSERT(armatureData, "armatureData doesn't exists!");
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_armatureData = armatureData;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-12-18 22:07:33 +08:00
|
|
|
for (auto& element : armatureData->boneDataDic)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2016-02-03 23:12:37 +08:00
|
|
|
Bone *bone = createBone(element.first);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
//! init bone's Tween to 1st movement's 1st frame
|
2013-06-07 10:52:32 +08:00
|
|
|
do
|
|
|
|
{
|
2016-02-03 23:12:37 +08:00
|
|
|
MovementData *movData = animationData->getMovement(animationData->movementNames.at(0));
|
2013-06-06 12:02:54 +08:00
|
|
|
CC_BREAK_IF(!movData);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2016-02-03 23:12:37 +08:00
|
|
|
MovementBoneData *movBoneData = movData->getMovementBoneData(bone->getName());
|
2013-12-13 19:40:38 +08:00
|
|
|
CC_BREAK_IF(!movBoneData || movBoneData->frameList.size() <= 0);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
FrameData *frameData = movBoneData->getFrameData(0);
|
2013-06-06 12:02:54 +08:00
|
|
|
CC_BREAK_IF(!frameData);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-06 12:02:54 +08:00
|
|
|
bone->getTweenData()->copy(frameData);
|
2014-01-02 11:07:31 +08:00
|
|
|
bone->changeDisplayWithIndex(frameData->displayIndex, false);
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
|
|
|
while (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
update(0);
|
|
|
|
updateOffsetPoint();
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_name = "new_armature";
|
2013-06-20 14:15:53 +08:00
|
|
|
_armatureData = ArmatureData::create();
|
2013-06-15 14:03:30 +08:00
|
|
|
_armatureData->name = _name;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
AnimationData *animationData = AnimationData::create();
|
2013-06-15 14:03:30 +08:00
|
|
|
animationData->name = _name;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2016-02-03 23:12:37 +08:00
|
|
|
armatureDataManager->addArmatureData(_name, _armatureData);
|
|
|
|
armatureDataManager->addAnimationData(_name, animationData);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_animation->setAnimationData(animationData);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2019-02-19 16:06:17 +08:00
|
|
|
//TODO minggo
|
|
|
|
// setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-06-07 10:52:32 +08:00
|
|
|
setCascadeOpacityEnabled(true);
|
|
|
|
setCascadeColorEnabled(true);
|
2013-06-06 12:02:54 +08:00
|
|
|
|
|
|
|
bRet = true;
|
|
|
|
}
|
|
|
|
while (0);
|
|
|
|
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
bool Armature::init(const std::string& name, Bone *parentBone)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_parentBone = parentBone;
|
2013-06-07 10:52:32 +08:00
|
|
|
return init(name);
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
Bone *Armature::createBone(const std::string& boneName)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-20 14:15:53 +08:00
|
|
|
Bone *existedBone = getBone(boneName);
|
2013-11-05 15:32:13 +08:00
|
|
|
if(existedBone != nullptr)
|
2013-06-07 10:52:32 +08:00
|
|
|
return existedBone;
|
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
BoneData *boneData = (BoneData *)_armatureData->getBoneData(boneName);
|
2013-06-07 10:52:32 +08:00
|
|
|
std::string parentName = boneData->parentName;
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-11-05 15:32:13 +08:00
|
|
|
Bone *bone = nullptr;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2015-09-01 11:26:09 +08:00
|
|
|
if( !parentName.empty())
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2016-02-03 23:12:37 +08:00
|
|
|
createBone(parentName);
|
2013-06-20 14:15:53 +08:00
|
|
|
bone = Bone::create(boneName);
|
2016-02-03 23:12:37 +08:00
|
|
|
addBone(bone, parentName);
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-06-20 14:15:53 +08:00
|
|
|
bone = Bone::create(boneName);
|
2013-06-06 12:02:54 +08:00
|
|
|
addBone(bone, "");
|
|
|
|
}
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-06 12:02:54 +08:00
|
|
|
bone->setBoneData(boneData);
|
2014-01-02 11:07:31 +08:00
|
|
|
bone->getDisplayManager()->changeDisplayWithIndex(-1, false);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-06 12:02:54 +08:00
|
|
|
return bone;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
void Armature::addBone(Bone *bone, const std::string& parentName)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-11-05 15:32:13 +08:00
|
|
|
CCASSERT( bone != nullptr, "Argument must be non-nil");
|
2013-12-16 14:34:09 +08:00
|
|
|
CCASSERT(_boneDic.at(bone->getName()) == nullptr, "bone already added. It can't be added again");
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-12-24 11:05:53 +08:00
|
|
|
if (!parentName.empty())
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
Bone *boneParent = _boneDic.at(parentName);
|
2013-06-06 12:02:54 +08:00
|
|
|
if (boneParent)
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
|
|
|
boneParent->addChildBone(bone);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
_topBoneList.pushBack(bone);
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
2013-06-07 10:52:32 +08:00
|
|
|
else
|
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
_topBoneList.pushBack(bone);
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
|
|
|
|
2013-06-06 12:02:54 +08:00
|
|
|
bone->setArmature(this);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-12-16 14:34:09 +08:00
|
|
|
_boneDic.insert(bone->getName(), bone);
|
2013-06-06 12:02:54 +08:00
|
|
|
addChild(bone);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
void Armature::removeBone(Bone *bone, bool recursion)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-11-05 15:32:13 +08:00
|
|
|
CCASSERT(bone != nullptr, "bone must be added to the bone dictionary!");
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-11-05 15:32:13 +08:00
|
|
|
bone->setArmature(nullptr);
|
2013-06-06 12:02:54 +08:00
|
|
|
bone->removeFromParent(recursion);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-12-16 14:34:09 +08:00
|
|
|
if (_topBoneList.contains(bone))
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2013-12-17 18:06:11 +08:00
|
|
|
_topBoneList.eraseObject(bone);
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
2013-12-16 14:34:09 +08:00
|
|
|
_boneDic.erase(bone->getName());
|
2013-06-08 22:08:22 +08:00
|
|
|
removeChild(bone, true);
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
Bone *Armature::getBone(const std::string& name) const
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
return _boneDic.at(name);
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-23 14:05:46 +08:00
|
|
|
void Armature::changeBoneParent(Bone *bone, const std::string& parentName)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-11-05 15:32:13 +08:00
|
|
|
CCASSERT(bone != nullptr, "bone must be added to the bone dictionary!");
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-09-13 18:07:37 +08:00
|
|
|
if(bone->getParentBone())
|
|
|
|
{
|
2013-12-12 14:45:30 +08:00
|
|
|
bone->getParentBone()->getChildren().eraseObject(bone);
|
2013-11-05 15:32:13 +08:00
|
|
|
bone->setParentBone(nullptr);
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-12-24 11:05:53 +08:00
|
|
|
if (!parentName.empty())
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
Bone *boneParent = _boneDic.at(parentName);
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-06-07 10:52:32 +08:00
|
|
|
if (boneParent)
|
|
|
|
{
|
|
|
|
boneParent->addChildBone(bone);
|
2013-12-16 14:34:09 +08:00
|
|
|
if (_topBoneList.contains(bone))
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-12-17 18:06:11 +08:00
|
|
|
_topBoneList.eraseObject(bone);
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
_topBoneList.pushBack(bone);
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
|
|
|
}
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-12-16 14:34:09 +08:00
|
|
|
const cocos2d::Map<std::string, Bone*>& Armature::getBoneDic() const
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return _boneDic;
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
const Mat4& Armature::getNodeToParentTransform() const
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
if (_transformDirty)
|
2013-09-15 20:24:25 +08:00
|
|
|
_armatureTransformDirty = true;
|
2013-09-13 18:07:37 +08:00
|
|
|
|
2013-12-19 10:00:55 +08:00
|
|
|
return Node::getNodeToParentTransform();
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
void Armature::updateOffsetPoint()
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-07 10:52:32 +08:00
|
|
|
// Set contentsize and Calculate anchor point.
|
2013-07-17 09:16:04 +08:00
|
|
|
Rect rect = getBoundingBox();
|
2013-06-07 10:52:32 +08:00
|
|
|
setContentSize(rect.size);
|
2015-04-20 01:40:52 +08:00
|
|
|
_offsetPoint.set(-rect.origin.x, -rect.origin.y);
|
2013-09-13 18:07:37 +08:00
|
|
|
if (rect.size.width != 0 && rect.size.height != 0)
|
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
setAnchorPoint(Vec2(_offsetPoint.x / rect.size.width, _offsetPoint.y / rect.size.height));
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
void Armature::setAnchorPoint(const Vec2& point)
|
2013-12-19 15:43:32 +08:00
|
|
|
{
|
|
|
|
if( ! point.equals(_anchorPoint))
|
|
|
|
{
|
|
|
|
_anchorPoint = point;
|
2015-04-20 01:40:52 +08:00
|
|
|
_anchorPointInPoints.set(_contentSize.width * _anchorPoint.x - _offsetPoint.x, _contentSize.height * _anchorPoint.y - _offsetPoint.y);
|
|
|
|
_realAnchorPointInPoints.set(_contentSize.width * _anchorPoint.x, _contentSize.height * _anchorPoint.y);
|
2013-12-19 15:43:32 +08:00
|
|
|
_transformDirty = _inverseDirty = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
const Vec2& Armature::getAnchorPointInPoints() const
|
2013-12-19 15:43:32 +08:00
|
|
|
{
|
|
|
|
return _realAnchorPointInPoints;
|
|
|
|
}
|
|
|
|
|
2014-09-24 11:20:36 +08:00
|
|
|
const Vec2& Armature::getOffsetPoints() const
|
|
|
|
{
|
2014-09-24 15:14:47 +08:00
|
|
|
return _offsetPoint;
|
2014-09-24 11:20:36 +08:00
|
|
|
}
|
|
|
|
|
2013-09-15 19:08:45 +08:00
|
|
|
void Armature::setAnimation(ArmatureAnimation *animation)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
_animation = animation;
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-11-05 19:53:38 +08:00
|
|
|
ArmatureAnimation *Armature::getAnimation() const
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
return _animation;
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-11-05 19:53:38 +08:00
|
|
|
bool Armature::getArmatureTransformDirty() const
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
return _armatureTransformDirty;
|
2013-09-14 19:54:49 +08:00
|
|
|
}
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-06-20 14:15:53 +08:00
|
|
|
void Armature::update(float dt)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_animation->update(dt);
|
2013-06-06 12:02:54 +08:00
|
|
|
|
2013-12-20 05:34:41 +08:00
|
|
|
for(const auto &bone : _topBoneList) {
|
2013-12-18 22:07:33 +08:00
|
|
|
bone->update(dt);
|
2013-12-20 05:34:41 +08:00
|
|
|
}
|
2013-09-13 18:07:37 +08:00
|
|
|
|
2013-09-15 20:24:25 +08:00
|
|
|
_armatureTransformDirty = false;
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
void Armature::draw(cocos2d::Renderer *renderer, const Mat4 &transform, uint32_t flags)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-11-05 15:32:13 +08:00
|
|
|
if (_parentBone == nullptr && _batchNode == nullptr)
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2014-03-06 07:49:08 +08:00
|
|
|
// CC_NODE_DRAW_SETUP();
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
|
|
|
|
2013-12-17 17:00:01 +08:00
|
|
|
|
2013-12-18 22:07:33 +08:00
|
|
|
for (auto& object : _children)
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2013-09-15 19:08:45 +08:00
|
|
|
if (Bone *bone = dynamic_cast<Bone *>(object))
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-10-30 09:41:40 +08:00
|
|
|
Node *node = bone->getDisplayRenderNode();
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-11-05 15:32:13 +08:00
|
|
|
if (nullptr == node)
|
2013-09-13 18:07:37 +08:00
|
|
|
continue;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-10-30 09:41:40 +08:00
|
|
|
switch (bone->getDisplayRenderNodeType())
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2013-09-13 18:07:37 +08:00
|
|
|
case CS_DISPLAY_SPRITE:
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2013-09-16 12:21:18 +08:00
|
|
|
Skin *skin = static_cast<Skin *>(node);
|
2013-09-13 18:07:37 +08:00
|
|
|
skin->updateTransform();
|
2013-12-17 17:00:01 +08:00
|
|
|
|
2014-07-09 14:25:51 +08:00
|
|
|
BlendFunc func = bone->getBlendFunc();
|
2013-12-17 17:00:01 +08:00
|
|
|
|
2014-07-23 20:07:33 +08:00
|
|
|
if (func.src != BlendFunc::ALPHA_PREMULTIPLIED.src || func.dst != BlendFunc::ALPHA_PREMULTIPLIED.dst)
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2013-12-17 18:06:11 +08:00
|
|
|
skin->setBlendFunc(bone->getBlendFunc());
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
2014-06-30 10:11:43 +08:00
|
|
|
else
|
|
|
|
{
|
2014-07-23 21:35:08 +08:00
|
|
|
if (_blendFunc == BlendFunc::ALPHA_PREMULTIPLIED && !skin->getTexture()->hasPremultipliedAlpha())
|
2014-07-23 20:07:33 +08:00
|
|
|
{
|
2014-07-23 21:35:08 +08:00
|
|
|
skin->setBlendFunc(_blendFunc.ALPHA_NON_PREMULTIPLIED);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
skin->setBlendFunc(_blendFunc);
|
2014-07-23 20:07:33 +08:00
|
|
|
}
|
2014-06-30 10:11:43 +08:00
|
|
|
}
|
2014-05-31 07:42:05 +08:00
|
|
|
skin->draw(renderer, transform, flags);
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
2013-09-13 18:07:37 +08:00
|
|
|
break;
|
|
|
|
case CS_DISPLAY_ARMATURE:
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
node->draw(renderer, transform, flags);
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
node->visit(renderer, transform, flags);
|
2014-03-06 07:49:08 +08:00
|
|
|
// CC_NODE_DRAW_SETUP();
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
break;
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
|
|
|
}
|
2013-09-13 18:07:37 +08:00
|
|
|
else if(Node *node = dynamic_cast<Node *>(object))
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
node->visit(renderer, transform, flags);
|
2014-03-06 07:49:08 +08:00
|
|
|
// CC_NODE_DRAW_SETUP();
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
|
|
|
}
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-12-26 15:49:20 +08:00
|
|
|
void Armature::onEnter()
|
|
|
|
{
|
2014-06-13 17:59:23 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript)
|
|
|
|
{
|
2014-06-18 11:51:52 +08:00
|
|
|
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter))
|
2014-06-13 17:59:23 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-12-26 15:49:20 +08:00
|
|
|
Node::onEnter();
|
|
|
|
scheduleUpdate();
|
|
|
|
}
|
|
|
|
|
|
|
|
void Armature::onExit()
|
|
|
|
{
|
2015-07-28 16:07:14 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript)
|
|
|
|
{
|
2015-07-28 18:24:03 +08:00
|
|
|
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit))
|
2015-07-28 16:07:14 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-12-26 15:49:20 +08:00
|
|
|
Node::onExit();
|
|
|
|
unscheduleUpdate();
|
|
|
|
}
|
|
|
|
|
2013-09-13 18:07:37 +08:00
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
void Armature::visit(cocos2d::Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-07 10:52:32 +08:00
|
|
|
// quick return if not visible. children won't be drawn.
|
2015-06-18 10:32:30 +08:00
|
|
|
if (!_visible)
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
uint32_t flags = processParentFlags(parentTransform, parentFlags);
|
2014-03-01 03:20:53 +08:00
|
|
|
|
2015-06-18 10:32:30 +08:00
|
|
|
if (isVisitableByVisitingCamera())
|
|
|
|
{
|
|
|
|
// IMPORTANT:
|
|
|
|
// To ease the migration to v3.0, we still support the Mat4 stack,
|
|
|
|
// but it is deprecated and your code should not rely on it
|
|
|
|
Director* director = Director::getInstance();
|
2015-09-22 16:08:23 +08:00
|
|
|
CCASSERT(nullptr != director, "Director is null when setting matrix stack");
|
2015-06-18 10:32:30 +08:00
|
|
|
director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
|
|
|
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
|
|
|
|
|
|
|
|
|
|
|
|
sortAllChildren();
|
|
|
|
draw(renderer, _modelViewTransform, flags);
|
|
|
|
|
|
|
|
// FIX ME: Why need to set _orderOfArrival to 0??
|
|
|
|
// Please refer to https://github.com/cocos2d/cocos2d-x/pull/6920
|
|
|
|
// setOrderOfArrival(0);
|
|
|
|
|
|
|
|
director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
|
|
|
}
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-07-17 09:16:04 +08:00
|
|
|
Rect Armature::getBoundingBox() const
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-06-07 10:52:32 +08:00
|
|
|
float minx, miny, maxx, maxy = 0;
|
|
|
|
|
|
|
|
bool first = true;
|
|
|
|
|
2013-07-12 14:30:26 +08:00
|
|
|
Rect boundingBox = Rect(0, 0, 0, 0);
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-12-20 09:54:50 +08:00
|
|
|
for (const auto& object : _children)
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2013-09-15 19:08:45 +08:00
|
|
|
if (Bone *bone = dynamic_cast<Bone *>(object))
|
2013-06-07 10:52:32 +08:00
|
|
|
{
|
2013-09-13 18:07:37 +08:00
|
|
|
Rect r = bone->getDisplayManager()->getBoundingBox();
|
2014-05-26 16:16:06 +08:00
|
|
|
if (r.equals(Rect::ZERO))
|
|
|
|
continue;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-09-13 18:07:37 +08:00
|
|
|
if(first)
|
|
|
|
{
|
|
|
|
minx = r.getMinX();
|
|
|
|
miny = r.getMinY();
|
|
|
|
maxx = r.getMaxX();
|
|
|
|
maxy = r.getMaxY();
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-09-13 18:07:37 +08:00
|
|
|
first = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
minx = r.getMinX() < boundingBox.getMinX() ? r.getMinX() : boundingBox.getMinX();
|
|
|
|
miny = r.getMinY() < boundingBox.getMinY() ? r.getMinY() : boundingBox.getMinY();
|
|
|
|
maxx = r.getMaxX() > boundingBox.getMaxX() ? r.getMaxX() : boundingBox.getMaxX();
|
|
|
|
maxy = r.getMaxY() > boundingBox.getMaxY() ? r.getMaxY() : boundingBox.getMaxY();
|
|
|
|
}
|
|
|
|
|
|
|
|
boundingBox.setRect(minx, miny, maxx - minx, maxy - miny);
|
|
|
|
}
|
2013-12-18 22:07:33 +08:00
|
|
|
|
2013-12-20 09:54:50 +08:00
|
|
|
}
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-12-11 03:07:15 +08:00
|
|
|
return RectApplyTransform(boundingBox, getNodeToParentTransform());
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-11-05 19:53:38 +08:00
|
|
|
Bone *Armature::getBoneAtPoint(float x, float y) const
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-12-05 10:35:10 +08:00
|
|
|
long length = _children.size();
|
2013-08-20 08:09:28 +08:00
|
|
|
Bone *bs;
|
2013-06-07 10:52:32 +08:00
|
|
|
|
2013-11-28 16:02:03 +08:00
|
|
|
for(long i = length - 1; i >= 0; i--)
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-12-05 10:35:10 +08:00
|
|
|
bs = static_cast<Bone*>( _children.at(i) );
|
2013-08-20 08:09:28 +08:00
|
|
|
if(bs->getDisplayManager()->containPoint(x, y))
|
2013-06-06 12:02:54 +08:00
|
|
|
{
|
2013-08-20 08:09:28 +08:00
|
|
|
return bs;
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
2013-06-07 10:52:32 +08:00
|
|
|
}
|
2013-11-05 15:32:13 +08:00
|
|
|
return nullptr;
|
2013-06-06 12:02:54 +08:00
|
|
|
}
|
|
|
|
|
2013-10-30 09:41:40 +08:00
|
|
|
|
|
|
|
void Armature::setParentBone(Bone *parentBone)
|
|
|
|
{
|
|
|
|
_parentBone = parentBone;
|
2013-12-16 14:34:09 +08:00
|
|
|
|
2013-12-18 22:07:33 +08:00
|
|
|
for (auto& element : _boneDic)
|
2013-10-30 09:41:40 +08:00
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
element.second->setArmature(this);
|
2013-10-30 09:41:40 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-05 19:53:38 +08:00
|
|
|
Bone *Armature::getParentBone() const
|
2013-10-30 09:41:40 +08:00
|
|
|
{
|
|
|
|
return _parentBone;
|
|
|
|
}
|
|
|
|
|
2013-12-06 13:40:49 +08:00
|
|
|
#if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT
|
|
|
|
|
2014-10-17 16:28:37 +08:00
|
|
|
void Armature::setColliderFilter(ColliderFilter *filter)
|
2013-11-01 14:36:44 +08:00
|
|
|
{
|
2013-12-18 22:07:33 +08:00
|
|
|
for (auto& element : _boneDic)
|
2013-11-01 14:36:44 +08:00
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
element.second->setColliderFilter(filter);
|
2013-11-01 14:36:44 +08:00
|
|
|
}
|
|
|
|
}
|
2013-12-06 13:40:49 +08:00
|
|
|
#elif ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX
|
|
|
|
|
2014-10-17 16:28:37 +08:00
|
|
|
void Armature::drawContour()
|
2013-12-06 13:40:49 +08:00
|
|
|
{
|
2013-12-18 22:07:33 +08:00
|
|
|
for(auto& element : _boneDic)
|
2013-12-06 13:40:49 +08:00
|
|
|
{
|
2013-12-16 14:34:09 +08:00
|
|
|
Bone *bone = element.second;
|
|
|
|
ColliderDetector *detector = bone->getColliderDetector();
|
|
|
|
|
|
|
|
if (!detector)
|
2013-12-06 13:40:49 +08:00
|
|
|
continue;
|
|
|
|
|
2013-12-16 14:34:09 +08:00
|
|
|
const cocos2d::Vector<ColliderBody*>& bodyList = detector->getColliderBodyList();
|
|
|
|
|
2013-12-18 22:07:33 +08:00
|
|
|
for (auto& object : bodyList)
|
2013-12-06 13:40:49 +08:00
|
|
|
{
|
|
|
|
ColliderBody *body = static_cast<ColliderBody*>(object);
|
2014-05-15 01:07:09 +08:00
|
|
|
const std::vector<Vec2> &vertexList = body->getCalculatedVertexList();
|
2013-12-06 13:40:49 +08:00
|
|
|
|
2013-12-17 19:32:16 +08:00
|
|
|
unsigned long length = vertexList.size();
|
2014-08-28 07:31:57 +08:00
|
|
|
Vec2 *points = new (std::nothrow) Vec2[length];
|
2013-12-17 19:32:16 +08:00
|
|
|
for (unsigned long i = 0; i<length; i++)
|
2013-12-06 13:40:49 +08:00
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 p = vertexList.at(i);
|
2013-12-13 19:40:38 +08:00
|
|
|
points[i].x = p.x;
|
|
|
|
points[i].y = p.y;
|
2013-12-06 13:40:49 +08:00
|
|
|
}
|
2014-10-17 16:28:37 +08:00
|
|
|
|
|
|
|
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
|
|
|
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
|
|
#elif _MSC_VER >= 1400 //vs 2005 or higher
|
|
|
|
#pragma warning (push)
|
|
|
|
#pragma warning (disable: 4996)
|
|
|
|
#endif
|
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
|
|
|
cocos2d::log("TODO in %s %s %d", __FILE__, __FUNCTION__, __LINE__);
|
2013-12-06 13:40:49 +08:00
|
|
|
|
2014-10-17 16:28:37 +08:00
|
|
|
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
|
|
|
|
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
|
|
|
|
#elif _MSC_VER >= 1400 //vs 2005 or higher
|
|
|
|
#pragma warning (pop)
|
|
|
|
#endif
|
|
|
|
|
2014-01-17 13:35:58 +08:00
|
|
|
delete []points;
|
2013-12-06 13:40:49 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2013-11-01 14:36:44 +08:00
|
|
|
|
2013-09-13 18:07:37 +08:00
|
|
|
#if ENABLE_PHYSICS_BOX2D_DETECT
|
2013-11-05 19:53:38 +08:00
|
|
|
b2Body *Armature::getBody() const
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
return _body;
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
|
2013-09-15 19:08:45 +08:00
|
|
|
void Armature::setBody(b2Body *body)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
if (_body == body)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-09-15 20:24:25 +08:00
|
|
|
_body = body;
|
|
|
|
_body->SetUserData(this);
|
2013-09-13 18:07:37 +08:00
|
|
|
|
2013-12-18 22:36:10 +08:00
|
|
|
for(auto& object : _children)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 19:08:45 +08:00
|
|
|
if (Bone *bone = dynamic_cast<Bone *>(object))
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-12-18 22:36:10 +08:00
|
|
|
auto displayList = bone->getDisplayManager()->getDecorativeDisplayList();
|
2013-09-13 18:07:37 +08:00
|
|
|
|
2013-11-06 15:25:44 +08:00
|
|
|
for(auto displayObject : displayList)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-11-06 15:25:44 +08:00
|
|
|
ColliderDetector *detector = static_cast<DecorativeDisplay *>(displayObject)->getColliderDetector();
|
2013-11-05 15:32:13 +08:00
|
|
|
if (detector != nullptr)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
detector->setBody(_body);
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-15 19:08:45 +08:00
|
|
|
b2Fixture *Armature::getShapeList()
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
if (_body)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
return _body->GetFixtureList();
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-11-05 15:32:13 +08:00
|
|
|
return nullptr;
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#elif ENABLE_PHYSICS_CHIPMUNK_DETECT
|
2013-11-05 19:53:38 +08:00
|
|
|
cpBody *Armature::getBody() const
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
return _body;
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
|
2013-09-15 19:08:45 +08:00
|
|
|
void Armature::setBody(cpBody *body)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
if (_body == body)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-09-15 20:24:25 +08:00
|
|
|
_body = body;
|
|
|
|
_body->data = this;
|
2013-09-13 18:07:37 +08:00
|
|
|
|
2013-12-20 09:54:50 +08:00
|
|
|
for (const auto& object : _children)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 19:08:45 +08:00
|
|
|
if (Bone *bone = dynamic_cast<Bone *>(object))
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-12-18 22:36:10 +08:00
|
|
|
auto displayList = bone->getDisplayManager()->getDecorativeDisplayList();
|
2013-09-13 18:07:37 +08:00
|
|
|
|
2013-12-20 09:54:50 +08:00
|
|
|
for (const auto& displayObject : displayList)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-12-20 09:54:50 +08:00
|
|
|
auto detector = displayObject->getColliderDetector();
|
2013-11-05 15:32:13 +08:00
|
|
|
if (detector != nullptr)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-12-18 22:36:10 +08:00
|
|
|
detector->setBody(body);
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
2013-12-18 22:07:33 +08:00
|
|
|
});
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-15 19:08:45 +08:00
|
|
|
cpShape *Armature::getShapeList()
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
if (_body)
|
2013-09-13 18:07:37 +08:00
|
|
|
{
|
2013-09-15 20:24:25 +08:00
|
|
|
return _body->shapeList_private;
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-11-05 15:32:13 +08:00
|
|
|
return nullptr;
|
2013-09-13 18:07:37 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2013-10-15 18:00:03 +08:00
|
|
|
}
|