axmol/cocos/editor-support/cocostudio/CCArmature.h

286 lines
9.4 KiB
C
Raw Normal View History

2015-06-17 13:16:06 +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.
****************************************************************************/
2013-09-13 18:07:37 +08:00
2013-06-06 12:02:54 +08:00
#ifndef __CCARMATURE_H__
#define __CCARMATURE_H__
#include "editor-support/cocostudio/CCArmatureDefine.h"
#include "editor-support/cocostudio/CCBone.h"
#include "editor-support/cocostudio/CCBatchNode.h"
#include "editor-support/cocostudio/CCArmatureAnimation.h"
#include "editor-support/cocostudio/CCSpriteFrameCacheHelper.h"
#include "editor-support/cocostudio/CCArmatureDataManager.h"
#include "editor-support/cocostudio/CocosStudioExport.h"
2014-04-26 13:03:25 +08:00
#include "math/CCMath.h"
2013-06-06 12:02:54 +08:00
2013-09-13 18:07:37 +08:00
class b2Body;
struct cpBody;
2013-06-06 12:02:54 +08:00
namespace cocostudio {
2013-09-13 18:07:37 +08:00
2013-09-16 14:13:55 +08:00
CC_DEPRECATED_ATTRIBUTE typedef ProcessBase CCProcessBase;
CC_DEPRECATED_ATTRIBUTE typedef BaseData CCBaseData;
CC_DEPRECATED_ATTRIBUTE typedef DisplayData CCDisplayData;
CC_DEPRECATED_ATTRIBUTE typedef SpriteDisplayData CCSpriteDisplayData;
CC_DEPRECATED_ATTRIBUTE typedef ArmatureDisplayData CCArmatureDisplayData;
CC_DEPRECATED_ATTRIBUTE typedef ParticleDisplayData CCParticleDisplayData;
CC_DEPRECATED_ATTRIBUTE typedef BoneData CCBoneData;
CC_DEPRECATED_ATTRIBUTE typedef FrameData CCFrameData;
CC_DEPRECATED_ATTRIBUTE typedef MovementBoneData CCMovementBoneData;
CC_DEPRECATED_ATTRIBUTE typedef MovementData CCMovementData;
CC_DEPRECATED_ATTRIBUTE typedef AnimationData CCAnimationData;
CC_DEPRECATED_ATTRIBUTE typedef ContourData CCContourData;
CC_DEPRECATED_ATTRIBUTE typedef TextureData CCTextureData;
CC_DEPRECATED_ATTRIBUTE typedef DecorativeDisplay CCDecorativeDisplay;
CC_DEPRECATED_ATTRIBUTE typedef DisplayData CCDisplayData;
CC_DEPRECATED_ATTRIBUTE typedef DisplayFactory CCDisplayFactory;
CC_DEPRECATED_ATTRIBUTE typedef BatchNode CCBatchNode;
CC_DEPRECATED_ATTRIBUTE typedef DecorativeDisplay CCDecorativeDisplay;
CC_DEPRECATED_ATTRIBUTE typedef DisplayManager CCDisplayManager;
CC_DEPRECATED_ATTRIBUTE typedef ColliderBody CCColliderBody;
CC_DEPRECATED_ATTRIBUTE typedef ColliderDetector CCColliderDetector;
CC_DEPRECATED_ATTRIBUTE typedef SpriteFrameCacheHelper CCSpriteFrameCacheHelper;
CC_DEPRECATED_ATTRIBUTE typedef ArmatureData CCArmatureData;
CC_DEPRECATED_ATTRIBUTE typedef Bone CCBone;
CC_DEPRECATED_ATTRIBUTE typedef ArmatureAnimation CCArmatureAnimation;
CC_DEPRECATED_ATTRIBUTE typedef Armature CCArmature;
CC_DEPRECATED_ATTRIBUTE typedef ArmatureDataManager CCArmatureDataManager;
CC_DEPRECATED_ATTRIBUTE typedef cocos2d::tweenfunc::TweenType CCTweenType;
2013-09-16 14:13:55 +08:00
class CC_STUDIO_DLL Armature : public cocos2d::Node, public cocos2d::BlendProtocol
2013-06-06 12:02:54 +08:00
{
public:
2013-09-13 18:07:37 +08:00
/**
2013-09-13 18:07:37 +08:00
* Allocates and initializes an armature.
* @return An initialized armature which is marked as "autorelease".
*/
static Armature *create();
2013-09-13 18:07:37 +08:00
/**
* Allocates an armature, and use the ArmatureData named name in ArmatureDataManager to initializes the armature.
2013-09-13 18:07:37 +08:00
*
* @param name Armature will use the name to find the ArmatureData to initializes it.
2013-09-13 18:07:37 +08:00
* @return A initialized armature which is marked as "autorelease".
*/
static Armature *create(const std::string& name);
2013-09-13 18:07:37 +08:00
static Armature *create(const std::string& name, Bone *parentBone);
2013-06-06 12:02:54 +08:00
public:
/**
* @js ctor
*/
Armature();
2013-09-16 14:13:55 +08:00
/**
* @js NA
* @lua NA
*/
virtual ~Armature();
2013-06-06 12:02:54 +08:00
/**
* Init the empty armature
*/
2013-11-05 19:53:38 +08:00
virtual bool init() override;
2013-09-13 18:07:37 +08:00
2013-06-06 12:02:54 +08:00
/**
2013-09-13 18:07:37 +08:00
* Init an armature with specified name
* @param name Armature name
2013-06-06 12:02:54 +08:00
*/
virtual bool init(const std::string& name);
2013-06-06 12:02:54 +08:00
virtual bool init(const std::string& name, Bone *parentBone);
2013-06-06 12:02:54 +08:00
/**
* Add a Bone to this Armature,
2013-06-06 12:02:54 +08:00
*
* @param bone The Bone you want to add to Armature
* @param parentName The parent Bone's name you want to add to . If it's nullptr, then set Armature to its parent
2013-06-06 12:02:54 +08:00
*/
virtual void addBone(Bone *bone, const std::string& parentName);
2013-06-06 12:02:54 +08:00
/**
* Get a bone with the specified name
*
* @param name The bone's name you want to get
*/
virtual Bone *getBone(const std::string& name) const;
2013-06-06 12:02:54 +08:00
/**
* Change a bone's parent with the specified parent name.
*
* @param bone The bone you want to change parent
2013-09-13 18:07:37 +08:00
* @param parentName The new parent's name.
2013-06-06 12:02:54 +08:00
*/
virtual void changeBoneParent(Bone *bone, const std::string& parentName);
2013-06-06 12:02:54 +08:00
/**
* Remove a bone with the specified name. If recursion it will also remove child Bone recursionly.
2013-06-06 12:02:54 +08:00
*
* @param bone The bone you want to remove
2013-09-13 18:07:37 +08:00
* @param recursion Determine whether remove the bone's child recursion.
2013-06-06 12:02:54 +08:00
*/
virtual void removeBone(Bone *bone, bool recursion);
2013-06-06 12:02:54 +08:00
/**
* Get Armature's bone dictionary
* @return Armature's bone dictionary
2013-06-06 12:02:54 +08:00
*/
const cocos2d::Map<std::string, Bone*>& getBoneDic() const;
2013-06-06 12:02:54 +08:00
2013-09-13 18:07:37 +08:00
/**
* This boundingBox will calculate all bones' boundingBox every time
2013-06-06 12:02:54 +08:00
*/
2013-11-05 19:53:38 +08:00
virtual cocos2d::Rect getBoundingBox() const override;
2013-09-13 18:07:37 +08:00
2013-11-05 19:53:38 +08:00
Bone *getBoneAtPoint(float x, float y) const;
2013-09-13 18:07:37 +08:00
2013-09-16 14:13:55 +08:00
// overrides
/**
* @js NA
* @lua NA
*/
virtual void visit(cocos2d::Renderer *renderer, const cocos2d::Mat4 &parentTransform, uint32_t parentFlags) override;
virtual void draw(cocos2d::Renderer *renderer, const cocos2d::Mat4 &transform, uint32_t flags) override;
2013-09-16 14:13:55 +08:00
virtual void update(float dt) override;
2013-12-26 15:49:20 +08:00
virtual void onEnter() override;
virtual void onExit() override;
Squashed commit of the following: commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2
2014-05-15 01:07:09 +08:00
virtual const cocos2d::Mat4& getNodeToParentTransform() const override;
/**
* @js NA
* @lua NA
*/
inline void setBlendFunc(const cocos2d::BlendFunc &blendFunc) override { _blendFunc = blendFunc; }
/**
* @js NA
* @lua NA
*/
inline const cocos2d::BlendFunc &getBlendFunc() const override{ return _blendFunc; }
2015-06-17 13:16:06 +08:00
2013-06-06 12:02:54 +08:00
/**
2013-09-13 18:07:37 +08:00
* Set contentsize and Calculate anchor point.
*/
2013-09-13 18:07:37 +08:00
virtual void updateOffsetPoint();
Squashed commit of the following: commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2
2014-05-15 01:07:09 +08:00
virtual void setAnchorPoint(const cocos2d::Vec2& point) override;
virtual const cocos2d::Vec2& getAnchorPointInPoints() const override;
2014-09-24 15:14:47 +08:00
virtual const cocos2d::Vec2& getOffsetPoints() const;
2013-09-13 18:07:37 +08:00
virtual void setAnimation(ArmatureAnimation *animation);
2013-11-05 19:53:38 +08:00
virtual ArmatureAnimation *getAnimation() const;
2013-11-05 19:53:38 +08:00
virtual bool getArmatureTransformDirty() const;
2013-09-13 18:07:37 +08:00
2013-10-30 09:41:40 +08:00
#if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT
2013-11-01 14:36:44 +08:00
virtual void setColliderFilter(ColliderFilter *filter);
#elif ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX
CC_DEPRECATED_ATTRIBUTE virtual void drawContour();
#endif
2013-11-01 14:36:44 +08:00
2013-11-05 19:53:38 +08:00
virtual void setArmatureData(ArmatureData *armatureData) { _armatureData = armatureData; }
virtual ArmatureData *getArmatureData() const { return _armatureData; }
2013-11-05 19:53:38 +08:00
virtual void setParentBone(Bone *parentBone);
virtual Bone *getParentBone() const;
virtual void setVersion(float version) { _version = version; }
virtual float getVersion() const { return _version; }
2013-12-17 17:00:01 +08:00
virtual void setBatchNode(BatchNode *batchNode) { _batchNode = batchNode; }
virtual BatchNode *getBatchNode() const { return _batchNode; }
2013-09-13 18:07:37 +08:00
#if ENABLE_PHYSICS_BOX2D_DETECT
virtual b2Fixture *getShapeList();
/**
* @js NA
* @lua NA
*/
2013-11-05 19:53:38 +08:00
virtual void setBody(b2Body *body);
/**
* @js NA
* @lua NA
*/
2013-11-05 19:53:38 +08:00
virtual b2Body *getBody() const;
2013-09-13 18:07:37 +08:00
#elif ENABLE_PHYSICS_CHIPMUNK_DETECT
/**
* @js NA
* @lua NA
*/
2013-09-13 18:07:37 +08:00
virtual cpShape *getShapeList();
/**
* @js NA
* @lua NA
*/
2013-11-05 19:53:38 +08:00
virtual void setBody(cpBody *body);
/**
* @js NA
* @lua NA
*/
2013-11-05 19:53:38 +08:00
virtual cpBody *getBody() const;
2013-09-13 18:07:37 +08:00
#endif
2013-06-06 12:02:54 +08:00
protected:
2013-09-13 18:07:37 +08:00
2013-06-06 12:02:54 +08:00
/*
* Used to create Bone internal
* @js NA
* @lua NA
2013-06-06 12:02:54 +08:00
*/
Bone *createBone(const std::string& boneName );
2013-06-06 12:02:54 +08:00
protected:
2013-11-05 19:53:38 +08:00
ArmatureData *_armatureData;
2013-12-17 17:00:01 +08:00
2013-11-05 19:53:38 +08:00
BatchNode *_batchNode;
2013-12-17 17:00:01 +08:00
2013-11-05 19:53:38 +08:00
Bone *_parentBone;
float _version;
2013-09-15 20:24:25 +08:00
mutable bool _armatureTransformDirty;
cocos2d::Map<std::string, Bone*> _boneDic; //! The dictionary of the bones, include all bones in the armature, no matter it is the direct bone or the indirect bone. It is different from m_pChindren.
2013-09-13 18:07:37 +08:00
cocos2d::Vector<Bone*> _topBoneList;
2013-09-13 18:07:37 +08:00
cocos2d::BlendFunc _blendFunc; //! It's required for CCTextureProtocol inheritance
2013-06-06 12:02:54 +08:00
Squashed commit of the following: commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2
2014-05-15 01:07:09 +08:00
cocos2d::Vec2 _offsetPoint;
cocos2d::Vec2 _realAnchorPointInPoints;
2013-06-06 12:02:54 +08:00
2013-09-15 20:24:25 +08:00
ArmatureAnimation *_animation;
2013-06-06 12:02:54 +08:00
2013-09-13 18:07:37 +08:00
#if ENABLE_PHYSICS_BOX2D_DETECT
2013-11-05 19:53:38 +08:00
b2Body *_body;
2013-09-13 18:07:37 +08:00
#elif ENABLE_PHYSICS_CHIPMUNK_DETECT
2013-11-05 19:53:38 +08:00
cpBody *_body;
2013-09-13 18:07:37 +08:00
#endif
2013-06-06 12:02:54 +08:00
};
}
2013-06-06 12:02:54 +08:00
2013-06-07 10:52:32 +08:00
#endif /*__CCARMATURE_H__*/