2018-01-29 16:25:32 +08:00
|
|
|
/****************************************************************************
|
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
|
|
|
|
|
|
|
http://www.cocos2d-x.org
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
|
|
in the Software without restriction, including without limitation the rights
|
|
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
THE SOFTWARE.
|
|
|
|
****************************************************************************/
|
|
|
|
|
2013-09-16 20:54:13 +08:00
|
|
|
#include "UIPageViewTest.h"
|
2014-08-15 15:28:28 +08:00
|
|
|
#include "cocos2d.h"
|
2013-09-16 20:54:13 +08:00
|
|
|
|
2015-04-09 12:23:47 +08:00
|
|
|
USING_NS_CC;
|
|
|
|
using namespace cocos2d::ui;
|
|
|
|
|
2015-04-03 14:31:03 +08:00
|
|
|
UIPageViewTests::UIPageViewTests()
|
|
|
|
{
|
|
|
|
ADD_TEST_CASE(UIPageViewTest);
|
|
|
|
ADD_TEST_CASE(UIPageViewButtonTest);
|
|
|
|
ADD_TEST_CASE(UIPageViewTouchPropagationTest);
|
|
|
|
ADD_TEST_CASE(UIPageViewDynamicAddAndRemoveTest);
|
2015-07-15 17:02:02 +08:00
|
|
|
ADD_TEST_CASE(UIPageViewJumpToPageTest);
|
2015-08-01 18:18:46 +08:00
|
|
|
ADD_TEST_CASE(UIPageViewVerticalTest);
|
2015-08-06 22:50:53 +08:00
|
|
|
ADD_TEST_CASE(UIPageViewDisableTouchTest);
|
2015-12-14 15:29:02 +08:00
|
|
|
ADD_TEST_CASE(UIPageViewChildSizeTest);
|
2016-04-11 17:29:02 +08:00
|
|
|
ADD_TEST_CASE(UIPageViewIndicatorTest);
|
2015-04-03 14:31:03 +08:00
|
|
|
}
|
|
|
|
|
2013-09-16 20:54:13 +08:00
|
|
|
// UIPageViewTest
|
|
|
|
UIPageViewTest::UIPageViewTest()
|
2014-04-09 22:53:59 +08:00
|
|
|
: _displayValueLabel(nullptr)
|
2013-09-16 20:54:13 +08:00
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewTest::~UIPageViewTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
2014-06-20 11:18:53 +08:00
|
|
|
Size widgetSize = _widget->getContentSize();
|
2013-09-16 20:54:13 +08:00
|
|
|
|
|
|
|
// Add a label in which the dragpanel events will be displayed
|
2014-04-03 11:52:35 +08:00
|
|
|
_displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
|
2014-05-15 01:07:09 +08:00
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
2014-04-03 11:52:35 +08:00
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height * 1.5));
|
2013-12-23 15:35:35 +08:00
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
2013-09-16 20:54:13 +08:00
|
|
|
|
|
|
|
// Add the black background
|
2014-04-03 11:52:35 +08:00
|
|
|
Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
|
2013-09-16 20:54:13 +08:00
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
2014-06-20 11:18:53 +08:00
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
2013-12-23 15:35:35 +08:00
|
|
|
_uiLayer->addChild(alert);
|
2013-09-16 20:54:13 +08:00
|
|
|
|
2013-12-23 15:35:35 +08:00
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
2013-09-16 20:54:13 +08:00
|
|
|
|
|
|
|
// Create the page view
|
2015-09-20 14:55:24 +08:00
|
|
|
Size size(240, 130);
|
2013-12-23 15:35:35 +08:00
|
|
|
PageView* pageView = PageView::create();
|
2015-09-16 17:13:58 +08:00
|
|
|
pageView->setDirection(PageView::Direction::HORIZONTAL);
|
2015-09-20 14:55:24 +08:00
|
|
|
pageView->setContentSize(size);
|
2013-09-16 20:54:13 +08:00
|
|
|
Size backgroundSize = background->getContentSize();
|
2015-08-28 13:50:22 +08:00
|
|
|
pageView->setPosition((widgetSize - pageView->getContentSize()) / 2.0f);
|
2015-09-16 17:59:56 +08:00
|
|
|
pageView->removeAllItems();
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->setIndicatorEnabled(true);
|
2017-01-04 11:06:44 +08:00
|
|
|
pageView->setGlobalZOrder(200);
|
2014-05-21 16:40:42 +08:00
|
|
|
|
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
2013-09-16 20:54:13 +08:00
|
|
|
{
|
2013-12-23 15:35:35 +08:00
|
|
|
Layout* layout = Layout::create();
|
2015-09-20 14:55:24 +08:00
|
|
|
layout->setContentSize(size);
|
2013-09-16 20:54:13 +08:00
|
|
|
|
2014-04-03 11:52:35 +08:00
|
|
|
ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
|
2013-09-16 20:54:13 +08:00
|
|
|
imageView->setScale9Enabled(true);
|
2015-09-20 14:55:24 +08:00
|
|
|
imageView->setContentSize(size);
|
2014-06-20 11:18:53 +08:00
|
|
|
imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
2013-09-16 20:54:13 +08:00
|
|
|
layout->addChild(imageView);
|
|
|
|
|
2014-04-03 17:42:04 +08:00
|
|
|
Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
|
2013-09-16 20:54:13 +08:00
|
|
|
label->setColor(Color3B(192, 192, 192));
|
2014-06-20 11:18:53 +08:00
|
|
|
label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
2013-09-16 20:54:13 +08:00
|
|
|
layout->addChild(label);
|
|
|
|
|
2015-09-16 17:59:56 +08:00
|
|
|
pageView->insertCustomItem(layout, i);
|
2013-09-16 20:54:13 +08:00
|
|
|
}
|
2014-05-21 16:40:42 +08:00
|
|
|
|
2015-09-16 17:59:56 +08:00
|
|
|
pageView->removeItem(0);
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->scrollToItem(pageCount - 2);
|
2019-06-12 14:58:07 +08:00
|
|
|
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
cocos2d::log("TODO in %s %s %d", __FILE__, __FUNCTION__, __LINE__);
|
2013-09-16 20:54:13 +08:00
|
|
|
|
2017-07-17 15:55:43 +08:00
|
|
|
pageView->setIndicatorIndexNodesOpacity(255);
|
|
|
|
|
2013-12-23 15:35:35 +08:00
|
|
|
_uiLayer->addChild(pageView);
|
2013-09-16 20:54:13 +08:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
void UIPageViewTest::pageViewEvent(Ref *pSender, PageView::EventType type)
|
2013-09-16 20:54:13 +08:00
|
|
|
{
|
2013-09-17 20:13:23 +08:00
|
|
|
switch (type)
|
|
|
|
{
|
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
|
|
|
case PageView::EventType::TURNING:
|
2013-09-17 20:13:23 +08:00
|
|
|
{
|
2013-12-23 15:35:35 +08:00
|
|
|
PageView* pageView = dynamic_cast<PageView*>(pSender);
|
2013-09-17 20:13:23 +08:00
|
|
|
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page = %ld", static_cast<long>(pageView->getCurrentPageIndex() + 1)));
|
2013-09-17 20:13:23 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-07-07 15:31:06 +08:00
|
|
|
|
|
|
|
|
|
|
|
// UIPageViewButtonTest
|
|
|
|
UIPageViewButtonTest::UIPageViewButtonTest()
|
|
|
|
: _displayValueLabel(nullptr)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewButtonTest::~UIPageViewButtonTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewButtonTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
|
|
|
Size widgetSize = _widget->getContentSize();
|
|
|
|
|
2015-09-16 17:59:56 +08:00
|
|
|
// Add a label in which the drag panel events will be displayed
|
2014-07-07 15:31:06 +08:00
|
|
|
_displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
|
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height * 1.5));
|
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
|
|
|
|
|
|
|
// Add the black background
|
|
|
|
Text* alert = Text::create("PageView with Buttons", "fonts/Marker Felt.ttf", 30);
|
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
|
|
|
_uiLayer->addChild(alert);
|
|
|
|
|
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
|
|
|
|
|
|
|
// Create the page view
|
|
|
|
PageView* pageView = PageView::create();
|
|
|
|
pageView->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
Size backgroundSize = background->getContentSize();
|
|
|
|
pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
|
|
|
|
(backgroundSize.width - pageView->getContentSize().width) / 2.0f,
|
|
|
|
(widgetSize.height - backgroundSize.height) / 2.0f +
|
|
|
|
(backgroundSize.height - pageView->getContentSize().height) / 2.0f));
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->removeAllItems();
|
2014-07-07 15:31:06 +08:00
|
|
|
|
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
|
|
|
{
|
2014-07-07 15:48:50 +08:00
|
|
|
HBox* outerBox = HBox::create();
|
|
|
|
outerBox->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
|
|
|
|
for (int k = 0; k < 2; ++k) {
|
|
|
|
VBox* innerBox = VBox::create();
|
|
|
|
|
|
|
|
for (int j = 0; j < 3; j++) {
|
|
|
|
Button *btn = Button::create("cocosui/animationbuttonnormal.png",
|
|
|
|
"cocosui/animationbuttonpressed.png");
|
|
|
|
btn->setName(StringUtils::format("button %d", j));
|
|
|
|
btn->addTouchEventListener( CC_CALLBACK_2(UIPageViewButtonTest::onButtonClicked, this));
|
|
|
|
|
|
|
|
innerBox->addChild(btn);
|
|
|
|
}
|
2014-07-07 15:31:06 +08:00
|
|
|
|
2014-07-07 15:48:50 +08:00
|
|
|
LinearLayoutParameter *parameter = LinearLayoutParameter::create();
|
|
|
|
parameter->setMargin(Margin(0,0,100,0));
|
|
|
|
innerBox->setLayoutParameter(parameter);
|
|
|
|
|
|
|
|
outerBox->addChild(innerBox);
|
|
|
|
|
2014-07-07 15:31:06 +08:00
|
|
|
}
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->insertCustomItem(outerBox, i);
|
2014-07-07 15:31:06 +08:00
|
|
|
}
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->removeItem(0);
|
2014-07-07 15:31:06 +08:00
|
|
|
|
2016-01-26 09:52:53 +08:00
|
|
|
pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewButtonTest::pageViewEvent, this));
|
2014-07-07 15:31:06 +08:00
|
|
|
|
|
|
|
_uiLayer->addChild(pageView);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-11-27 05:31:44 +08:00
|
|
|
void UIPageViewButtonTest::onButtonClicked(Ref* sender, Widget::TouchEventType type)
|
2014-07-07 15:31:06 +08:00
|
|
|
{
|
2016-08-04 09:51:54 +08:00
|
|
|
if(type == Widget::TouchEventType::ENDED) {
|
|
|
|
log("button %s clicked", static_cast<Button*>(sender)->getName().c_str());
|
|
|
|
}
|
2014-07-07 15:31:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void UIPageViewButtonTest::pageViewEvent(Ref *pSender, PageView::EventType type)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case PageView::EventType::TURNING:
|
|
|
|
{
|
|
|
|
PageView* pageView = dynamic_cast<PageView*>(pSender);
|
|
|
|
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page = %ld", static_cast<long>(pageView->getCurrentPageIndex() + 1)));
|
2014-07-07 15:31:06 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-08-14 11:14:24 +08:00
|
|
|
|
|
|
|
|
2014-08-15 15:28:28 +08:00
|
|
|
// UIPageViewTouchPropagationTest
|
|
|
|
UIPageViewTouchPropagationTest::UIPageViewTouchPropagationTest()
|
|
|
|
: _displayValueLabel(nullptr)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewTouchPropagationTest::~UIPageViewTouchPropagationTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewTouchPropagationTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
|
|
|
Size widgetSize = _widget->getContentSize();
|
|
|
|
|
|
|
|
// Add a label in which the dragpanel events will be displayed
|
|
|
|
_displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
|
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height * 1.5));
|
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
|
|
|
|
|
|
|
// Add the black background
|
|
|
|
Text* alert = Text::create("PageView Touch Propagation", "fonts/Marker Felt.ttf", 30);
|
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
|
|
|
_uiLayer->addChild(alert);
|
|
|
|
|
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
|
|
|
|
|
|
|
// Create the page view
|
|
|
|
PageView* pageView = PageView::create();
|
|
|
|
pageView->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
pageView->setAnchorPoint(Vec2(0.5,0.5));
|
|
|
|
Size backgroundSize = background->getContentSize();
|
|
|
|
pageView->setPosition(Vec2(widgetSize.width / 2.0f ,widgetSize.height / 2.0f));
|
|
|
|
pageView->setBackGroundColor(Color3B::GREEN);
|
|
|
|
pageView->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
|
|
|
|
|
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
|
|
|
{
|
|
|
|
HBox* outerBox = HBox::create();
|
|
|
|
outerBox->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
|
|
|
|
for (int k = 0; k < 2; ++k) {
|
|
|
|
VBox* innerBox = VBox::create();
|
|
|
|
|
|
|
|
for (int j = 0; j < 3; j++) {
|
|
|
|
Button *btn = Button::create("cocosui/animationbuttonnormal.png",
|
|
|
|
"cocosui/animationbuttonpressed.png");
|
|
|
|
btn->setName(StringUtils::format("button %d", j));
|
|
|
|
btn->addTouchEventListener( CC_CALLBACK_2(UIPageViewTouchPropagationTest::onButtonClicked, this));
|
|
|
|
|
|
|
|
innerBox->addChild(btn);
|
|
|
|
}
|
|
|
|
|
|
|
|
LinearLayoutParameter *parameter = LinearLayoutParameter::create();
|
|
|
|
parameter->setMargin(Margin(0,0,100,0));
|
|
|
|
innerBox->setLayoutParameter(parameter);
|
|
|
|
|
|
|
|
outerBox->addChild(innerBox);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->insertCustomItem(outerBox, i);
|
2014-08-15 15:28:28 +08:00
|
|
|
}
|
|
|
|
|
2016-01-26 09:52:53 +08:00
|
|
|
pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewTouchPropagationTest::pageViewEvent, this));
|
2014-08-15 15:28:28 +08:00
|
|
|
pageView->setName("pageView");
|
|
|
|
pageView->addTouchEventListener([](Ref* sender, Widget::TouchEventType type){
|
|
|
|
if (type == Widget::TouchEventType::BEGAN)
|
|
|
|
{
|
|
|
|
CCLOG("page view touch began");
|
|
|
|
}
|
|
|
|
else if(type == Widget::TouchEventType::MOVED)
|
|
|
|
{
|
|
|
|
CCLOG("page view touch moved");
|
|
|
|
}
|
|
|
|
else if(type == Widget::TouchEventType::ENDED)
|
|
|
|
{
|
|
|
|
CCLOG("page view touch ended");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
CCLOG("page view touch cancelled");
|
|
|
|
}
|
|
|
|
});
|
|
|
|
_uiLayer->addChild(pageView);
|
|
|
|
|
|
|
|
Text *propagationText = Text::create("Allow Propagation", "Arial", 10);
|
|
|
|
propagationText->setAnchorPoint(Vec2(0,0.5));
|
|
|
|
propagationText->setTextColor(Color4B::RED);
|
|
|
|
propagationText->setPosition(Vec2(0, pageView->getPosition().y + 50));
|
|
|
|
_uiLayer->addChild(propagationText);
|
|
|
|
|
|
|
|
Text *swallowTouchText = Text::create("Swallow Touches", "Arial", 10);
|
|
|
|
swallowTouchText->setAnchorPoint(Vec2(0,0.5));
|
|
|
|
swallowTouchText->setTextColor(Color4B::RED);
|
|
|
|
swallowTouchText->setPosition(Vec2(0, pageView->getPosition().y));
|
|
|
|
_uiLayer->addChild(swallowTouchText);
|
|
|
|
|
|
|
|
// Create the checkbox
|
|
|
|
CheckBox* checkBox1 = CheckBox::create("cocosui/check_box_normal.png",
|
|
|
|
"cocosui/check_box_normal_press.png",
|
|
|
|
"cocosui/check_box_active.png",
|
|
|
|
"cocosui/check_box_normal_disable.png",
|
|
|
|
"cocosui/check_box_active_disable.png");
|
|
|
|
checkBox1->setPosition(propagationText->getPosition() + Vec2(propagationText->getContentSize().width/2, -20));
|
|
|
|
|
|
|
|
checkBox1->setName("propagation");
|
|
|
|
_uiLayer->addChild(checkBox1);
|
|
|
|
|
|
|
|
|
|
|
|
// Create the checkbox
|
|
|
|
CheckBox* checkBox2 = CheckBox::create("cocosui/check_box_normal.png",
|
|
|
|
"cocosui/check_box_normal_press.png",
|
|
|
|
"cocosui/check_box_active.png",
|
|
|
|
"cocosui/check_box_normal_disable.png",
|
|
|
|
"cocosui/check_box_active_disable.png");
|
|
|
|
checkBox2->setPosition(swallowTouchText->getPosition() + Vec2(swallowTouchText->getContentSize().width/2, -20));
|
|
|
|
|
|
|
|
checkBox2->setName("swallow");
|
|
|
|
_uiLayer->addChild(checkBox2);
|
|
|
|
|
|
|
|
|
|
|
|
auto eventListener = EventListenerTouchOneByOne::create();
|
|
|
|
eventListener->onTouchBegan = [](Touch* touch, Event* event) -> bool{
|
2017-02-23 16:14:39 +08:00
|
|
|
CCLOG("layout receives touches");
|
2014-08-15 15:28:28 +08:00
|
|
|
return true;
|
|
|
|
};
|
|
|
|
_eventDispatcher->addEventListenerWithSceneGraphPriority(eventListener, this);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UIPageViewTouchPropagationTest::onButtonClicked(Ref* pSender, Widget::TouchEventType type)
|
|
|
|
{
|
|
|
|
Button *btn = (Button*)pSender;
|
|
|
|
CheckBox *ck1 = (CheckBox*)_uiLayer->getChildByName("propagation");
|
|
|
|
CheckBox *ck2 = (CheckBox*)_uiLayer->getChildByName("swallow");
|
|
|
|
auto pageView = (PageView*)_uiLayer->getChildByName("pageView");
|
|
|
|
|
|
|
|
if (type == Widget::TouchEventType::BEGAN)
|
|
|
|
{
|
|
|
|
if (ck1->isSelected())
|
|
|
|
{
|
|
|
|
btn->setPropagateTouchEvents(true);
|
|
|
|
pageView->setPropagateTouchEvents(true);
|
|
|
|
|
|
|
|
}else
|
|
|
|
{
|
|
|
|
btn->setPropagateTouchEvents(false);
|
|
|
|
pageView->setPropagateTouchEvents(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ck2->isSelected())
|
|
|
|
{
|
|
|
|
btn->setSwallowTouches(true);
|
|
|
|
pageView->setSwallowTouches(true);
|
|
|
|
}else
|
|
|
|
{
|
|
|
|
btn->setSwallowTouches(false);
|
|
|
|
pageView->setSwallowTouches(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (type == Widget::TouchEventType::ENDED) {
|
|
|
|
CCLOG("button clicked");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void UIPageViewTouchPropagationTest::pageViewEvent(Ref *pSender, PageView::EventType type)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case PageView::EventType::TURNING:
|
|
|
|
{
|
|
|
|
PageView* pageView = dynamic_cast<PageView*>(pSender);
|
|
|
|
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page = %ld", static_cast<long>(pageView->getCurrentPageIndex() + 1)));
|
2014-08-15 15:28:28 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-10 16:29:33 +08:00
|
|
|
// UIPageViewDynamicAddAndRemoveTest
|
|
|
|
UIPageViewDynamicAddAndRemoveTest::UIPageViewDynamicAddAndRemoveTest()
|
|
|
|
: _displayValueLabel(nullptr)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewDynamicAddAndRemoveTest::~UIPageViewDynamicAddAndRemoveTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewDynamicAddAndRemoveTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
|
|
|
Size widgetSize = _widget->getContentSize();
|
|
|
|
|
|
|
|
// Add a label in which the dragpanel events will be displayed
|
|
|
|
_displayValueLabel = Text::create("Click Buttons on the Left", "fonts/Marker Felt.ttf", 32);
|
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height * 1.5));
|
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
|
|
|
|
|
|
|
// Add the black background
|
|
|
|
Text* alert = Text::create("PageView Dynamic Modification", "fonts/Marker Felt.ttf", 30);
|
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
|
|
|
_uiLayer->addChild(alert);
|
|
|
|
|
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
|
|
|
|
|
|
|
// Create the page view
|
|
|
|
PageView* pageView = PageView::create();
|
2015-11-15 21:48:42 +08:00
|
|
|
pageView->setDirection(ui::PageView::Direction::VERTICAL);
|
2014-10-10 16:29:33 +08:00
|
|
|
pageView->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
pageView->setAnchorPoint(Vec2(0.5,0.5));
|
|
|
|
Size backgroundSize = background->getContentSize();
|
|
|
|
pageView->setPosition(Vec2(widgetSize.width / 2.0f ,widgetSize.height / 2.0f));
|
|
|
|
pageView->setBackGroundColor(Color3B::GREEN);
|
|
|
|
pageView->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
|
2015-10-28 16:22:06 +08:00
|
|
|
pageView->setIndicatorEnabled(true);
|
2015-11-15 21:48:42 +08:00
|
|
|
pageView->setIndicatorSpaceBetweenIndexNodes(10);
|
|
|
|
|
2014-10-10 16:29:33 +08:00
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
|
|
|
{
|
|
|
|
HBox* outerBox = HBox::create();
|
|
|
|
outerBox->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
|
|
|
|
for (int k = 0; k < 2; ++k)
|
|
|
|
{
|
|
|
|
VBox* innerBox = VBox::create();
|
|
|
|
|
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
{
|
|
|
|
Button *btn = Button::create("cocosui/animationbuttonnormal.png",
|
|
|
|
"cocosui/animationbuttonpressed.png");
|
|
|
|
btn->setName(StringUtils::format("button %d", j));
|
|
|
|
|
|
|
|
innerBox->addChild(btn);
|
|
|
|
}
|
|
|
|
|
|
|
|
LinearLayoutParameter *parameter = LinearLayoutParameter::create();
|
|
|
|
parameter->setMargin(Margin(0,0,100,0));
|
|
|
|
innerBox->setLayoutParameter(parameter);
|
|
|
|
|
|
|
|
outerBox->addChild(innerBox);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->insertCustomItem(outerBox, i);
|
2014-10-10 16:29:33 +08:00
|
|
|
}
|
|
|
|
|
2016-01-26 09:52:53 +08:00
|
|
|
pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewDynamicAddAndRemoveTest::pageViewEvent, this));
|
2014-10-10 16:29:33 +08:00
|
|
|
pageView->setName("pageView");
|
|
|
|
_uiLayer->addChild(pageView);
|
|
|
|
|
|
|
|
//add buttons
|
|
|
|
auto button = Button::create();
|
2016-10-27 09:45:40 +08:00
|
|
|
button->setPositionNormalized(Vec2(0.12f,0.7f));
|
2014-10-10 16:29:33 +08:00
|
|
|
button->setTitleText("Add A Page");
|
2015-01-15 10:07:23 +08:00
|
|
|
button->setZoomScale(0.3f);
|
2014-10-10 16:29:33 +08:00
|
|
|
button->setPressedActionEnabled(true);
|
|
|
|
button->setTitleColor(Color3B::RED);
|
|
|
|
button->addClickEventListener([=](Ref* sender)
|
|
|
|
{
|
|
|
|
HBox* outerBox = HBox::create();
|
|
|
|
outerBox->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
|
|
|
|
for (int k = 0; k < 2; ++k)
|
|
|
|
{
|
|
|
|
VBox* innerBox = VBox::create();
|
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
{
|
|
|
|
Button *btn = Button::create("cocosui/animationbuttonnormal.png",
|
|
|
|
"cocosui/animationbuttonpressed.png");
|
|
|
|
btn->setName(StringUtils::format("button %d", j));
|
|
|
|
innerBox->addChild(btn);
|
|
|
|
}
|
|
|
|
|
|
|
|
LinearLayoutParameter *parameter = LinearLayoutParameter::create();
|
|
|
|
parameter->setMargin(Margin(0,0,100,0));
|
|
|
|
innerBox->setLayoutParameter(parameter);
|
|
|
|
outerBox->addChild(innerBox);
|
|
|
|
}
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->pushBackCustomItem(outerBox);
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page count = %ld", static_cast<long>(pageView->getItems().size())));
|
2015-10-28 15:55:39 +08:00
|
|
|
CCLOG("current page index = %zd", pageView->getCurrentPageIndex());
|
2014-10-10 16:29:33 +08:00
|
|
|
});
|
|
|
|
_uiLayer->addChild(button);
|
|
|
|
|
|
|
|
auto button2 = Button::create();
|
2016-10-27 09:45:40 +08:00
|
|
|
button2->setPositionNormalized(Vec2(0.12f,0.5f));
|
2014-10-10 16:29:33 +08:00
|
|
|
button2->setTitleText("Remove A Page");
|
2015-01-15 10:07:23 +08:00
|
|
|
button2->setZoomScale(0.3f);
|
2014-10-10 16:29:33 +08:00
|
|
|
button2->setPressedActionEnabled(true);
|
|
|
|
button2->setTitleColor(Color3B::RED);
|
|
|
|
button2->addClickEventListener([=](Ref* sender)
|
|
|
|
{
|
2015-10-28 15:55:39 +08:00
|
|
|
if (pageView->getItems().size() > 0)
|
2014-10-10 16:29:33 +08:00
|
|
|
{
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->removeItem(pageView->getItems().size()-1);
|
2014-10-10 16:29:33 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
CCLOG("There is no page to remove!");
|
|
|
|
}
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page count = %ld", static_cast<long>(pageView->getItems().size())));
|
2015-10-28 15:55:39 +08:00
|
|
|
CCLOG("current page index = %zd", pageView->getCurrentPageIndex());
|
2014-10-10 17:36:33 +08:00
|
|
|
|
2014-10-10 16:29:33 +08:00
|
|
|
});
|
|
|
|
_uiLayer->addChild(button2);
|
|
|
|
|
|
|
|
auto button3 = Button::create();
|
2016-10-27 09:45:40 +08:00
|
|
|
button3->setPositionNormalized(Vec2(0.12f,0.3f));
|
2014-10-10 16:29:33 +08:00
|
|
|
button3->setTitleText("Remove All Pages");
|
2015-01-15 10:07:23 +08:00
|
|
|
button3->setZoomScale(0.3f);
|
2014-10-10 16:29:33 +08:00
|
|
|
button3->setPressedActionEnabled(true);
|
|
|
|
button3->setTitleColor(Color3B::RED);
|
|
|
|
button3->addClickEventListener([=](Ref* sender)
|
|
|
|
{
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->removeAllItems();
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page count = %ld", static_cast<long>(pageView->getItems().size())));
|
2015-10-28 15:55:39 +08:00
|
|
|
CCLOG("current page index = %zd", pageView->getCurrentPageIndex());
|
2014-10-10 17:36:33 +08:00
|
|
|
|
2014-10-10 16:29:33 +08:00
|
|
|
});
|
|
|
|
_uiLayer->addChild(button3);
|
|
|
|
|
2015-07-16 16:50:47 +08:00
|
|
|
auto button4 = (ui::Button*)button3->clone();
|
|
|
|
button4->setTitleText("Scroll to Page4");
|
2016-10-27 09:45:40 +08:00
|
|
|
button4->setPositionNormalized(Vec2(0.85f, 0.5f));
|
2015-07-16 16:50:47 +08:00
|
|
|
button4->addClickEventListener([=](Ref* sender){
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->scrollToItem(3);
|
|
|
|
CCLOG("current page index = %zd", pageView->getCurrentPageIndex());
|
2015-07-16 16:50:47 +08:00
|
|
|
});
|
|
|
|
_uiLayer->addChild(button4);
|
2014-10-10 16:29:33 +08:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void UIPageViewDynamicAddAndRemoveTest::pageViewEvent(Ref *pSender, PageView::EventType type)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case PageView::EventType::TURNING:
|
|
|
|
{
|
|
|
|
PageView* pageView = dynamic_cast<PageView*>(pSender);
|
|
|
|
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page = %ld", static_cast<long>((pageView->getCurrentPageIndex() + 1))));
|
2014-10-10 16:29:33 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-15 17:02:02 +08:00
|
|
|
|
|
|
|
// UIPageViewJumpToPageTest
|
|
|
|
UIPageViewJumpToPageTest::UIPageViewJumpToPageTest()
|
|
|
|
: _displayValueLabel(nullptr)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewJumpToPageTest::~UIPageViewJumpToPageTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewJumpToPageTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
|
|
|
Size widgetSize = _widget->getContentSize();
|
|
|
|
|
|
|
|
// Add a label in which the dragpanel events will be displayed
|
2015-10-28 15:55:39 +08:00
|
|
|
_displayValueLabel = Text::create("setCurrentPageIndex API Test", "fonts/Marker Felt.ttf", 32);
|
2015-07-15 17:02:02 +08:00
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height * 1.5));
|
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
|
|
|
|
|
|
|
// Add the black background
|
|
|
|
Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
|
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
|
|
|
_uiLayer->addChild(alert);
|
|
|
|
|
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
|
|
|
|
|
|
|
// Create the page view
|
|
|
|
PageView* pageView = PageView::create();
|
|
|
|
pageView->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
Size backgroundSize = background->getContentSize();
|
|
|
|
pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
|
|
|
|
(backgroundSize.width - pageView->getContentSize().width) / 2.0f,
|
|
|
|
(widgetSize.height - backgroundSize.height) / 2.0f +
|
|
|
|
(backgroundSize.height - pageView->getContentSize().height) / 2.0f));
|
2015-10-28 16:22:06 +08:00
|
|
|
pageView->setIndicatorEnabled(true);
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->removeAllItems();
|
2015-07-15 17:02:02 +08:00
|
|
|
|
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
|
|
|
{
|
|
|
|
Layout* layout = Layout::create();
|
|
|
|
layout->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
|
|
|
|
ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
|
|
|
|
imageView->setScale9Enabled(true);
|
|
|
|
imageView->setContentSize(Size(240, 130));
|
|
|
|
imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
|
|
|
layout->addChild(imageView);
|
|
|
|
|
|
|
|
Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
|
|
|
|
label->setColor(Color3B(192, 192, 192));
|
|
|
|
label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
|
|
|
layout->addChild(label);
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->insertCustomItem(layout, i);
|
2015-07-15 17:02:02 +08:00
|
|
|
}
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->setCurrentPageIndex(1);
|
2015-07-15 17:02:02 +08:00
|
|
|
|
|
|
|
//add buttons to jump to specific page
|
|
|
|
auto button1 = ui::Button::create();
|
2016-10-27 09:45:40 +08:00
|
|
|
button1->setPositionNormalized(Vec2(0.1f, 0.75f));
|
2015-07-15 17:02:02 +08:00
|
|
|
button1->setTitleText("Jump to Page1");
|
|
|
|
CCLOG("button1 content Size = %f, %f", button1->getContentSize().width,
|
|
|
|
button1->getContentSize().height);
|
|
|
|
button1->addClickEventListener([=](Ref*){
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->setCurrentPageIndex(0);
|
2015-07-15 17:02:02 +08:00
|
|
|
});
|
|
|
|
_uiLayer->addChild(button1);
|
|
|
|
|
|
|
|
auto button2 = static_cast<ui::Button*>(button1->clone());
|
|
|
|
button2->setTitleText("Jump to Page2");
|
2016-10-27 09:45:40 +08:00
|
|
|
button2->setPositionNormalized(Vec2(0.1f, 0.65f));
|
2015-07-15 17:02:02 +08:00
|
|
|
CCLOG("button2 content Size = %f, %f", button2->getContentSize().width,
|
|
|
|
button2->getContentSize().height);
|
|
|
|
button2->addClickEventListener([=](Ref*){
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->setCurrentPageIndex(1);
|
2015-07-15 17:02:02 +08:00
|
|
|
});
|
|
|
|
_uiLayer->addChild(button2);
|
|
|
|
|
|
|
|
auto button3 = static_cast<ui::Button*>(button2->clone());
|
|
|
|
button3->setTitleText("Jump to Page3");
|
2016-10-27 09:45:40 +08:00
|
|
|
button3->setPositionNormalized(Vec2(0.9f, 0.75f));
|
2015-07-15 17:02:02 +08:00
|
|
|
button3->addClickEventListener([=](Ref*){
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->setCurrentPageIndex(2);
|
2015-07-15 17:02:02 +08:00
|
|
|
});
|
|
|
|
_uiLayer->addChild(button3);
|
|
|
|
|
|
|
|
auto button4 = static_cast<ui::Button*>(button2->clone());
|
|
|
|
button4->setTitleText("Jump to Page4");
|
2016-10-27 09:45:40 +08:00
|
|
|
button4->setPositionNormalized(Vec2(0.9f, 0.65f));
|
2015-07-15 17:02:02 +08:00
|
|
|
button4->addClickEventListener([=](Ref*){
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->setCurrentPageIndex(3);
|
2015-07-15 17:02:02 +08:00
|
|
|
});
|
|
|
|
_uiLayer->addChild(button4);
|
|
|
|
_uiLayer->addChild(pageView);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
2015-08-01 18:18:46 +08:00
|
|
|
|
|
|
|
// UIPageViewVerticalTest
|
|
|
|
UIPageViewVerticalTest::UIPageViewVerticalTest()
|
|
|
|
: _displayValueLabel(nullptr)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewVerticalTest::~UIPageViewVerticalTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewVerticalTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
|
|
|
Size widgetSize = _widget->getContentSize();
|
|
|
|
|
|
|
|
// Add a label in which the dragpanel events will be displayed
|
|
|
|
_displayValueLabel = Text::create("Move by Vertical direction", "fonts/Marker Felt.ttf", 32);
|
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height * 1.5));
|
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
|
|
|
|
|
|
|
// Add the black background
|
|
|
|
Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
|
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
|
|
|
_uiLayer->addChild(alert);
|
|
|
|
|
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
|
|
|
|
|
|
|
// Create the page view
|
|
|
|
PageView* pageView = PageView::create();
|
2015-10-28 16:22:06 +08:00
|
|
|
pageView->setIndicatorEnabled(true);
|
2015-10-14 09:16:34 +08:00
|
|
|
pageView->setDirection(ui::PageView::Direction::VERTICAL);
|
2015-08-01 18:18:46 +08:00
|
|
|
pageView->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
Size backgroundSize = background->getContentSize();
|
2015-11-15 21:48:42 +08:00
|
|
|
pageView->setPosition((widgetSize - pageView->getContentSize()) / 2.0f);
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->removeAllItems();
|
2015-08-01 18:18:46 +08:00
|
|
|
|
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
|
|
|
{
|
|
|
|
Layout* layout = Layout::create();
|
|
|
|
layout->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
|
|
|
|
ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
|
|
|
|
imageView->setScale9Enabled(true);
|
|
|
|
imageView->setContentSize(Size(240, 130));
|
|
|
|
imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
|
|
|
layout->addChild(imageView);
|
|
|
|
|
|
|
|
Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
|
|
|
|
label->setColor(Color3B(192, 192, 192));
|
|
|
|
label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
|
|
|
layout->addChild(label);
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->insertCustomItem(layout, i);
|
2015-08-01 18:18:46 +08:00
|
|
|
}
|
|
|
|
|
2016-01-26 09:52:53 +08:00
|
|
|
pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewVerticalTest::pageViewEvent, this));
|
2015-08-01 18:18:46 +08:00
|
|
|
|
|
|
|
_uiLayer->addChild(pageView);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UIPageViewVerticalTest::pageViewEvent(Ref *pSender, PageView::EventType type)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case PageView::EventType::TURNING:
|
|
|
|
{
|
|
|
|
PageView* pageView = dynamic_cast<PageView*>(pSender);
|
|
|
|
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page = %ld", static_cast<long>(pageView->getCurrentPageIndex() + 1)));
|
2015-08-01 18:18:46 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-06 22:50:53 +08:00
|
|
|
// UIPageViewDisableTouchTest
|
|
|
|
UIPageViewDisableTouchTest::UIPageViewDisableTouchTest()
|
|
|
|
: _displayValueLabel(nullptr)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewDisableTouchTest::~UIPageViewDisableTouchTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewDisableTouchTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
|
|
|
Size widgetSize = _widget->getContentSize();
|
|
|
|
|
|
|
|
// Add a label in which the dragpanel events will be displayed
|
|
|
|
_displayValueLabel = Text::create("PageView disable touch", "fonts/Marker Felt.ttf", 32);
|
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height * 1.5));
|
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
|
|
|
|
|
|
|
// Add the black background
|
|
|
|
Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
|
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
|
|
|
_uiLayer->addChild(alert);
|
|
|
|
|
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
|
|
|
|
|
|
|
// Create the page view
|
|
|
|
PageView* pageView = PageView::create();
|
|
|
|
pageView->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
Size backgroundSize = background->getContentSize();
|
|
|
|
pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
|
|
|
|
(backgroundSize.width - pageView->getContentSize().width) / 2.0f,
|
|
|
|
(widgetSize.height - backgroundSize.height) / 2.0f +
|
|
|
|
(backgroundSize.height - pageView->getContentSize().height) / 2.0f));
|
|
|
|
pageView->setDirection(ui::PageView::Direction::VERTICAL);
|
|
|
|
pageView->setTouchEnabled(false);
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->removeAllItems();
|
2015-08-06 22:50:53 +08:00
|
|
|
|
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
|
|
|
{
|
|
|
|
Layout* layout = Layout::create();
|
|
|
|
layout->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
|
|
|
|
ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
|
|
|
|
imageView->setScale9Enabled(true);
|
|
|
|
imageView->setContentSize(Size(240, 130));
|
|
|
|
imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
|
|
|
layout->addChild(imageView);
|
|
|
|
|
|
|
|
Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
|
|
|
|
label->setColor(Color3B(192, 192, 192));
|
|
|
|
label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
|
|
|
layout->addChild(label);
|
|
|
|
|
2015-10-28 15:55:39 +08:00
|
|
|
pageView->insertCustomItem(layout, i);
|
2015-08-06 22:50:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
_uiLayer->addChild(pageView);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-12-14 15:29:02 +08:00
|
|
|
// UIPageViewTest
|
|
|
|
UIPageViewChildSizeTest::UIPageViewChildSizeTest()
|
|
|
|
: _displayValueLabel(nullptr)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewChildSizeTest::~UIPageViewChildSizeTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewChildSizeTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
|
|
|
Size widgetSize = _widget->getContentSize();
|
|
|
|
|
|
|
|
// Add a label in which the dragpanel events will be displayed
|
|
|
|
_displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
|
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height * 1.5));
|
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
|
|
|
|
|
|
|
// Add the black background
|
|
|
|
Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
|
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
|
|
|
_uiLayer->addChild(alert);
|
|
|
|
|
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
|
|
|
|
|
|
|
// Create the page view
|
|
|
|
Size size(240, 130);
|
|
|
|
PageView* pageView = PageView::create();
|
|
|
|
pageView->setDirection(PageView::Direction::HORIZONTAL);
|
|
|
|
pageView->setContentSize(size);
|
|
|
|
Size backgroundSize = background->getContentSize();
|
|
|
|
pageView->setPosition((widgetSize - pageView->getContentSize()) / 2.0f);
|
|
|
|
pageView->removeAllItems();
|
|
|
|
pageView->setIndicatorEnabled(true);
|
|
|
|
|
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
|
|
|
{
|
|
|
|
ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
|
|
|
|
imageView->setScale9Enabled(true);
|
|
|
|
|
|
|
|
Text* label = Text::create(StringUtils::format("page %d", (i + 1)), "fonts/Marker Felt.ttf", 30);
|
|
|
|
label->setColor(Color3B(192, 192, 192));
|
|
|
|
label->setAnchorPoint(Vec2::ZERO);
|
|
|
|
imageView->addChild(label);
|
|
|
|
|
|
|
|
pageView->insertCustomItem(imageView, i);
|
|
|
|
}
|
|
|
|
|
2016-01-26 09:52:53 +08:00
|
|
|
pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewChildSizeTest::pageViewEvent, this));
|
2015-12-14 15:29:02 +08:00
|
|
|
|
|
|
|
_uiLayer->addChild(pageView);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UIPageViewChildSizeTest::pageViewEvent(Ref *pSender, PageView::EventType type)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case PageView::EventType::TURNING:
|
|
|
|
{
|
|
|
|
PageView* pageView = dynamic_cast<PageView*>(pSender);
|
|
|
|
|
2016-04-18 17:52:58 +08:00
|
|
|
_displayValueLabel->setString(StringUtils::format("page = %ld", static_cast<long>(pageView->getCurrentPageIndex() + 1)));
|
2015-12-14 15:29:02 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-11 17:29:02 +08:00
|
|
|
// UIPageViewIndicatorTest
|
|
|
|
UIPageViewIndicatorTest::UIPageViewIndicatorTest()
|
|
|
|
: _displayValueLabel(nullptr)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
UIPageViewIndicatorTest::~UIPageViewIndicatorTest()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UIPageViewIndicatorTest::init()
|
|
|
|
{
|
|
|
|
if (UIScene::init())
|
|
|
|
{
|
|
|
|
Size widgetSize = _widget->getContentSize();
|
|
|
|
|
|
|
|
// Add a label in which the dragpanel events will be displayed
|
2017-02-23 16:14:39 +08:00
|
|
|
_displayValueLabel = Text::create("PageView indicator custom texture\nscale : 0.5, index color: RED", "fonts/Marker Felt.ttf", 16);
|
2016-04-11 17:29:02 +08:00
|
|
|
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
|
|
|
|
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
|
|
|
|
widgetSize.height / 2.0f +
|
|
|
|
_displayValueLabel->getContentSize().height));
|
|
|
|
_uiLayer->addChild(_displayValueLabel);
|
|
|
|
|
|
|
|
// Add the black background
|
|
|
|
Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
|
|
|
|
alert->setColor(Color3B(159, 168, 176));
|
|
|
|
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
|
|
|
|
_uiLayer->addChild(alert);
|
|
|
|
|
|
|
|
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
|
|
|
|
|
|
|
|
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
|
|
|
|
|
|
|
|
// Create the page view
|
|
|
|
PageView* pageView = PageView::create();
|
|
|
|
pageView->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
Size backgroundSize = background->getContentSize();
|
|
|
|
pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
|
|
|
|
(backgroundSize.width - pageView->getContentSize().width) / 2.0f,
|
|
|
|
(widgetSize.height - backgroundSize.height) / 2.0f +
|
|
|
|
(backgroundSize.height - pageView->getContentSize().height) / 2.0f));
|
|
|
|
pageView->setDirection(ui::PageView::Direction::VERTICAL);
|
|
|
|
pageView->removeAllItems();
|
|
|
|
|
|
|
|
pageView->setIndicatorEnabled(true);
|
|
|
|
pageView->setIndicatorSpaceBetweenIndexNodes(5);
|
|
|
|
pageView->setIndicatorIndexNodesScale(0.5);
|
|
|
|
pageView->setIndicatorIndexNodesTexture("cocosui/green_edit.png");
|
|
|
|
pageView->setIndicatorIndexNodesColor(Color3B::RED);
|
|
|
|
|
|
|
|
int pageCount = 4;
|
|
|
|
for (int i = 0; i < pageCount; ++i)
|
|
|
|
{
|
|
|
|
Layout* layout = Layout::create();
|
|
|
|
layout->setContentSize(Size(240.0f, 130.0f));
|
|
|
|
|
|
|
|
ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
|
|
|
|
imageView->setScale9Enabled(true);
|
|
|
|
imageView->setContentSize(Size(240, 130));
|
|
|
|
imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
|
|
|
layout->addChild(imageView);
|
|
|
|
|
|
|
|
Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
|
|
|
|
label->setColor(Color3B(192, 192, 192));
|
|
|
|
label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
|
|
|
|
layout->addChild(label);
|
|
|
|
|
|
|
|
pageView->insertCustomItem(layout, i);
|
|
|
|
}
|
|
|
|
|
|
|
|
_uiLayer->addChild(pageView);
|
|
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|