axmol/extensions/cocostudio/CCDisplayManager.cpp

434 lines
12 KiB
C++
Raw Normal View History

2013-06-06 12:02:54 +08:00
/****************************************************************************
2019-11-24 23:15:56 +08:00
Copyright (c) 2013-2017 Chukong Technologies Inc.
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.
****************************************************************************/
#include "CCDisplayManager.h"
#include "CCBone.h"
#include "CCArmature.h"
#include "CCSkin.h"
2013-06-06 12:02:54 +08:00
#include "2d/CCParticleSystemQuad.h"
using namespace cocos2d;
2021-12-25 10:04:45 +08:00
namespace cocostudio
{
2013-06-06 12:02:54 +08:00
2021-12-25 10:04:45 +08:00
DisplayManager* DisplayManager::create(Bone* bone)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
DisplayManager* pDisplayManager = new DisplayManager();
2021-12-08 00:11:53 +08:00
if (pDisplayManager->init(bone))
2013-06-06 12:02:54 +08:00
{
pDisplayManager->autorelease();
return pDisplayManager;
}
CC_SAFE_DELETE(pDisplayManager);
return nullptr;
2013-06-06 12:02:54 +08:00
}
2013-06-07 10:52:32 +08:00
DisplayManager::DisplayManager()
2013-12-17 19:32:16 +08:00
: _displayRenderNode(nullptr)
2013-10-30 09:41:40 +08:00
, _displayType(CS_DISPLAY_MAX)
, _currentDecoDisplay(nullptr)
2013-09-15 20:24:25 +08:00
, _displayIndex(-1)
, _forceChangeDisplay(false)
, _visible(true)
, _bone(nullptr)
2021-12-25 10:04:45 +08:00
{}
2013-06-07 10:52:32 +08:00
DisplayManager::~DisplayManager()
2013-06-06 12:02:54 +08:00
{
2013-12-17 19:32:16 +08:00
_decoDisplayList.clear();
2013-06-07 10:52:32 +08:00
2021-12-25 10:04:45 +08:00
if (_displayRenderNode)
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
_displayRenderNode->removeFromParentAndCleanup(true);
2021-12-25 10:04:45 +08:00
if (_displayRenderNode->getReferenceCount() > 0)
2013-09-15 20:24:25 +08:00
CC_SAFE_RELEASE_NULL(_displayRenderNode);
2013-06-06 12:02:54 +08:00
}
}
2013-06-07 10:52:32 +08:00
2021-12-25 10:04:45 +08:00
bool DisplayManager::init(Bone* bone)
2013-06-06 12:02:54 +08:00
{
bool ret = false;
2013-06-07 10:52:32 +08:00
do
{
2013-09-15 20:24:25 +08:00
_bone = bone;
2013-06-07 10:52:32 +08:00
2013-06-06 12:02:54 +08:00
initDisplayList(bone->getBoneData());
2013-06-07 10:52:32 +08:00
2013-06-06 12:02:54 +08:00
ret = true;
2021-12-25 10:04:45 +08:00
} while (0);
2013-06-07 10:52:32 +08:00
2013-06-06 12:02:54 +08:00
return ret;
}
2021-12-25 10:04:45 +08:00
void DisplayManager::addDisplay(DisplayData* displayData, int index)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
DecorativeDisplay* decoDisplay = nullptr;
2013-06-07 10:52:32 +08:00
2021-12-25 10:04:45 +08:00
if ((index >= 0) && (index < _decoDisplayList.size()))
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
decoDisplay = (DecorativeDisplay*)_decoDisplayList.at(index);
2013-06-06 12:02:54 +08:00
}
else
{
decoDisplay = DecorativeDisplay::create();
2013-12-17 19:32:16 +08:00
_decoDisplayList.pushBack(decoDisplay);
2013-06-06 12:02:54 +08:00
}
2013-06-07 10:52:32 +08:00
2013-09-15 20:24:25 +08:00
DisplayFactory::addDisplay(_bone, decoDisplay, displayData);
2013-06-07 10:52:32 +08:00
2013-06-06 12:02:54 +08:00
//! if changed display index is current display index, then change current display to the new display
2021-12-25 10:04:45 +08:00
if (index == _displayIndex)
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
_displayIndex = -1;
2014-01-02 11:07:31 +08:00
changeDisplayWithIndex(index, false);
2013-06-06 12:02:54 +08:00
}
}
2021-12-25 10:04:45 +08:00
void DisplayManager::addDisplay(Node* display, int index)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
DecorativeDisplay* decoDisplay = nullptr;
2013-06-07 10:52:32 +08:00
2021-12-25 10:04:45 +08:00
if ((index >= 0) && (index < _decoDisplayList.size()))
2013-09-13 18:07:37 +08:00
{
2013-12-17 19:32:16 +08:00
decoDisplay = _decoDisplayList.at(index);
2013-09-13 18:07:37 +08:00
}
else
{
decoDisplay = DecorativeDisplay::create();
2013-12-17 19:32:16 +08:00
_decoDisplayList.pushBack(decoDisplay);
2013-09-13 18:07:37 +08:00
}
2021-12-25 10:04:45 +08:00
DisplayData* displayData = nullptr;
if (Skin* skin = dynamic_cast<Skin*>(display))
2013-09-13 18:07:37 +08:00
{
2013-09-15 20:24:25 +08:00
skin->setBone(_bone);
displayData = SpriteDisplayData::create();
2013-09-13 18:07:37 +08:00
2013-09-15 20:24:25 +08:00
DisplayFactory::initSpriteDisplay(_bone, decoDisplay, skin->getDisplayName().c_str(), skin);
2013-09-13 18:07:37 +08:00
2021-12-25 10:04:45 +08:00
if (SpriteDisplayData* spriteDisplayData = (SpriteDisplayData*)decoDisplay->getDisplayData())
2013-09-13 18:07:37 +08:00
{
skin->setSkinData(spriteDisplayData->skinData);
2021-12-25 10:04:45 +08:00
((SpriteDisplayData*)displayData)->skinData = spriteDisplayData->skinData;
2013-09-13 18:07:37 +08:00
}
else
{
bool find = false;
2021-12-25 10:04:45 +08:00
for (long i = _decoDisplayList.size() - 2; i >= 0; i--)
{
2021-12-25 10:04:45 +08:00
DecorativeDisplay* dd = _decoDisplayList.at(i);
SpriteDisplayData* sdd = static_cast<SpriteDisplayData*>(dd->getDisplayData());
2013-11-11 15:29:24 +08:00
if (sdd)
{
find = true;
2013-11-11 15:29:24 +08:00
skin->setSkinData(sdd->skinData);
static_cast<SpriteDisplayData*>(displayData)->skinData = sdd->skinData;
break;
}
}
if (!find)
{
BaseData baseData;
skin->setSkinData(baseData);
}
2013-09-13 18:07:37 +08:00
}
}
2021-12-25 10:04:45 +08:00
else if (dynamic_cast<ParticleSystemQuad*>(display))
2013-09-13 18:07:37 +08:00
{
displayData = ParticleDisplayData::create();
display->removeFromParent();
display->cleanup();
2021-12-25 10:04:45 +08:00
Armature* armature = _bone->getArmature();
if (armature)
{
display->setParent(armature);
}
2013-09-13 18:07:37 +08:00
}
2021-12-25 10:04:45 +08:00
else if (Armature* armature = dynamic_cast<Armature*>(display))
2013-09-13 18:07:37 +08:00
{
2021-12-25 10:04:45 +08:00
displayData = ArmatureDisplayData::create();
displayData->displayName = armature->getName();
2013-09-15 20:24:25 +08:00
armature->setParentBone(_bone);
2013-09-13 18:07:37 +08:00
}
else
{
displayData = DisplayData::create();
2013-09-13 18:07:37 +08:00
}
decoDisplay->setDisplay(display);
decoDisplay->setDisplayData(displayData);
//! if changed display index is current display index, then change current display to the new display
2021-12-25 10:04:45 +08:00
if (index == _displayIndex)
2013-09-13 18:07:37 +08:00
{
2013-09-15 20:24:25 +08:00
_displayIndex = -1;
2014-01-02 11:07:31 +08:00
changeDisplayWithIndex(index, false);
2013-09-13 18:07:37 +08:00
}
}
void DisplayManager::removeDisplay(int index)
2013-09-13 18:07:37 +08:00
{
2021-12-25 10:04:45 +08:00
if (index == _displayIndex)
2013-06-06 12:02:54 +08:00
{
setCurrentDecorativeDisplay(nullptr);
2013-10-30 09:41:40 +08:00
_displayIndex = -1;
2013-06-06 12:02:54 +08:00
}
2013-10-30 09:41:40 +08:00
2013-12-17 19:32:16 +08:00
_decoDisplayList.erase(index);
2013-06-06 12:02:54 +08:00
}
2013-06-07 10:52:32 +08:00
2013-12-17 19:32:16 +08:00
const cocos2d::Vector<DecorativeDisplay*>& DisplayManager::getDecorativeDisplayList() const
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
return _decoDisplayList;
2013-09-13 18:07:37 +08:00
}
2014-01-02 11:07:31 +08:00
void DisplayManager::changeDisplayWithIndex(int index, bool force)
2013-09-13 18:07:37 +08:00
{
2021-12-25 10:04:45 +08:00
CCASSERT(index < (int)_decoDisplayList.size(), "the _index value is out of range");
2013-06-07 10:52:32 +08:00
2013-09-15 20:24:25 +08:00
_forceChangeDisplay = force;
2013-06-07 10:52:32 +08:00
2013-06-06 12:02:54 +08:00
//! If index is equal to current display index,then do nothing
2021-12-25 10:04:45 +08:00
if (_displayIndex == index)
2013-06-07 10:52:32 +08:00
return;
2013-09-15 20:24:25 +08:00
_displayIndex = index;
2013-06-07 10:52:32 +08:00
2013-06-06 12:02:54 +08:00
//! If displayIndex < 0, it means you want to hide you display
2013-09-15 20:24:25 +08:00
if (_displayIndex < 0)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
if (_displayRenderNode)
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
_displayRenderNode->removeFromParentAndCleanup(true);
setCurrentDecorativeDisplay(nullptr);
2013-06-06 12:02:54 +08:00
}
return;
}
2021-12-25 10:04:45 +08:00
DecorativeDisplay* decoDisplay = (DecorativeDisplay*)_decoDisplayList.at(_displayIndex);
2013-06-06 12:02:54 +08:00
2013-06-07 10:52:32 +08:00
setCurrentDecorativeDisplay(decoDisplay);
2013-06-06 12:02:54 +08:00
}
2013-06-07 10:52:32 +08:00
2015-07-15 12:04:48 +08:00
void DisplayManager::changeDisplayWithName(const std::string& name, bool force)
{
2021-12-25 10:04:45 +08:00
for (int i = 0; i < _decoDisplayList.size(); i++)
{
2013-12-17 19:32:16 +08:00
if (_decoDisplayList.at(i)->getDisplayData()->displayName == name)
{
2014-01-02 11:07:31 +08:00
changeDisplayWithIndex(i, force);
break;
}
}
}
2021-12-25 10:04:45 +08:00
void DisplayManager::setCurrentDecorativeDisplay(DecorativeDisplay* decoDisplay)
2013-06-06 12:02:54 +08:00
{
#if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT || ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX
2013-09-15 20:24:25 +08:00
if (_currentDecoDisplay && _currentDecoDisplay->getColliderDetector())
2013-06-07 10:52:32 +08:00
{
2013-09-15 20:24:25 +08:00
_currentDecoDisplay->getColliderDetector()->setActive(false);
2013-06-07 10:52:32 +08:00
}
2013-06-06 12:02:54 +08:00
#endif
2013-09-15 20:24:25 +08:00
_currentDecoDisplay = decoDisplay;
2013-06-06 12:02:54 +08:00
#if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT || ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX
2013-09-15 20:24:25 +08:00
if (_currentDecoDisplay && _currentDecoDisplay->getColliderDetector())
2013-06-07 10:52:32 +08:00
{
2013-09-15 20:24:25 +08:00
_currentDecoDisplay->getColliderDetector()->setActive(true);
2013-06-07 10:52:32 +08:00
}
2013-06-06 12:02:54 +08:00
#endif
2021-12-25 10:04:45 +08:00
Node* displayRenderNode = _currentDecoDisplay == nullptr ? nullptr : _currentDecoDisplay->getDisplay();
2013-09-15 20:24:25 +08:00
if (_displayRenderNode)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
if (dynamic_cast<Armature*>(_displayRenderNode) != nullptr)
2013-06-07 10:52:32 +08:00
{
_bone->setChildArmature(nullptr);
2013-06-07 10:52:32 +08:00
}
2013-09-15 20:24:25 +08:00
_displayRenderNode->removeFromParentAndCleanup(true);
_displayRenderNode->release();
2013-06-06 12:02:54 +08:00
}
2013-06-07 10:52:32 +08:00
2013-09-15 20:24:25 +08:00
_displayRenderNode = displayRenderNode;
2013-06-06 12:02:54 +08:00
2021-12-25 10:04:45 +08:00
if (_displayRenderNode)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
if (Armature* armature = dynamic_cast<Armature*>(_displayRenderNode))
2013-09-13 18:07:37 +08:00
{
2013-09-15 20:24:25 +08:00
_bone->setChildArmature(armature);
armature->setParentBone(_bone);
2013-09-13 18:07:37 +08:00
}
2021-12-25 10:04:45 +08:00
else if (ParticleSystemQuad* particle = dynamic_cast<ParticleSystemQuad*>(_displayRenderNode))
2013-06-07 10:52:32 +08:00
{
2013-09-13 18:07:37 +08:00
particle->resetSystem();
2013-06-07 10:52:32 +08:00
}
2013-09-13 18:07:37 +08:00
_displayRenderNode->setColor(_bone->getDisplayedColor());
_displayRenderNode->setOpacity(_bone->getDisplayedOpacity());
2013-09-13 18:07:37 +08:00
2013-09-15 20:24:25 +08:00
_displayRenderNode->retain();
_displayRenderNode->setVisible(_visible);
2013-10-30 09:41:40 +08:00
_displayType = _currentDecoDisplay->getDisplayData()->displayType;
}
else
{
2021-12-25 10:04:45 +08:00
_displayType = CS_DISPLAY_MAX;
2013-06-06 12:02:54 +08:00
}
}
2013-06-07 10:52:32 +08:00
2021-12-25 10:04:45 +08:00
Node* DisplayManager::getDisplayRenderNode() const
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
return _displayRenderNode;
2013-06-06 12:02:54 +08:00
}
2013-06-07 10:52:32 +08:00
2013-11-05 19:53:38 +08:00
DisplayType DisplayManager::getDisplayRenderNodeType() const
2013-10-30 09:41:40 +08:00
{
return _displayType;
}
2013-11-05 19:53:38 +08:00
int DisplayManager::getCurrentDisplayIndex() const
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
return _displayIndex;
2013-06-06 12:02:54 +08:00
}
2021-12-25 10:04:45 +08:00
DecorativeDisplay* DisplayManager::getCurrentDecorativeDisplay() const
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
return _currentDecoDisplay;
2013-06-06 12:02:54 +08:00
}
2021-12-25 10:04:45 +08:00
DecorativeDisplay* DisplayManager::getDecorativeDisplayByIndex(int index) const
2013-06-06 12:02:54 +08:00
{
2013-12-17 19:32:16 +08:00
return _decoDisplayList.at(index);
2013-06-07 10:52:32 +08:00
}
2013-06-06 12:02:54 +08:00
2021-12-25 10:04:45 +08:00
void DisplayManager::initDisplayList(BoneData* boneData)
2013-06-06 12:02:54 +08:00
{
2013-12-17 19:32:16 +08:00
_decoDisplayList.clear();
2013-06-07 10:52:32 +08:00
CS_RETURN_IF(!boneData);
2021-12-25 10:04:45 +08:00
for (auto& object : boneData->displayDataList)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
DisplayData* displayData = static_cast<DisplayData*>(object);
2013-06-07 10:52:32 +08:00
2021-12-25 10:04:45 +08:00
DecorativeDisplay* decoDisplay = DecorativeDisplay::create();
2013-06-06 12:02:54 +08:00
decoDisplay->setDisplayData(displayData);
2013-06-07 10:52:32 +08:00
2013-09-15 20:24:25 +08:00
DisplayFactory::createDisplay(_bone, decoDisplay);
2013-06-06 12:02:54 +08:00
2013-12-17 19:32:16 +08:00
_decoDisplayList.pushBack(decoDisplay);
2013-06-06 12:02:54 +08:00
}
}
2013-06-07 10:52:32 +08:00
2021-12-25 10:04:45 +08:00
bool DisplayManager::containPoint(Vec2& point)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
if (!_visible || _displayIndex < 0)
2013-06-07 10:52:32 +08:00
{
return false;
}
2013-06-06 12:02:54 +08:00
bool ret = false;
2013-06-07 10:52:32 +08:00
2013-09-15 20:24:25 +08:00
switch (_currentDecoDisplay->getDisplayData()->displayType)
2013-06-06 12:02:54 +08:00
{
2013-06-07 10:52:32 +08:00
case CS_DISPLAY_SPRITE:
{
/*
* First we first check if the point is in the sprite content rect. If false, then we continue to check
* the contour point. If this step is also false, then we can say the bone not contain this point.
*
*/
2021-12-25 10:04:45 +08:00
Sprite* sprite = (Sprite*)_currentDecoDisplay->getDisplay();
Sprite* child = (Sprite*)sprite->getChildByTag(0);
if (nullptr != child)
sprite = child;
2013-06-07 10:52:32 +08:00
if (nullptr != sprite)
2021-07-15 17:01:57 +08:00
ret = sprite->hitTest(point);
2013-06-07 10:52:32 +08:00
}
break;
default:
break;
2013-06-06 12:02:54 +08:00
}
return ret;
}
bool DisplayManager::containPoint(float x, float y)
2013-06-06 12:02:54 +08:00
{
Vec2 p(x, y);
2013-06-06 12:02:54 +08:00
return containPoint(p);
}
void DisplayManager::setVisible(bool visible)
2013-06-06 12:02:54 +08:00
{
2021-12-25 10:04:45 +08:00
if (!_displayRenderNode)
2013-06-07 10:52:32 +08:00
return;
2013-06-06 12:02:54 +08:00
2013-09-15 20:24:25 +08:00
_visible = visible;
_displayRenderNode->setVisible(visible);
2013-06-06 12:02:54 +08:00
}
2013-11-05 19:53:38 +08:00
bool DisplayManager::isVisible() const
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
return _visible;
2013-06-06 12:02:54 +08:00
}
2013-11-05 19:53:38 +08:00
Size DisplayManager::getContentSize() const
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
CS_RETURN_IF(!_displayRenderNode) Size(0, 0);
return _displayRenderNode->getContentSize();
2013-06-06 12:02:54 +08:00
}
2013-11-05 19:53:38 +08:00
Rect DisplayManager::getBoundingBox() const
2013-06-06 12:02:54 +08:00
{
2013-09-15 20:24:25 +08:00
CS_RETURN_IF(!_displayRenderNode) Rect(0, 0, 0, 0);
return _displayRenderNode->getBoundingBox();
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
Vec2 DisplayManager::getAnchorPoint() const
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
CS_RETURN_IF(!_displayRenderNode) Vec2(0, 0);
2013-09-15 20:24:25 +08:00
return _displayRenderNode->getAnchorPoint();
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
Vec2 DisplayManager::getAnchorPointInPoints() const
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
CS_RETURN_IF(!_displayRenderNode) Vec2(0, 0);
2013-09-15 20:24:25 +08:00
return _displayRenderNode->getAnchorPointInPoints();
2013-06-06 12:02:54 +08:00
}
2021-12-25 10:04:45 +08:00
} // namespace cocostudio