2014-03-11 17:13: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.
|
2014-03-11 17:13: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 "ui/UILayout.h"
|
|
|
|
#include "ui/UIHelper.h"
|
2014-07-29 14:57:45 +08:00
|
|
|
#include "ui/UIScale9Sprite.h"
|
2015-06-13 06:03:48 +08:00
|
|
|
#include "renderer/CCRenderState.h"
|
2014-04-30 08:37:36 +08:00
|
|
|
#include "base/CCDirector.h"
|
|
|
|
#include "renderer/CCRenderer.h"
|
2014-05-28 10:17:34 +08:00
|
|
|
#include "ui/UILayoutManager.h"
|
2014-06-04 14:26:21 +08:00
|
|
|
#include "2d/CCDrawNode.h"
|
|
|
|
#include "2d/CCLayer.h"
|
|
|
|
#include "2d/CCSprite.h"
|
|
|
|
#include "base/CCEventFocus.h"
|
2017-03-16 13:54:50 +08:00
|
|
|
#include "base/CCStencilStateManager.h"
|
2015-12-04 10:43:39 +08:00
|
|
|
#include "editor-support/cocostudio/CocosStudioExtension.h"
|
2014-06-04 14:26:21 +08:00
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
|
|
|
|
NS_CC_BEGIN
|
|
|
|
|
|
|
|
namespace ui {
|
|
|
|
|
|
|
|
static const int BACKGROUNDIMAGE_Z = (-1);
|
|
|
|
static const int BCAKGROUNDCOLORRENDERER_Z = (-2);
|
|
|
|
|
|
|
|
IMPLEMENT_CLASS_GUI_INFO(Layout)
|
|
|
|
|
|
|
|
Layout::Layout():
|
|
|
|
_backGroundScale9Enabled(false),
|
|
|
|
_backGroundImage(nullptr),
|
|
|
|
_backGroundImageFileName(""),
|
|
|
|
_backGroundImageCapInsets(Rect::ZERO),
|
2014-05-09 17:05:36 +08:00
|
|
|
_colorType(BackGroundColorType::NONE),
|
2014-05-09 14:56:05 +08:00
|
|
|
_bgImageTexType(TextureResType::LOCAL),
|
2014-10-30 22:25:46 +08:00
|
|
|
_backGroundImageTextureSize(Size::ZERO),
|
|
|
|
_backGroundImageColor(Color3B::WHITE),
|
|
|
|
_backGroundImageOpacity(255),
|
2014-03-11 17:13:54 +08:00
|
|
|
_colorRender(nullptr),
|
|
|
|
_gradientRender(nullptr),
|
|
|
|
_cColor(Color3B::WHITE),
|
|
|
|
_gStartColor(Color3B::WHITE),
|
|
|
|
_gEndColor(Color3B::WHITE),
|
2014-05-15 01:07:09 +08:00
|
|
|
_alongVector(Vec2(0.0f, -1.0f)),
|
2014-03-11 17:13:54 +08:00
|
|
|
_cOpacity(255),
|
2014-10-30 22:25:46 +08:00
|
|
|
_clippingEnabled(false),
|
2014-05-12 18:00:54 +08:00
|
|
|
_layoutType(Type::ABSOLUTE),
|
2014-05-09 16:31:22 +08:00
|
|
|
_clippingType(ClippingType::STENCIL),
|
2014-03-11 17:13:54 +08:00
|
|
|
_clippingStencil(nullptr),
|
|
|
|
_clippingRect(Rect::ZERO),
|
|
|
|
_clippingParent(nullptr),
|
|
|
|
_clippingRectDirty(true),
|
2017-02-06 15:13:20 +08:00
|
|
|
_stencilStateManager(new StencilStateManager()),
|
2014-10-30 22:25:46 +08:00
|
|
|
_doLayoutDirty(true),
|
|
|
|
_isInterceptTouch(false),
|
2014-05-26 22:57:50 +08:00
|
|
|
_loopFocus(false),
|
2014-10-30 22:25:46 +08:00
|
|
|
_passFocusToChild(true),
|
|
|
|
_isFocusPassing(false)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-06-06 16:48:49 +08:00
|
|
|
//no-op
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
Layout::~Layout()
|
|
|
|
{
|
|
|
|
CC_SAFE_RELEASE(_clippingStencil);
|
2017-02-06 15:13:20 +08:00
|
|
|
CC_SAFE_DELETE(_stencilStateManager);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::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
|
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
Widget::onEnter();
|
|
|
|
if (_clippingStencil)
|
|
|
|
{
|
|
|
|
_clippingStencil->onEnter();
|
|
|
|
}
|
|
|
|
_doLayoutDirty = true;
|
|
|
|
_clippingRectDirty = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::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
|
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
Widget::onExit();
|
|
|
|
if (_clippingStencil)
|
|
|
|
{
|
|
|
|
_clippingStencil->onExit();
|
|
|
|
}
|
|
|
|
}
|
2017-01-04 11:06:44 +08:00
|
|
|
|
|
|
|
void Layout::setGlobalZOrder(float globalZOrder)
|
|
|
|
{
|
|
|
|
// _protectedChildren's global z order is set in ProtectedNode::setGlobalZOrder()
|
|
|
|
|
|
|
|
Widget::setGlobalZOrder(globalZOrder);
|
|
|
|
if (_clippingStencil)
|
|
|
|
_clippingStencil->setGlobalZOrder(globalZOrder);
|
|
|
|
|
|
|
|
for (auto &child : _children)
|
|
|
|
child->setGlobalZOrder(globalZOrder);
|
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
|
|
|
|
Layout* Layout::create()
|
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
Layout* layout = new (std::nothrow) Layout();
|
2014-03-11 17:13:54 +08:00
|
|
|
if (layout && layout->init())
|
|
|
|
{
|
|
|
|
layout->autorelease();
|
|
|
|
return layout;
|
|
|
|
}
|
|
|
|
CC_SAFE_DELETE(layout);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Layout::init()
|
|
|
|
{
|
2014-05-23 10:59:18 +08:00
|
|
|
if (Widget::init())
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
ignoreContentAdaptWithSize(false);
|
2014-06-20 14:03:33 +08:00
|
|
|
setContentSize(Size::ZERO);
|
2014-05-15 01:07:09 +08:00
|
|
|
setAnchorPoint(Vec2::ZERO);
|
2014-06-06 16:48:49 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findNearestChildWidgetIndex, this);
|
2014-03-11 17:13:54 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
2014-06-25 16:17:16 +08:00
|
|
|
|
|
|
|
void Layout::addChild(Node* child)
|
|
|
|
{
|
|
|
|
Layout::addChild(child, child->getLocalZOrder(), child->getTag());
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::addChild(Node * child, int localZOrder)
|
|
|
|
{
|
|
|
|
Layout::addChild(child, localZOrder, child->getTag());
|
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
|
|
|
|
void Layout::addChild(Node *child, int zOrder, int tag)
|
|
|
|
{
|
2014-05-22 17:49:19 +08:00
|
|
|
if (dynamic_cast<Widget*>(child)) {
|
|
|
|
supplyTheLayoutParameterLackToChild(static_cast<Widget*>(child));
|
|
|
|
}
|
2017-01-04 11:06:44 +08:00
|
|
|
child->setGlobalZOrder(_globalZOrder);
|
2014-03-11 17:13:54 +08:00
|
|
|
Widget::addChild(child, zOrder, tag);
|
|
|
|
_doLayoutDirty = true;
|
|
|
|
}
|
|
|
|
|
2014-06-25 11:27:48 +08:00
|
|
|
void Layout::addChild(Node* child, int zOrder, const std::string &name)
|
|
|
|
{
|
|
|
|
if (dynamic_cast<Widget*>(child)) {
|
|
|
|
supplyTheLayoutParameterLackToChild(static_cast<Widget*>(child));
|
|
|
|
}
|
2017-01-04 11:06:44 +08:00
|
|
|
child->setGlobalZOrder(_globalZOrder);
|
2014-06-25 11:27:48 +08:00
|
|
|
Widget::addChild(child, zOrder, name);
|
|
|
|
_doLayoutDirty = true;
|
|
|
|
}
|
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
void Layout::removeChild(Node *child, bool cleanup)
|
|
|
|
{
|
|
|
|
Widget::removeChild(child, cleanup);
|
|
|
|
_doLayoutDirty = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::removeAllChildren()
|
|
|
|
{
|
|
|
|
Widget::removeAllChildren();
|
2014-05-21 15:16:41 +08:00
|
|
|
_doLayoutDirty = true;
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::removeAllChildrenWithCleanup(bool cleanup)
|
|
|
|
{
|
|
|
|
Widget::removeAllChildrenWithCleanup(cleanup);
|
|
|
|
_doLayoutDirty = true;
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
bool Layout::isClippingEnabled()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _clippingEnabled;
|
|
|
|
}
|
2014-04-17 14:08:25 +08:00
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
void Layout::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-05-21 15:21:55 +08:00
|
|
|
if (!_visible)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2014-06-03 18:31:14 +08:00
|
|
|
|
2014-04-17 14:08:25 +08:00
|
|
|
adaptRenderers();
|
2014-06-06 16:48:49 +08:00
|
|
|
doLayout();
|
2014-06-03 18:31:14 +08:00
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
if (_clippingEnabled)
|
|
|
|
{
|
|
|
|
switch (_clippingType)
|
|
|
|
{
|
2014-05-09 16:31:22 +08:00
|
|
|
case ClippingType::STENCIL:
|
2014-05-31 07:42:05 +08:00
|
|
|
stencilClippingVisit(renderer, parentTransform, parentFlags);
|
2014-03-11 17:13:54 +08:00
|
|
|
break;
|
2014-05-09 16:31:22 +08:00
|
|
|
case ClippingType::SCISSOR:
|
2014-05-31 07:42:05 +08:00
|
|
|
scissorClippingVisit(renderer, parentTransform, parentFlags);
|
2014-03-11 17:13:54 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-06-06 16:48:49 +08:00
|
|
|
Widget::visit(renderer, parentTransform, parentFlags);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-05 00:19:22 +08:00
|
|
|
void Layout::stencilClippingVisit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
if(!_visible)
|
|
|
|
return;
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
uint32_t flags = processParentFlags(parentTransform, parentFlags);
|
2014-03-11 17:13:54 +08:00
|
|
|
|
|
|
|
// IMPORTANT:
|
2014-05-15 01:07:09 +08:00
|
|
|
// To ease the migration to v3.0, we still support the Mat4 stack,
|
2014-03-11 17:13:54 +08:00
|
|
|
// but it is deprecated and your code should not rely on it
|
2014-04-03 14:55:55 +08:00
|
|
|
Director* director = Director::getInstance();
|
2015-10-09 16:59:11 +08:00
|
|
|
CCASSERT(nullptr != director, "Director is null when setting matrix stack");
|
2014-04-03 14:55:55 +08:00
|
|
|
director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
|
|
|
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
|
2014-03-11 17:13:54 +08:00
|
|
|
//Add group command
|
|
|
|
|
|
|
|
_groupCommand.init(_globalZOrder);
|
|
|
|
renderer->addCommand(&_groupCommand);
|
|
|
|
|
|
|
|
renderer->pushGroup(_groupCommand.getRenderQueueID());
|
|
|
|
|
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
|
|
|
// _beforeVisitCmdStencil.init(_globalZOrder);
|
|
|
|
// _beforeVisitCmdStencil.func = CC_CALLBACK_0(StencilStateManager::onBeforeVisit, _stencilStateManager);
|
|
|
|
// renderer->addCommand(&_beforeVisitCmdStencil);
|
|
|
|
_stencilStateManager->onBeforeVisit(_globalZOrder);
|
2014-03-11 17:13:54 +08:00
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
_clippingStencil->visit(renderer, _modelViewTransform, flags);
|
2014-03-11 17:13:54 +08:00
|
|
|
|
|
|
|
_afterDrawStencilCmd.init(_globalZOrder);
|
2017-02-06 15:13:20 +08:00
|
|
|
_afterDrawStencilCmd.func = CC_CALLBACK_0(StencilStateManager::onAfterDrawStencil, _stencilStateManager);
|
2014-03-11 17:13:54 +08:00
|
|
|
renderer->addCommand(&_afterDrawStencilCmd);
|
|
|
|
|
2014-03-24 15:25:44 +08:00
|
|
|
int i = 0; // used by _children
|
|
|
|
int j = 0; // used by _protectedChildren
|
2014-03-11 17:13:54 +08:00
|
|
|
|
2014-03-24 15:25:44 +08:00
|
|
|
sortAllChildren();
|
|
|
|
sortAllProtectedChildren();
|
|
|
|
|
|
|
|
//
|
|
|
|
// draw children and protectedChildren zOrder < 0
|
|
|
|
//
|
2016-10-27 15:10:24 +08:00
|
|
|
for(auto size = _children.size(); i < size; i++)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-03-24 15:25:44 +08:00
|
|
|
auto node = _children.at(i);
|
2014-03-11 17:13:54 +08:00
|
|
|
|
2016-10-27 15:10:24 +08:00
|
|
|
if (node && node->getLocalZOrder() < 0)
|
2014-05-31 07:42:05 +08:00
|
|
|
node->visit(renderer, _modelViewTransform, flags);
|
2014-03-24 15:25:44 +08:00
|
|
|
else
|
|
|
|
break;
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
2014-03-24 15:25:44 +08:00
|
|
|
|
2016-10-27 15:10:24 +08:00
|
|
|
for(auto size = _protectedChildren.size(); j < size; j++)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-03-24 15:25:44 +08:00
|
|
|
auto node = _protectedChildren.at(j);
|
|
|
|
|
2016-10-27 15:10:24 +08:00
|
|
|
if (node && node->getLocalZOrder() < 0)
|
2014-05-31 07:42:05 +08:00
|
|
|
node->visit(renderer, _modelViewTransform, flags);
|
2014-03-24 15:25:44 +08:00
|
|
|
else
|
|
|
|
break;
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
2014-03-24 15:25:44 +08:00
|
|
|
//
|
|
|
|
// draw self
|
|
|
|
//
|
2014-05-31 07:42:05 +08:00
|
|
|
this->draw(renderer, _modelViewTransform, flags);
|
2014-03-24 15:25:44 +08:00
|
|
|
|
|
|
|
//
|
|
|
|
// draw children and protectedChildren zOrder >= 0
|
|
|
|
//
|
2016-10-27 15:10:24 +08:00
|
|
|
for(auto it=_protectedChildren.cbegin()+j, itCend = _protectedChildren.cend(); it != itCend; ++it)
|
2014-05-31 07:42:05 +08:00
|
|
|
(*it)->visit(renderer, _modelViewTransform, flags);
|
2014-03-24 15:25:44 +08:00
|
|
|
|
2016-10-27 15:10:24 +08:00
|
|
|
for(auto it=_children.cbegin()+i, itCend = _children.cend(); it != itCend; ++it)
|
2014-05-31 07:42:05 +08:00
|
|
|
(*it)->visit(renderer, _modelViewTransform, flags);
|
2014-03-24 15:25:44 +08:00
|
|
|
|
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
_afterVisitCmdStencil.init(_globalZOrder);
|
2017-02-06 15:13:20 +08:00
|
|
|
_afterVisitCmdStencil.func = CC_CALLBACK_0(StencilStateManager::onAfterVisit, _stencilStateManager);
|
2014-03-11 17:13:54 +08:00
|
|
|
renderer->addCommand(&_afterVisitCmdStencil);
|
|
|
|
|
|
|
|
renderer->popGroup();
|
|
|
|
|
2014-04-03 14:55:55 +08:00
|
|
|
director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::onBeforeVisitScissor()
|
|
|
|
{
|
|
|
|
auto glview = Director::getInstance()->getOpenGLView();
|
2015-07-29 18:43:11 +08:00
|
|
|
// apply scissor test
|
|
|
|
_scissorOldState = glview->isScissorEnabled();
|
|
|
|
if (false == _scissorOldState)
|
|
|
|
{
|
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
|
|
|
auto renderer = Director::getInstance()->getRenderer();
|
|
|
|
renderer->setScissorTest(true);
|
2015-07-29 18:43:11 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// apply scissor box
|
|
|
|
Rect clippingRect = getClippingRect();
|
|
|
|
_clippingOldRect = glview->getScissorRect();
|
|
|
|
if (false == _clippingOldRect.equals(clippingRect))
|
|
|
|
{
|
|
|
|
glview->setScissorInPoints(clippingRect.origin.x,
|
|
|
|
clippingRect.origin.y,
|
|
|
|
clippingRect.size.width,
|
|
|
|
clippingRect.size.height);
|
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::onAfterVisitScissor()
|
|
|
|
{
|
2015-07-29 18:43:11 +08:00
|
|
|
if (_scissorOldState)
|
|
|
|
{
|
|
|
|
// revert scissor box
|
|
|
|
if (false == _clippingOldRect.equals(_clippingRect))
|
|
|
|
{
|
|
|
|
auto glview = Director::getInstance()->getOpenGLView();
|
|
|
|
glview->setScissorInPoints(_clippingOldRect.origin.x,
|
|
|
|
_clippingOldRect.origin.y,
|
|
|
|
_clippingOldRect.size.width,
|
|
|
|
_clippingOldRect.size.height);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// revert scissor test
|
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
|
|
|
auto renderer = Director::getInstance()->getRenderer();
|
|
|
|
renderer->setScissorTest(false);
|
2015-07-29 18:43:11 +08:00
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
void Layout::scissorClippingVisit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2015-07-29 18:43:11 +08:00
|
|
|
if (parentFlags & FLAGS_DIRTY_MASK)
|
|
|
|
{
|
|
|
|
_clippingRectDirty = true;
|
|
|
|
}
|
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
|
|
|
|
|
|
|
Director* director = Director::getInstance();
|
|
|
|
CCASSERT(nullptr != director, "Director is null when setting matrix stack");
|
|
|
|
director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
|
|
|
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
|
|
|
|
|
|
|
|
_groupCommand.init(_globalZOrder);
|
|
|
|
renderer->addCommand(&_groupCommand);
|
|
|
|
renderer->pushGroup(_groupCommand.getRenderQueueID());
|
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
_beforeVisitCmdScissor.init(_globalZOrder);
|
|
|
|
_beforeVisitCmdScissor.func = CC_CALLBACK_0(Layout::onBeforeVisitScissor, this);
|
|
|
|
renderer->addCommand(&_beforeVisitCmdScissor);
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
ProtectedNode::visit(renderer, parentTransform, parentFlags);
|
2014-03-11 17:13:54 +08:00
|
|
|
|
|
|
|
_afterVisitCmdScissor.init(_globalZOrder);
|
|
|
|
_afterVisitCmdScissor.func = CC_CALLBACK_0(Layout::onAfterVisitScissor, this);
|
|
|
|
renderer->addCommand(&_afterVisitCmdScissor);
|
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
|
|
|
|
|
|
|
renderer->popGroup();
|
|
|
|
director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::setClippingEnabled(bool able)
|
|
|
|
{
|
|
|
|
if (able == _clippingEnabled)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
_clippingEnabled = able;
|
|
|
|
switch (_clippingType)
|
|
|
|
{
|
2014-05-09 16:31:22 +08:00
|
|
|
case ClippingType::STENCIL:
|
2014-03-11 17:13:54 +08:00
|
|
|
if (able)
|
|
|
|
{
|
|
|
|
_clippingStencil = DrawNode::create();
|
2017-01-04 11:06:44 +08:00
|
|
|
_clippingStencil->setGlobalZOrder(_globalZOrder);
|
2014-03-11 17:13:54 +08:00
|
|
|
if (_running)
|
|
|
|
{
|
|
|
|
_clippingStencil->onEnter();
|
|
|
|
}
|
|
|
|
_clippingStencil->retain();
|
2014-06-20 10:40:16 +08:00
|
|
|
setStencilClippingSize(_contentSize);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (_running)
|
|
|
|
{
|
|
|
|
_clippingStencil->onExit();
|
|
|
|
}
|
|
|
|
_clippingStencil->release();
|
|
|
|
_clippingStencil = nullptr;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-09 16:31:22 +08:00
|
|
|
void Layout::setClippingType(ClippingType type)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
if (type == _clippingType)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
bool clippingEnabled = isClippingEnabled();
|
|
|
|
setClippingEnabled(false);
|
|
|
|
_clippingType = type;
|
|
|
|
setClippingEnabled(clippingEnabled);
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
Layout::ClippingType Layout::getClippingType()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _clippingType;
|
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
void Layout::setStencilClippingSize(const Size& /*size*/)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-05-09 16:31:22 +08:00
|
|
|
if (_clippingEnabled && _clippingType == ClippingType::STENCIL)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 rect[4];
|
2015-04-20 01:40:52 +08:00
|
|
|
// rect[0].setZero(); Zero default
|
|
|
|
rect[1].set(_contentSize.width, 0.0f);
|
|
|
|
rect[2].set(_contentSize.width, _contentSize.height);
|
|
|
|
rect[3].set(0.0f, _contentSize.height);
|
|
|
|
Color4F green(0.0f, 1.0f, 0.0f, 1.0f);
|
2014-03-11 17:13:54 +08:00
|
|
|
_clippingStencil->clear();
|
|
|
|
_clippingStencil->drawPolygon(rect, 4, green, 0, green);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:19:05 +08:00
|
|
|
const Rect& Layout::getClippingRect()
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
if (_clippingRectDirty)
|
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 worldPos = convertToWorldSpace(Vec2::ZERO);
|
2014-03-11 17:13:54 +08:00
|
|
|
AffineTransform t = getNodeToWorldAffineTransform();
|
2014-06-20 10:40:16 +08:00
|
|
|
float scissorWidth = _contentSize.width*t.a;
|
|
|
|
float scissorHeight = _contentSize.height*t.d;
|
2014-03-11 17:13:54 +08:00
|
|
|
Rect parentClippingRect;
|
|
|
|
Layout* parent = this;
|
2014-04-09 20:41:09 +08:00
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
while (parent)
|
|
|
|
{
|
|
|
|
parent = dynamic_cast<Layout*>(parent->getParent());
|
|
|
|
if(parent)
|
|
|
|
{
|
|
|
|
if (parent->isClippingEnabled())
|
|
|
|
{
|
2014-04-09 20:41:09 +08:00
|
|
|
_clippingParent = parent;
|
|
|
|
break;
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_clippingParent)
|
|
|
|
{
|
|
|
|
parentClippingRect = _clippingParent->getClippingRect();
|
|
|
|
float finalX = worldPos.x - (scissorWidth * _anchorPoint.x);
|
|
|
|
float finalY = worldPos.y - (scissorHeight * _anchorPoint.y);
|
|
|
|
float finalWidth = scissorWidth;
|
|
|
|
float finalHeight = scissorHeight;
|
|
|
|
|
|
|
|
float leftOffset = worldPos.x - parentClippingRect.origin.x;
|
|
|
|
if (leftOffset < 0.0f)
|
|
|
|
{
|
|
|
|
finalX = parentClippingRect.origin.x;
|
|
|
|
finalWidth += leftOffset;
|
|
|
|
}
|
|
|
|
float rightOffset = (worldPos.x + scissorWidth) - (parentClippingRect.origin.x + parentClippingRect.size.width);
|
|
|
|
if (rightOffset > 0.0f)
|
|
|
|
{
|
|
|
|
finalWidth -= rightOffset;
|
|
|
|
}
|
|
|
|
float topOffset = (worldPos.y + scissorHeight) - (parentClippingRect.origin.y + parentClippingRect.size.height);
|
|
|
|
if (topOffset > 0.0f)
|
|
|
|
{
|
|
|
|
finalHeight -= topOffset;
|
|
|
|
}
|
|
|
|
float bottomOffset = worldPos.y - parentClippingRect.origin.y;
|
|
|
|
if (bottomOffset < 0.0f)
|
|
|
|
{
|
2016-04-15 20:45:21 +08:00
|
|
|
finalY = parentClippingRect.origin.y;
|
2014-03-11 17:13:54 +08:00
|
|
|
finalHeight += bottomOffset;
|
|
|
|
}
|
|
|
|
if (finalWidth < 0.0f)
|
|
|
|
{
|
|
|
|
finalWidth = 0.0f;
|
|
|
|
}
|
|
|
|
if (finalHeight < 0.0f)
|
|
|
|
{
|
|
|
|
finalHeight = 0.0f;
|
|
|
|
}
|
|
|
|
_clippingRect.origin.x = finalX;
|
|
|
|
_clippingRect.origin.y = finalY;
|
|
|
|
_clippingRect.size.width = finalWidth;
|
|
|
|
_clippingRect.size.height = finalHeight;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_clippingRect.origin.x = worldPos.x - (scissorWidth * _anchorPoint.x);
|
|
|
|
_clippingRect.origin.y = worldPos.y - (scissorHeight * _anchorPoint.y);
|
|
|
|
_clippingRect.size.width = scissorWidth;
|
|
|
|
_clippingRect.size.height = scissorHeight;
|
|
|
|
}
|
|
|
|
_clippingRectDirty = false;
|
|
|
|
}
|
|
|
|
return _clippingRect;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::onSizeChanged()
|
|
|
|
{
|
|
|
|
Widget::onSizeChanged();
|
2014-06-20 10:40:16 +08:00
|
|
|
setStencilClippingSize(_contentSize);
|
2014-03-11 17:13:54 +08:00
|
|
|
_doLayoutDirty = true;
|
|
|
|
_clippingRectDirty = true;
|
|
|
|
if (_backGroundImage)
|
|
|
|
{
|
2014-08-28 11:41:18 +08:00
|
|
|
_backGroundImage->setPosition(_contentSize.width/2.0f, _contentSize.height/2.0f);
|
2015-12-25 14:11:56 +08:00
|
|
|
if (_backGroundScale9Enabled){
|
2014-07-30 16:33:37 +08:00
|
|
|
_backGroundImage->setPreferredSize(_contentSize);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
2015-12-25 14:11:56 +08:00
|
|
|
else{
|
|
|
|
_backGroundImage->setPreferredSize(_backGroundImageTextureSize);
|
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
if (_colorRender)
|
|
|
|
{
|
2014-06-20 10:40:16 +08:00
|
|
|
_colorRender->setContentSize(_contentSize);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
if (_gradientRender)
|
|
|
|
{
|
2014-06-20 10:40:16 +08:00
|
|
|
_gradientRender->setContentSize(_contentSize);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::setBackGroundImageScale9Enabled(bool able)
|
|
|
|
{
|
|
|
|
if (_backGroundScale9Enabled == able)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
_backGroundScale9Enabled = able;
|
2014-07-30 16:33:37 +08:00
|
|
|
if (nullptr == _backGroundImage)
|
|
|
|
{
|
|
|
|
addBackGroundImage();
|
|
|
|
setBackGroundImage(_backGroundImageFileName,_bgImageTexType);
|
|
|
|
}
|
2015-12-09 14:38:53 +08:00
|
|
|
if(_backGroundScale9Enabled){
|
|
|
|
_backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SLICE);
|
2015-12-25 14:11:56 +08:00
|
|
|
_backGroundImage->setPreferredSize(_contentSize);
|
2015-12-09 14:38:53 +08:00
|
|
|
}else{
|
|
|
|
_backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SIMPLE);
|
2015-12-25 14:11:56 +08:00
|
|
|
_backGroundImage->setPreferredSize(_backGroundImageTextureSize);
|
2015-10-06 21:14:47 +08:00
|
|
|
}
|
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
setBackGroundImageCapInsets(_backGroundImageCapInsets);
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
bool Layout::isBackGroundImageScale9Enabled()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _backGroundScale9Enabled;
|
|
|
|
}
|
|
|
|
|
2014-04-03 11:14:35 +08:00
|
|
|
void Layout::setBackGroundImage(const std::string& fileName,TextureResType texType)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-04-03 11:14:35 +08:00
|
|
|
if (fileName.empty())
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (_backGroundImage == nullptr)
|
|
|
|
{
|
|
|
|
addBackGroundImage();
|
2015-12-09 14:38:53 +08:00
|
|
|
if(_backGroundScale9Enabled){
|
|
|
|
_backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SLICE);
|
|
|
|
}else{
|
|
|
|
_backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SIMPLE);
|
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
_backGroundImageFileName = fileName;
|
|
|
|
_bgImageTexType = texType;
|
2014-07-30 16:33:37 +08:00
|
|
|
|
|
|
|
switch (_bgImageTexType)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-07-30 16:33:37 +08:00
|
|
|
case TextureResType::LOCAL:
|
|
|
|
_backGroundImage->initWithFile(fileName);
|
|
|
|
break;
|
|
|
|
case TextureResType::PLIST:
|
|
|
|
_backGroundImage->initWithSpriteFrameName(fileName);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
2014-07-30 16:33:37 +08:00
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
_backGroundImageTextureSize = _backGroundImage->getContentSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_backGroundImage->setPosition(_contentSize.width/2.0f, _contentSize.height/2.0f);
|
2015-12-25 14:11:56 +08:00
|
|
|
if (_backGroundScale9Enabled) {
|
|
|
|
_backGroundImage->setPreferredSize(_contentSize);
|
|
|
|
}
|
|
|
|
else{
|
|
|
|
_backGroundImage->setPreferredSize(_backGroundImageTextureSize);
|
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
updateBackGroundImageRGBA();
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::setBackGroundImageCapInsets(const Rect &capInsets)
|
|
|
|
{
|
|
|
|
_backGroundImageCapInsets = capInsets;
|
|
|
|
if (_backGroundScale9Enabled && _backGroundImage)
|
|
|
|
{
|
2014-07-30 16:33:37 +08:00
|
|
|
_backGroundImage->setCapInsets(capInsets);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
const Rect& Layout::getBackGroundImageCapInsets()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _backGroundImageCapInsets;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::supplyTheLayoutParameterLackToChild(Widget *child)
|
|
|
|
{
|
|
|
|
if (!child)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
switch (_layoutType)
|
|
|
|
{
|
2014-05-12 18:00:54 +08:00
|
|
|
case Type::ABSOLUTE:
|
2014-03-11 17:13:54 +08:00
|
|
|
break;
|
2014-05-12 18:00:54 +08:00
|
|
|
case Type::HORIZONTAL:
|
|
|
|
case Type::VERTICAL:
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-05-16 10:33:28 +08:00
|
|
|
LinearLayoutParameter* layoutParameter = dynamic_cast<LinearLayoutParameter*>(child->getLayoutParameter());
|
2014-03-11 17:13:54 +08:00
|
|
|
if (!layoutParameter)
|
|
|
|
{
|
|
|
|
child->setLayoutParameter(LinearLayoutParameter::create());
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-05-12 18:00:54 +08:00
|
|
|
case Type::RELATIVE:
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-05-16 10:33:28 +08:00
|
|
|
RelativeLayoutParameter* layoutParameter = dynamic_cast<RelativeLayoutParameter*>(child->getLayoutParameter());
|
2014-03-11 17:13:54 +08:00
|
|
|
if (!layoutParameter)
|
|
|
|
{
|
|
|
|
child->setLayoutParameter(RelativeLayoutParameter::create());
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::addBackGroundImage()
|
|
|
|
{
|
2014-07-30 16:33:37 +08:00
|
|
|
_backGroundImage = Scale9Sprite::create();
|
2015-12-09 14:38:53 +08:00
|
|
|
_backGroundImage->setRenderingType(Scale9Sprite::RenderingType::SIMPLE);
|
2014-07-30 16:33:37 +08:00
|
|
|
|
|
|
|
addProtectedChild(_backGroundImage, BACKGROUNDIMAGE_Z, -1);
|
|
|
|
|
2014-08-28 11:41:18 +08:00
|
|
|
_backGroundImage->setPosition(_contentSize.width/2.0f, _contentSize.height/2.0f);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::removeBackGroundImage()
|
|
|
|
{
|
|
|
|
if (!_backGroundImage)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2014-03-24 15:25:44 +08:00
|
|
|
removeProtectedChild(_backGroundImage);
|
2014-03-11 17:13:54 +08:00
|
|
|
_backGroundImage = nullptr;
|
|
|
|
_backGroundImageFileName = "";
|
|
|
|
_backGroundImageTextureSize = Size::ZERO;
|
|
|
|
}
|
|
|
|
|
2014-05-09 17:05:36 +08:00
|
|
|
void Layout::setBackGroundColorType(BackGroundColorType type)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
if (_colorType == type)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
switch (_colorType)
|
|
|
|
{
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::NONE:
|
2014-03-11 17:13:54 +08:00
|
|
|
if (_colorRender)
|
|
|
|
{
|
2014-03-24 15:25:44 +08:00
|
|
|
removeProtectedChild(_colorRender);
|
2014-03-11 17:13:54 +08:00
|
|
|
_colorRender = nullptr;
|
|
|
|
}
|
|
|
|
if (_gradientRender)
|
|
|
|
{
|
2014-03-24 15:25:44 +08:00
|
|
|
removeProtectedChild(_gradientRender);
|
2014-03-11 17:13:54 +08:00
|
|
|
_gradientRender = nullptr;
|
|
|
|
}
|
|
|
|
break;
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::SOLID:
|
2014-03-11 17:13:54 +08:00
|
|
|
if (_colorRender)
|
|
|
|
{
|
2014-03-24 15:25:44 +08:00
|
|
|
removeProtectedChild(_colorRender);
|
2014-03-11 17:13:54 +08:00
|
|
|
_colorRender = nullptr;
|
|
|
|
}
|
|
|
|
break;
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::GRADIENT:
|
2014-03-11 17:13:54 +08:00
|
|
|
if (_gradientRender)
|
|
|
|
{
|
2014-03-24 15:25:44 +08:00
|
|
|
removeProtectedChild(_gradientRender);
|
2014-03-11 17:13:54 +08:00
|
|
|
_gradientRender = nullptr;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
_colorType = type;
|
|
|
|
switch (_colorType)
|
|
|
|
{
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::NONE:
|
2014-03-11 17:13:54 +08:00
|
|
|
break;
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::SOLID:
|
2014-03-11 17:13:54 +08:00
|
|
|
_colorRender = LayerColor::create();
|
2014-06-20 10:40:16 +08:00
|
|
|
_colorRender->setContentSize(_contentSize);
|
2014-03-11 17:13:54 +08:00
|
|
|
_colorRender->setOpacity(_cOpacity);
|
|
|
|
_colorRender->setColor(_cColor);
|
2014-03-24 15:25:44 +08:00
|
|
|
addProtectedChild(_colorRender, BCAKGROUNDCOLORRENDERER_Z, -1);
|
2014-03-11 17:13:54 +08:00
|
|
|
break;
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::GRADIENT:
|
2014-03-11 17:13:54 +08:00
|
|
|
_gradientRender = LayerGradient::create();
|
2014-06-20 10:40:16 +08:00
|
|
|
_gradientRender->setContentSize(_contentSize);
|
2014-03-11 17:13:54 +08:00
|
|
|
_gradientRender->setOpacity(_cOpacity);
|
|
|
|
_gradientRender->setStartColor(_gStartColor);
|
|
|
|
_gradientRender->setEndColor(_gEndColor);
|
|
|
|
_gradientRender->setVector(_alongVector);
|
2014-03-24 15:25:44 +08:00
|
|
|
addProtectedChild(_gradientRender, BCAKGROUNDCOLORRENDERER_Z, -1);
|
2014-03-11 17:13:54 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
Layout::BackGroundColorType Layout::getBackGroundColorType()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _colorType;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::setBackGroundColor(const Color3B &color)
|
|
|
|
{
|
|
|
|
_cColor = color;
|
|
|
|
if (_colorRender)
|
|
|
|
{
|
|
|
|
_colorRender->setColor(color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
const Color3B& Layout::getBackGroundColor()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _cColor;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::setBackGroundColor(const Color3B &startColor, const Color3B &endColor)
|
|
|
|
{
|
|
|
|
_gStartColor = startColor;
|
|
|
|
if (_gradientRender)
|
|
|
|
{
|
|
|
|
_gradientRender->setStartColor(startColor);
|
|
|
|
}
|
|
|
|
_gEndColor = endColor;
|
|
|
|
if (_gradientRender)
|
|
|
|
{
|
|
|
|
_gradientRender->setEndColor(endColor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
const Color3B& Layout::getBackGroundStartColor()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _gStartColor;
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
const Color3B& Layout::getBackGroundEndColor()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _gEndColor;
|
|
|
|
}
|
|
|
|
|
2019-06-05 17:58:33 +08:00
|
|
|
void Layout::setBackGroundColorOpacity(uint8_t opacity)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
_cOpacity = opacity;
|
|
|
|
switch (_colorType)
|
|
|
|
{
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::NONE:
|
2014-03-11 17:13:54 +08:00
|
|
|
break;
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::SOLID:
|
2014-03-11 17:13:54 +08:00
|
|
|
_colorRender->setOpacity(opacity);
|
|
|
|
break;
|
2014-05-09 17:05:36 +08:00
|
|
|
case BackGroundColorType::GRADIENT:
|
2014-03-11 17:13:54 +08:00
|
|
|
_gradientRender->setOpacity(opacity);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-05 17:58:33 +08:00
|
|
|
uint8_t Layout::getBackGroundColorOpacity()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _cOpacity;
|
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
void Layout::setBackGroundColorVector(const Vec2 &vector)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
_alongVector = vector;
|
|
|
|
if (_gradientRender)
|
|
|
|
{
|
|
|
|
_gradientRender->setVector(vector);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
const Vec2& Layout::getBackGroundColorVector()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _alongVector;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::setBackGroundImageColor(const Color3B &color)
|
|
|
|
{
|
|
|
|
_backGroundImageColor = color;
|
|
|
|
updateBackGroundImageColor();
|
|
|
|
}
|
|
|
|
|
2019-06-05 17:58:33 +08:00
|
|
|
void Layout::setBackGroundImageOpacity(uint8_t opacity)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
_backGroundImageOpacity = opacity;
|
|
|
|
updateBackGroundImageOpacity();
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
const Color3B& Layout::getBackGroundImageColor()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _backGroundImageColor;
|
|
|
|
}
|
|
|
|
|
2019-06-05 17:58:33 +08:00
|
|
|
uint8_t Layout::getBackGroundImageOpacity()const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _backGroundImageOpacity;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::updateBackGroundImageColor()
|
|
|
|
{
|
|
|
|
if (_backGroundImage)
|
|
|
|
{
|
|
|
|
_backGroundImage->setColor(_backGroundImageColor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::updateBackGroundImageOpacity()
|
|
|
|
{
|
|
|
|
if (_backGroundImage)
|
|
|
|
{
|
|
|
|
_backGroundImage->setOpacity(_backGroundImageOpacity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::updateBackGroundImageRGBA()
|
|
|
|
{
|
|
|
|
if (_backGroundImage)
|
|
|
|
{
|
|
|
|
_backGroundImage->setColor(_backGroundImageColor);
|
|
|
|
_backGroundImage->setOpacity(_backGroundImageOpacity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const Size& Layout::getBackGroundImageTextureSize() const
|
|
|
|
{
|
|
|
|
return _backGroundImageTextureSize;
|
|
|
|
}
|
|
|
|
|
2014-05-12 18:00:54 +08:00
|
|
|
void Layout::setLayoutType(Type type)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
_layoutType = type;
|
2014-05-14 18:24:23 +08:00
|
|
|
|
2014-03-24 15:25:44 +08:00
|
|
|
for (auto& child : _children)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-03-24 15:25:44 +08:00
|
|
|
Widget* widgetChild = dynamic_cast<Widget*>(child);
|
|
|
|
if (widgetChild)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
supplyTheLayoutParameterLackToChild(static_cast<Widget*>(child));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_doLayoutDirty = true;
|
|
|
|
}
|
2014-03-25 17:15:54 +08:00
|
|
|
|
2014-05-14 18:24:23 +08:00
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
|
2014-05-12 18:00:54 +08:00
|
|
|
Layout::Type Layout::getLayoutType() const
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
|
|
|
return _layoutType;
|
|
|
|
}
|
2014-07-21 17:45:56 +08:00
|
|
|
|
|
|
|
void Layout::forceDoLayout()
|
|
|
|
{
|
|
|
|
this->requestDoLayout();
|
|
|
|
this->doLayout();
|
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
|
|
|
|
void Layout::requestDoLayout()
|
|
|
|
{
|
|
|
|
_doLayoutDirty = true;
|
|
|
|
}
|
2014-05-15 10:07:42 +08:00
|
|
|
|
2014-05-27 13:49:00 +08:00
|
|
|
Size Layout::getLayoutContentSize()const
|
2014-05-15 10:07:42 +08:00
|
|
|
{
|
2014-06-20 11:18:53 +08:00
|
|
|
return this->getContentSize();
|
2014-05-15 10:07:42 +08:00
|
|
|
}
|
|
|
|
|
2014-05-27 10:19:05 +08:00
|
|
|
const Vector<Node*>& Layout::getLayoutElements()const
|
2014-05-15 10:07:42 +08:00
|
|
|
{
|
|
|
|
return this->getChildren();
|
|
|
|
}
|
2014-05-15 10:23:25 +08:00
|
|
|
|
2014-05-28 10:11:49 +08:00
|
|
|
LayoutManager* Layout::createLayoutManager()
|
2014-05-15 10:23:25 +08:00
|
|
|
{
|
2014-05-28 10:11:49 +08:00
|
|
|
LayoutManager* exe = nullptr;
|
2014-05-15 10:23:25 +08:00
|
|
|
switch (_layoutType)
|
|
|
|
{
|
2014-05-15 10:48:33 +08:00
|
|
|
case Type::VERTICAL:
|
2014-05-28 10:11:49 +08:00
|
|
|
exe = LinearVerticalLayoutManager::create();
|
2014-05-15 10:23:25 +08:00
|
|
|
break;
|
2014-05-15 10:48:33 +08:00
|
|
|
case Type::HORIZONTAL:
|
2014-05-28 10:11:49 +08:00
|
|
|
exe = LinearHorizontalLayoutManager::create();
|
2014-05-15 10:23:25 +08:00
|
|
|
break;
|
2014-05-15 10:48:33 +08:00
|
|
|
case Type::RELATIVE:
|
2014-05-28 10:11:49 +08:00
|
|
|
exe = RelativeLayoutManager::create();
|
2014-05-15 10:23:25 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return exe;
|
|
|
|
|
|
|
|
}
|
2014-03-11 17:13:54 +08:00
|
|
|
|
|
|
|
void Layout::doLayout()
|
|
|
|
{
|
2014-07-18 18:02:46 +08:00
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
if (!_doLayoutDirty)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2014-07-18 18:02:46 +08:00
|
|
|
|
|
|
|
sortAllChildren();
|
|
|
|
|
2014-05-28 10:11:49 +08:00
|
|
|
LayoutManager* executant = this->createLayoutManager();
|
2014-05-15 10:07:42 +08:00
|
|
|
|
2014-05-14 18:24:23 +08:00
|
|
|
if (executant)
|
2014-03-11 17:13:54 +08:00
|
|
|
{
|
2014-05-15 10:07:42 +08:00
|
|
|
executant->doLayout(this);
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
2014-05-14 18:24:23 +08:00
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
_doLayoutDirty = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::string Layout::getDescription() const
|
|
|
|
{
|
|
|
|
return "Layout";
|
|
|
|
}
|
|
|
|
|
|
|
|
Widget* Layout::createCloneInstance()
|
|
|
|
{
|
|
|
|
return Layout::create();
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::copyClonedWidgetChildren(Widget* model)
|
|
|
|
{
|
|
|
|
Widget::copyClonedWidgetChildren(model);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::copySpecialProperties(Widget *widget)
|
|
|
|
{
|
|
|
|
Layout* layout = dynamic_cast<Layout*>(widget);
|
|
|
|
if (layout)
|
|
|
|
{
|
|
|
|
setBackGroundImageScale9Enabled(layout->_backGroundScale9Enabled);
|
2014-04-03 11:14:35 +08:00
|
|
|
setBackGroundImage(layout->_backGroundImageFileName,layout->_bgImageTexType);
|
2014-03-11 17:13:54 +08:00
|
|
|
setBackGroundImageCapInsets(layout->_backGroundImageCapInsets);
|
|
|
|
setBackGroundColorType(layout->_colorType);
|
|
|
|
setBackGroundColor(layout->_cColor);
|
|
|
|
setBackGroundColor(layout->_gStartColor, layout->_gEndColor);
|
|
|
|
setBackGroundColorOpacity(layout->_cOpacity);
|
|
|
|
setBackGroundColorVector(layout->_alongVector);
|
|
|
|
setLayoutType(layout->_layoutType);
|
|
|
|
setClippingEnabled(layout->_clippingEnabled);
|
|
|
|
setClippingType(layout->_clippingType);
|
2014-05-23 15:03:46 +08:00
|
|
|
_loopFocus = layout->_loopFocus;
|
|
|
|
_passFocusToChild = layout->_passFocusToChild;
|
2014-08-15 15:28:28 +08:00
|
|
|
_isInterceptTouch = layout->_isInterceptTouch;
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
}
|
2014-05-04 14:50:12 +08:00
|
|
|
|
|
|
|
void Layout::setLoopFocus(bool loop)
|
|
|
|
{
|
|
|
|
_loopFocus = loop;
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
bool Layout::isLoopFocus()const
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
return _loopFocus;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Layout::setPassFocusToChild(bool pass)
|
|
|
|
{
|
|
|
|
_passFocusToChild = pass;
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
bool Layout::isPassFocusToChild()const
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
return _passFocusToChild;
|
|
|
|
}
|
|
|
|
|
2014-05-20 10:16:19 +08:00
|
|
|
Size Layout::getLayoutAccumulatedSize()const
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 11:55:00 +08:00
|
|
|
const auto& children = this->getChildren();
|
2014-05-06 11:46:28 +08:00
|
|
|
Size layoutSize = Size::ZERO;
|
|
|
|
int widgetCount =0;
|
|
|
|
for(const auto& widget : children)
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
Layout *layout = dynamic_cast<Layout*>(widget);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (nullptr != layout)
|
|
|
|
{
|
2014-05-20 10:16:19 +08:00
|
|
|
layoutSize = layoutSize + layout->getLayoutAccumulatedSize();
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-06 11:46:28 +08:00
|
|
|
Widget *w = dynamic_cast<Widget*>(widget);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (w)
|
|
|
|
{
|
2014-05-06 11:46:28 +08:00
|
|
|
widgetCount++;
|
2014-05-16 10:33:28 +08:00
|
|
|
Margin m = w->getLayoutParameter()->getMargin();
|
2014-06-20 11:18:53 +08:00
|
|
|
layoutSize = layoutSize + w->getContentSize() + Size(m.right + m.left, m.top + m.bottom) * 0.5;
|
2014-05-06 11:46:28 +08:00
|
|
|
}
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-21 07:21:45 +08:00
|
|
|
//subtract extra size
|
2014-05-12 18:00:54 +08:00
|
|
|
Type type = this->getLayoutType();
|
|
|
|
if (type == Type::HORIZONTAL)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-06 11:46:28 +08:00
|
|
|
layoutSize = layoutSize - Size(0, layoutSize.height/widgetCount * (widgetCount-1));
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-12 18:00:54 +08:00
|
|
|
if (type == Type::VERTICAL)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-06 11:46:28 +08:00
|
|
|
layoutSize = layoutSize - Size(layoutSize.width/widgetCount * (widgetCount-1), 0);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
return layoutSize;
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
Vec2 Layout::getWorldCenterPoint(Widget* widget)const
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
Layout *layout = dynamic_cast<Layout*>(widget);
|
2014-05-07 18:27:05 +08:00
|
|
|
//FIXEDME: we don't need to calculate the content size of layout anymore
|
2014-06-20 11:18:53 +08:00
|
|
|
Size widgetSize = layout ? layout->getLayoutAccumulatedSize() : widget->getContentSize();
|
2015-12-21 07:21:45 +08:00
|
|
|
// CCLOG("content size : width = %f, height = %f", widgetSize.width, widgetSize.height);
|
2014-05-15 01:07:09 +08:00
|
|
|
return widget->convertToWorldSpace(Vec2(widgetSize.width/2, widgetSize.height/2));
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
|
2014-06-30 14:09:27 +08:00
|
|
|
float Layout::calculateNearestDistance(Widget* baseWidget)
|
2014-05-07 18:27:05 +08:00
|
|
|
{
|
|
|
|
float distance = FLT_MAX;
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 widgetPosition = this->getWorldCenterPoint(baseWidget);
|
2014-05-07 18:27:05 +08:00
|
|
|
|
2014-12-16 16:44:04 +08:00
|
|
|
for (Node* node : _children)
|
|
|
|
{
|
2014-05-07 18:27:05 +08:00
|
|
|
Layout *layout = dynamic_cast<Layout*>(node);
|
|
|
|
int length;
|
2014-12-16 16:44:04 +08:00
|
|
|
if (layout)
|
|
|
|
{
|
2014-06-30 14:09:27 +08:00
|
|
|
length = layout->calculateNearestDistance(baseWidget);
|
2014-05-07 18:27:05 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Widget* w = dynamic_cast<Widget*>(node);
|
2014-12-16 16:44:04 +08:00
|
|
|
if (w && w->isFocusEnabled())
|
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 wPosition = this->getWorldCenterPoint(w);
|
2014-05-07 18:27:05 +08:00
|
|
|
length = (wPosition - widgetPosition).length();
|
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 18:27:05 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-16 16:44:04 +08:00
|
|
|
if (length < distance)
|
|
|
|
{
|
2014-05-07 18:27:05 +08:00
|
|
|
distance = length;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
return distance;
|
|
|
|
}
|
2014-05-08 10:46:05 +08:00
|
|
|
|
2014-07-15 14:57:10 +08:00
|
|
|
float Layout::calculateFarthestDistance(cocos2d::ui::Widget *baseWidget)
|
2014-05-08 10:46:05 +08:00
|
|
|
{
|
|
|
|
float distance = -FLT_MAX;
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 widgetPosition = this->getWorldCenterPoint(baseWidget);
|
2014-05-08 10:46:05 +08:00
|
|
|
|
2014-12-16 16:44:04 +08:00
|
|
|
for (Node* node : _children)
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
Layout *layout = dynamic_cast<Layout*>(node);
|
|
|
|
int length;
|
2014-12-16 16:44:04 +08:00
|
|
|
if (layout)
|
|
|
|
{
|
2014-07-15 14:57:10 +08:00
|
|
|
length = layout->calculateFarthestDistance(baseWidget);
|
2014-05-08 10:46:05 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Widget* w = dynamic_cast<Widget*>(node);
|
|
|
|
if (w && w->isFocusEnabled()) {
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 wPosition = this->getWorldCenterPoint(w);
|
2014-05-08 10:46:05 +08:00
|
|
|
length = (wPosition - widgetPosition).length();
|
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-16 16:44:04 +08:00
|
|
|
if (length > distance)
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
distance = length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return distance;
|
|
|
|
}
|
2014-05-04 14:50:12 +08:00
|
|
|
|
2014-05-08 11:24:09 +08:00
|
|
|
int Layout::findFirstFocusEnabledWidgetIndex()
|
|
|
|
{
|
|
|
|
ssize_t index = 0;
|
|
|
|
ssize_t count = this->getChildren().size();
|
2014-12-16 16:44:04 +08:00
|
|
|
while (index < count)
|
|
|
|
{
|
2014-05-08 11:24:09 +08:00
|
|
|
Widget* w = dynamic_cast<Widget*>(_children.at(index));
|
2014-12-16 16:44:04 +08:00
|
|
|
if (w && w->isFocusEnabled())
|
|
|
|
{
|
2014-05-08 11:24:09 +08:00
|
|
|
return (int)index;
|
|
|
|
}
|
|
|
|
index++;
|
|
|
|
}
|
2015-12-21 07:21:45 +08:00
|
|
|
CCASSERT(0, "invalid operation");
|
2014-05-08 11:24:09 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-05-07 18:27:05 +08:00
|
|
|
int Layout::findNearestChildWidgetIndex(FocusDirection direction, Widget* baseWidget)
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 18:27:05 +08:00
|
|
|
if (baseWidget == nullptr || baseWidget == this)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-08 11:24:09 +08:00
|
|
|
return this->findFirstFocusEnabledWidgetIndex();
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
int index = 0;
|
|
|
|
ssize_t count = this->getChildren().size();
|
|
|
|
|
|
|
|
float distance = FLT_MAX;
|
|
|
|
int found = 0;
|
2014-06-30 14:09:27 +08:00
|
|
|
if (direction == FocusDirection::LEFT || direction == FocusDirection::RIGHT ||
|
|
|
|
direction == FocusDirection::DOWN || direction == FocusDirection::UP)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 widgetPosition = this->getWorldCenterPoint(baseWidget);
|
2014-05-06 12:04:52 +08:00
|
|
|
while (index < count)
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
Widget *w = dynamic_cast<Widget*>(this->getChildren().at(index));
|
2014-05-06 12:04:52 +08:00
|
|
|
if (w && w->isFocusEnabled())
|
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 wPosition = this->getWorldCenterPoint(w);
|
2014-05-07 18:27:05 +08:00
|
|
|
float length;
|
|
|
|
Layout *layout = dynamic_cast<Layout*>(w);
|
|
|
|
if (layout)
|
|
|
|
{
|
2014-06-30 14:09:27 +08:00
|
|
|
length = layout->calculateNearestDistance(baseWidget);
|
2014-05-07 18:27:05 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
length = (wPosition - widgetPosition).getLength();
|
|
|
|
}
|
|
|
|
|
2014-05-06 12:04:52 +08:00
|
|
|
if (length < distance)
|
|
|
|
{
|
2014-05-07 18:27:05 +08:00
|
|
|
found = index;
|
|
|
|
distance = length;
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
index++;
|
|
|
|
}
|
|
|
|
return found;
|
|
|
|
}
|
|
|
|
|
2014-06-30 14:09:27 +08:00
|
|
|
|
2014-05-04 14:50:12 +08:00
|
|
|
CCASSERT(0, "invalid focus direction!!!");
|
|
|
|
return 0;
|
|
|
|
}
|
2014-05-08 10:46:05 +08:00
|
|
|
|
2014-07-15 14:57:10 +08:00
|
|
|
int Layout::findFarthestChildWidgetIndex(FocusDirection direction, cocos2d::ui::Widget *baseWidget)
|
2014-05-08 10:46:05 +08:00
|
|
|
{
|
|
|
|
if (baseWidget == nullptr || baseWidget == this)
|
|
|
|
{
|
2014-05-08 11:24:09 +08:00
|
|
|
return this->findFirstFocusEnabledWidgetIndex();
|
2014-05-08 10:46:05 +08:00
|
|
|
}
|
|
|
|
int index = 0;
|
|
|
|
ssize_t count = this->getChildren().size();
|
|
|
|
|
|
|
|
float distance = -FLT_MAX;
|
|
|
|
int found = 0;
|
2014-06-30 14:09:27 +08:00
|
|
|
if (direction == FocusDirection::LEFT || direction == FocusDirection::RIGHT
|
|
|
|
|| direction == FocusDirection::DOWN || direction == FocusDirection::UP)
|
2014-05-08 10:46:05 +08:00
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 widgetPosition = this->getWorldCenterPoint(baseWidget);
|
2014-05-08 10:46:05 +08:00
|
|
|
while (index < count)
|
|
|
|
{
|
|
|
|
Widget *w = dynamic_cast<Widget*>(this->getChildren().at(index));
|
|
|
|
if (w && w->isFocusEnabled())
|
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 wPosition = this->getWorldCenterPoint(w);
|
2014-05-08 10:46:05 +08:00
|
|
|
float length;
|
|
|
|
Layout *layout = dynamic_cast<Layout*>(w);
|
|
|
|
if (layout)
|
|
|
|
{
|
2014-07-15 14:57:10 +08:00
|
|
|
length = layout->calculateFarthestDistance(baseWidget);
|
2014-05-08 10:46:05 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
length = (wPosition - widgetPosition).getLength();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (length > distance)
|
|
|
|
{
|
|
|
|
found = index;
|
|
|
|
distance = length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
index++;
|
|
|
|
}
|
|
|
|
return found;
|
|
|
|
}
|
|
|
|
|
|
|
|
CCASSERT(0, "invalid focus direction!!!");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-05-04 14:50:12 +08:00
|
|
|
|
2014-05-06 17:28:12 +08:00
|
|
|
Widget* Layout::findFocusEnabledChildWidgetByIndex(ssize_t index)
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-04 18:42:22 +08:00
|
|
|
|
2014-05-07 18:27:05 +08:00
|
|
|
Widget *widget = this->getChildWidgetByIndex(index);
|
2014-05-04 14:50:12 +08:00
|
|
|
|
2014-05-07 14:06:44 +08:00
|
|
|
if (widget)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:06:44 +08:00
|
|
|
if (widget->isFocusEnabled())
|
2014-05-06 17:28:12 +08:00
|
|
|
{
|
2014-05-07 14:06:44 +08:00
|
|
|
return widget;
|
2014-05-06 17:28:12 +08:00
|
|
|
}
|
|
|
|
index = index + 1;
|
|
|
|
return this->findFocusEnabledChildWidgetByIndex(index);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-04 18:42:22 +08:00
|
|
|
return nullptr;
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-08 10:46:05 +08:00
|
|
|
|
|
|
|
Widget *Layout::findFirstNonLayoutWidget()
|
|
|
|
{
|
|
|
|
Widget* widget = nullptr;
|
|
|
|
for(Node *node : _children)
|
|
|
|
{
|
|
|
|
Layout* layout = dynamic_cast<Layout*>(node);
|
2014-12-16 16:44:04 +08:00
|
|
|
if (layout)
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
widget = layout->findFirstNonLayoutWidget();
|
2014-12-16 16:44:04 +08:00
|
|
|
if (widget != nullptr)
|
|
|
|
{
|
2014-06-30 14:09:27 +08:00
|
|
|
return widget;
|
|
|
|
}
|
2014-05-08 10:46:05 +08:00
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
Widget *w = dynamic_cast<Widget*>(node);
|
2014-12-16 16:44:04 +08:00
|
|
|
if (w)
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
widget = w;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return widget;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Layout::findProperSearchingFunctor(FocusDirection dir, Widget* baseWidget)
|
|
|
|
{
|
2014-12-16 16:44:04 +08:00
|
|
|
if (baseWidget == nullptr)
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 previousWidgetPosition = this->getWorldCenterPoint(baseWidget);
|
2014-05-08 10:46:05 +08:00
|
|
|
|
2014-05-26 22:57:50 +08:00
|
|
|
Vec2 widgetPosition = this->getWorldCenterPoint(this->findFirstNonLayoutWidget());
|
2014-05-08 10:46:05 +08:00
|
|
|
|
2014-12-16 16:44:04 +08:00
|
|
|
if (dir == FocusDirection::LEFT)
|
|
|
|
{
|
|
|
|
if (previousWidgetPosition.x > widgetPosition.x)
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findNearestChildWidgetIndex, this);
|
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
else
|
|
|
|
{
|
2014-07-15 14:57:10 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findFarthestChildWidgetIndex, this);
|
2014-05-08 10:46:05 +08:00
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
}
|
|
|
|
else if(dir == FocusDirection::RIGHT)
|
|
|
|
{
|
|
|
|
if (previousWidgetPosition.x > widgetPosition.x)
|
|
|
|
{
|
2014-07-15 14:57:10 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findFarthestChildWidgetIndex, this);
|
2014-05-08 10:46:05 +08:00
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findNearestChildWidgetIndex, this);
|
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
}
|
|
|
|
else if(dir == FocusDirection::DOWN)
|
|
|
|
{
|
|
|
|
if (previousWidgetPosition.y > widgetPosition.y)
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findNearestChildWidgetIndex, this);
|
2014-12-16 16:44:04 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-07-15 14:57:10 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findFarthestChildWidgetIndex, this);
|
2014-05-08 10:46:05 +08:00
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
}
|
|
|
|
else if(dir == FocusDirection::UP)
|
|
|
|
{
|
|
|
|
if (previousWidgetPosition.y < widgetPosition.y)
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findNearestChildWidgetIndex, this);
|
2014-12-16 16:44:04 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-07-15 14:57:10 +08:00
|
|
|
onPassFocusToChild = CC_CALLBACK_2(Layout::findFarthestChildWidgetIndex, this);
|
2014-05-08 10:46:05 +08:00
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-05-08 10:46:05 +08:00
|
|
|
CCASSERT(0, "invalid direction!");
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-05-04 14:50:12 +08:00
|
|
|
|
2014-05-08 18:10:21 +08:00
|
|
|
Widget* Layout::passFocusToChild(FocusDirection dir, cocos2d::ui::Widget *current)
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 10:05:20 +08:00
|
|
|
if (checkFocusEnabledChild())
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
Widget* previousWidget = this->getCurrentFocusedWidget();
|
2014-05-08 10:46:05 +08:00
|
|
|
|
|
|
|
this->findProperSearchingFunctor(dir, previousWidget);
|
|
|
|
|
2014-05-07 18:27:05 +08:00
|
|
|
int index = onPassFocusToChild(dir, previousWidget);
|
|
|
|
|
|
|
|
Widget *widget = this->getChildWidgetByIndex(index);
|
2014-05-07 10:05:20 +08:00
|
|
|
Layout *layout = dynamic_cast<Layout*>(widget);
|
|
|
|
if (layout)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
layout->_isFocusPassing = true;
|
2014-05-07 14:06:44 +08:00
|
|
|
return layout->findNextFocusedWidget(dir, layout);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-06 17:28:12 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
this->dispatchFocusEvent(current, widget);
|
2014-05-07 10:05:20 +08:00
|
|
|
return widget;
|
2014-05-06 17:28:12 +08:00
|
|
|
}
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-07 10:05:20 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
bool Layout::checkFocusEnabledChild()const
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
bool ret = false;
|
|
|
|
for(Node* node : _children)
|
|
|
|
{
|
|
|
|
Widget* widget = dynamic_cast<Widget*>(node);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (widget && widget->isFocusEnabled())
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
ret = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
Widget* Layout::getChildWidgetByIndex(ssize_t index)const
|
2014-05-04 18:42:22 +08:00
|
|
|
{
|
|
|
|
ssize_t size = _children.size();
|
|
|
|
int count = 0;
|
2014-05-06 12:04:52 +08:00
|
|
|
ssize_t oldIndex = index;
|
2014-05-07 14:06:44 +08:00
|
|
|
Widget *widget = nullptr;
|
2014-05-06 12:04:52 +08:00
|
|
|
while (index < size)
|
|
|
|
{
|
2014-05-04 18:42:22 +08:00
|
|
|
Widget* firstChild = dynamic_cast<Widget*>(_children.at(index));
|
2014-05-06 12:04:52 +08:00
|
|
|
if (firstChild)
|
|
|
|
{
|
2014-05-07 14:06:44 +08:00
|
|
|
widget = firstChild;
|
2014-05-04 18:42:22 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
count++;
|
|
|
|
index++;
|
|
|
|
}
|
|
|
|
|
2014-05-07 14:06:44 +08:00
|
|
|
if (nullptr == widget)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-04 18:42:22 +08:00
|
|
|
int begin = 0;
|
2014-05-06 12:04:52 +08:00
|
|
|
while (begin < oldIndex)
|
|
|
|
{
|
2014-05-04 18:42:22 +08:00
|
|
|
Widget* firstChild = dynamic_cast<Widget*>(_children.at(begin));
|
2014-05-06 12:04:52 +08:00
|
|
|
if (firstChild)
|
|
|
|
{
|
2014-05-07 14:06:44 +08:00
|
|
|
widget = firstChild;
|
2014-05-04 18:42:22 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
count++;
|
|
|
|
begin++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-05-07 14:06:44 +08:00
|
|
|
return widget;
|
2014-05-04 18:42:22 +08:00
|
|
|
}
|
|
|
|
|
2014-05-07 14:26:41 +08:00
|
|
|
Widget* Layout::getPreviousFocusedWidget(FocusDirection direction, Widget *current)
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
Widget *nextWidget = nullptr;
|
|
|
|
ssize_t previousWidgetPos = _children.getIndex(current);
|
|
|
|
previousWidgetPos = previousWidgetPos - 1;
|
2014-05-06 12:04:52 +08:00
|
|
|
if (previousWidgetPos >= 0)
|
|
|
|
{
|
2014-05-07 18:27:05 +08:00
|
|
|
nextWidget = this->getChildWidgetByIndex(previousWidgetPos);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (nextWidget->isFocusEnabled())
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
Layout* layout = dynamic_cast<Layout*>(nextWidget);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (layout)
|
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
layout->_isFocusPassing = true;
|
2014-05-07 14:26:41 +08:00
|
|
|
return layout->findNextFocusedWidget(direction, layout);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-26 22:57:50 +08:00
|
|
|
this->dispatchFocusEvent(current, nextWidget);
|
2014-05-04 14:50:12 +08:00
|
|
|
return nextWidget;
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2015-12-21 07:21:45 +08:00
|
|
|
//handling the disabled widget, there is no actual focus lose or get, so we don't need any event
|
2014-05-07 14:26:41 +08:00
|
|
|
return this->getPreviousFocusedWidget(direction, nextWidget);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
}
|
|
|
|
else
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
|
|
|
if (_loopFocus)
|
|
|
|
{
|
|
|
|
if (checkFocusEnabledChild())
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
previousWidgetPos = _children.size()-1;
|
2014-05-07 18:27:05 +08:00
|
|
|
nextWidget = this->getChildWidgetByIndex(previousWidgetPos);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (nextWidget->isFocusEnabled())
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
Layout* layout = dynamic_cast<Layout*>(nextWidget);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (layout)
|
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
layout->_isFocusPassing = true;
|
2014-05-07 14:26:41 +08:00
|
|
|
return layout->findNextFocusedWidget(direction, layout);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
this->dispatchFocusEvent(current, nextWidget);
|
2014-05-04 14:50:12 +08:00
|
|
|
return nextWidget;
|
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return this->getPreviousFocusedWidget(direction, nextWidget);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-12-16 16:44:04 +08:00
|
|
|
if (dynamic_cast<Layout*>(current))
|
|
|
|
{
|
2014-05-07 10:05:20 +08:00
|
|
|
return current;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return _focusedWidget;
|
|
|
|
}
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
if (isLastWidgetInContainer(current, direction))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
if (isWidgetAncestorSupportLoopFocus(this, direction))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return Widget::findNextFocusedWidget(direction, this);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
if (dynamic_cast<Layout*>(current))
|
|
|
|
{
|
2014-05-07 10:05:20 +08:00
|
|
|
return current;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return _focusedWidget;
|
|
|
|
}
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return Widget::findNextFocusedWidget(direction, this);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-07 14:26:41 +08:00
|
|
|
Widget* Layout::getNextFocusedWidget(FocusDirection direction, Widget *current)
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
Widget *nextWidget = nullptr;
|
|
|
|
ssize_t previousWidgetPos = _children.getIndex(current);
|
|
|
|
previousWidgetPos = previousWidgetPos + 1;
|
2014-05-06 12:04:52 +08:00
|
|
|
if (previousWidgetPos < _children.size())
|
|
|
|
{
|
2014-05-07 18:27:05 +08:00
|
|
|
nextWidget = this->getChildWidgetByIndex(previousWidgetPos);
|
2014-05-04 14:50:12 +08:00
|
|
|
//handle widget
|
2014-05-06 12:04:52 +08:00
|
|
|
if (nextWidget)
|
|
|
|
{
|
|
|
|
if (nextWidget->isFocusEnabled())
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
Layout* layout = dynamic_cast<Layout*>(nextWidget);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (layout)
|
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
layout->_isFocusPassing = true;
|
2014-05-07 14:26:41 +08:00
|
|
|
return layout->findNextFocusedWidget(direction, layout);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
this->dispatchFocusEvent(current, nextWidget);
|
2014-05-04 14:50:12 +08:00
|
|
|
return nextWidget;
|
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return this->getNextFocusedWidget(direction, nextWidget);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
return current;
|
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
}
|
|
|
|
else
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
|
|
|
if (_loopFocus)
|
|
|
|
{
|
|
|
|
if (checkFocusEnabledChild())
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
previousWidgetPos = 0;
|
2014-05-07 18:27:05 +08:00
|
|
|
nextWidget = this->getChildWidgetByIndex(previousWidgetPos);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (nextWidget->isFocusEnabled())
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
Layout* layout = dynamic_cast<Layout*>(nextWidget);
|
2014-05-06 12:04:52 +08:00
|
|
|
if (layout)
|
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
layout->_isFocusPassing = true;
|
2014-05-07 14:26:41 +08:00
|
|
|
return layout->findNextFocusedWidget(direction, layout);
|
2014-05-26 22:57:50 +08:00
|
|
|
}
|
|
|
|
else
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
this->dispatchFocusEvent(current, nextWidget);
|
2014-05-04 14:50:12 +08:00
|
|
|
return nextWidget;
|
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return this->getNextFocusedWidget(direction, nextWidget);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 10:05:20 +08:00
|
|
|
if (dynamic_cast<Layout*>(current)) {
|
|
|
|
return current;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return _focusedWidget;
|
|
|
|
}
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
if (isLastWidgetInContainer(current, direction))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
if (isWidgetAncestorSupportLoopFocus(this, direction))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return Widget::findNextFocusedWidget(direction, this);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-07 10:05:20 +08:00
|
|
|
if (dynamic_cast<Layout*>(current)) {
|
|
|
|
return current;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return _focusedWidget;
|
|
|
|
}
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return Widget::findNextFocusedWidget(direction, this);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
bool Layout::isLastWidgetInContainer(Widget* widget, FocusDirection direction)const
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
Layout* parent = dynamic_cast<Layout*>(widget->getParent());
|
2014-05-06 12:04:52 +08:00
|
|
|
if (parent == nullptr)
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-12-21 01:03:30 +08:00
|
|
|
auto& container = parent->getChildren();
|
2014-05-04 14:50:12 +08:00
|
|
|
ssize_t index = container.getIndex(widget);
|
2014-05-12 18:00:54 +08:00
|
|
|
if (parent->getLayoutType() == Type::HORIZONTAL)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-12-16 16:44:04 +08:00
|
|
|
if (direction == FocusDirection::LEFT)
|
|
|
|
{
|
2014-05-06 12:04:52 +08:00
|
|
|
if (index == 0)
|
|
|
|
{
|
2014-07-10 00:45:27 +08:00
|
|
|
return isLastWidgetInContainer(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
if (direction == FocusDirection::RIGHT)
|
|
|
|
{
|
2014-05-06 12:04:52 +08:00
|
|
|
if (index == container.size()-1)
|
|
|
|
{
|
2014-07-10 00:45:27 +08:00
|
|
|
return isLastWidgetInContainer(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2014-05-08 18:10:21 +08:00
|
|
|
if (direction == FocusDirection::DOWN)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return isLastWidgetInContainer(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
|
2014-05-08 18:10:21 +08:00
|
|
|
if (direction == FocusDirection::UP)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return isLastWidgetInContainer(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
2014-05-12 18:00:54 +08:00
|
|
|
else if(parent->getLayoutType() == Type::VERTICAL)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-08 18:10:21 +08:00
|
|
|
if (direction == FocusDirection::UP)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
|
|
|
if (index == 0)
|
|
|
|
{
|
2014-07-10 00:45:27 +08:00
|
|
|
return isLastWidgetInContainer(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2014-05-08 18:10:21 +08:00
|
|
|
if (direction == FocusDirection::DOWN)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
|
|
|
if (index == container.size() - 1)
|
|
|
|
{
|
2014-07-10 00:45:27 +08:00
|
|
|
return isLastWidgetInContainer(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2014-05-08 18:10:21 +08:00
|
|
|
if (direction == FocusDirection::LEFT)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return isLastWidgetInContainer(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
|
2014-05-08 18:10:21 +08:00
|
|
|
if (direction == FocusDirection::RIGHT)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return isLastWidgetInContainer(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
CCASSERT(0, "invalid layout Type");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-05-27 10:36:33 +08:00
|
|
|
bool Layout::isWidgetAncestorSupportLoopFocus(Widget* widget, FocusDirection direction)const
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
|
|
|
Layout* parent = dynamic_cast<Layout*>(widget->getParent());
|
2014-05-06 12:04:52 +08:00
|
|
|
if (parent == nullptr)
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
return false;
|
|
|
|
}
|
2014-05-07 14:06:44 +08:00
|
|
|
if (parent->isLoopFocus())
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
auto layoutType = parent->getLayoutType();
|
2014-05-12 18:00:54 +08:00
|
|
|
if (layoutType == Type::HORIZONTAL)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-08 18:10:21 +08:00
|
|
|
if (direction == FocusDirection::LEFT || direction == FocusDirection::RIGHT)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
return true;
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return isWidgetAncestorSupportLoopFocus(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
2014-05-12 18:00:54 +08:00
|
|
|
if (layoutType == Type::VERTICAL)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-08 18:10:21 +08:00
|
|
|
if (direction == FocusDirection::DOWN || direction == FocusDirection::UP)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return isWidgetAncestorSupportLoopFocus(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
CCASSERT(0, "invalid layout type");
|
2014-10-09 17:19:43 +08:00
|
|
|
return false;
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return isWidgetAncestorSupportLoopFocus(parent, direction);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-07 14:26:41 +08:00
|
|
|
Widget* Layout::findNextFocusedWidget(FocusDirection direction, Widget* current)
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
if (_isFocusPassing || this->isFocused())
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-08 11:24:09 +08:00
|
|
|
Layout* parent = dynamic_cast<Layout*>(this->getParent());
|
2014-05-26 22:57:50 +08:00
|
|
|
_isFocusPassing = false;
|
|
|
|
|
2014-05-07 10:05:20 +08:00
|
|
|
if (_passFocusToChild)
|
|
|
|
{
|
2014-05-08 11:24:09 +08:00
|
|
|
Widget * w = this->passFocusToChild(direction, current);
|
2014-12-16 16:44:04 +08:00
|
|
|
if (dynamic_cast<Layout*>(w))
|
|
|
|
{
|
|
|
|
if (parent)
|
|
|
|
{
|
2014-05-26 22:57:50 +08:00
|
|
|
parent->_isFocusPassing = true;
|
2014-05-08 11:24:09 +08:00
|
|
|
return parent->findNextFocusedWidget(direction, this);
|
|
|
|
}
|
2014-05-07 10:05:20 +08:00
|
|
|
}
|
2014-05-08 11:24:09 +08:00
|
|
|
return w;
|
|
|
|
}
|
|
|
|
|
2014-12-16 16:44:04 +08:00
|
|
|
if (nullptr == parent)
|
|
|
|
{
|
2014-05-08 11:24:09 +08:00
|
|
|
return this;
|
2014-05-07 10:05:20 +08:00
|
|
|
}
|
2014-05-26 22:57:50 +08:00
|
|
|
parent->_isFocusPassing = true;
|
2014-05-08 11:24:09 +08:00
|
|
|
return parent->findNextFocusedWidget(direction, this);
|
|
|
|
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
2014-05-26 22:57:50 +08:00
|
|
|
else if(current->isFocused() || dynamic_cast<Layout*>(current))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-12 18:00:54 +08:00
|
|
|
if (_layoutType == Type::HORIZONTAL)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
switch (direction)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-08 18:10:21 +08:00
|
|
|
case FocusDirection::LEFT:
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return this->getPreviousFocusedWidget(direction, current);
|
2014-05-04 14:50:12 +08:00
|
|
|
}break;
|
2014-05-08 18:10:21 +08:00
|
|
|
case FocusDirection::RIGHT:
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return this->getNextFocusedWidget(direction, current);
|
2014-05-04 14:50:12 +08:00
|
|
|
}break;
|
2014-05-08 18:10:21 +08:00
|
|
|
case FocusDirection::DOWN:
|
|
|
|
case FocusDirection::UP:
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
if (isLastWidgetInContainer(this, direction))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
if (isWidgetAncestorSupportLoopFocus(current, direction))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return Widget::findNextFocusedWidget(direction, this);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
return current;
|
|
|
|
}
|
2014-12-16 16:44:04 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return Widget::findNextFocusedWidget(direction, this);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
}break;
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
CCASSERT(0, "Invalid Focus Direction");
|
|
|
|
return current;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-05-12 18:00:54 +08:00
|
|
|
else if (_layoutType == Type::VERTICAL)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
switch (direction)
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-08 18:10:21 +08:00
|
|
|
case FocusDirection::LEFT:
|
|
|
|
case FocusDirection::RIGHT:
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
if (isLastWidgetInContainer(this, direction))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
if (isWidgetAncestorSupportLoopFocus(current, direction))
|
2014-05-06 12:04:52 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return Widget::findNextFocusedWidget(direction, this);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
return current;
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return Widget::findNextFocusedWidget(direction, this);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
} break;
|
2014-05-08 18:10:21 +08:00
|
|
|
case FocusDirection::DOWN:
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return getNextFocusedWidget(direction, current);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
break;
|
2014-05-08 18:10:21 +08:00
|
|
|
case FocusDirection::UP:
|
2014-05-04 14:50:12 +08:00
|
|
|
{
|
2014-05-07 14:26:41 +08:00
|
|
|
return getPreviousFocusedWidget(direction, current);
|
2014-05-04 14:50:12 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
CCASSERT(0, "Invalid Focus Direction");
|
|
|
|
return current;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
CCASSERT(0, "Un Supported Layout type, please use VBox and HBox instead!!!");
|
2014-05-04 14:50:12 +08:00
|
|
|
return current;
|
|
|
|
}
|
|
|
|
}
|
2014-05-06 12:04:52 +08:00
|
|
|
else
|
|
|
|
{
|
2014-05-04 14:50:12 +08:00
|
|
|
return current;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-29 14:41:03 +08:00
|
|
|
void Layout::setCameraMask(unsigned short mask, bool applyChildren)
|
|
|
|
{
|
|
|
|
Widget::setCameraMask(mask, applyChildren);
|
|
|
|
if (_clippingStencil){
|
|
|
|
_clippingStencil->setCameraMask(mask, applyChildren);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-05 00:26:07 +08:00
|
|
|
ResourceData Layout::getRenderFile()
|
2015-11-18 13:38:29 +08:00
|
|
|
{
|
2015-12-05 00:26:07 +08:00
|
|
|
ResourceData rData;
|
2015-11-18 13:38:29 +08:00
|
|
|
rData.type = (int)_bgImageTexType;
|
|
|
|
rData.file = _backGroundImageFileName;
|
|
|
|
return rData;
|
|
|
|
}
|
|
|
|
|
2014-03-11 17:13:54 +08:00
|
|
|
}
|
|
|
|
NS_CC_END
|