2012-04-19 14:35:52 +08:00
|
|
|
/****************************************************************************
|
2014-01-07 11:25:07 +08:00
|
|
|
Copyright (c) 2009-2010 Ricardo Quesada
|
2012-09-24 21:22:20 +08:00
|
|
|
Copyright (c) 2010-2012 cocos2d-x.org
|
2012-04-19 14:35:52 +08:00
|
|
|
Copyright (c) 2011 Zynga Inc.
|
2018-01-29 16:25:32 +08:00
|
|
|
Copyright (c) 2013-2016 Chukong Technologies Inc.
|
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
http://www.cocos2d-x.org
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
|
|
in the Software without restriction, including without limitation the rights
|
|
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
THE SOFTWARE.
|
|
|
|
****************************************************************************/
|
|
|
|
|
2014-05-01 10:09:13 +08:00
|
|
|
#include "2d/CCTransition.h"
|
2014-04-27 01:11:22 +08:00
|
|
|
#include "2d/CCActionInterval.h"
|
|
|
|
#include "2d/CCActionInstant.h"
|
|
|
|
#include "2d/CCActionEase.h"
|
|
|
|
#include "2d/CCActionCamera.h"
|
|
|
|
#include "2d/CCActionTiledGrid.h"
|
|
|
|
#include "2d/CCActionGrid.h"
|
|
|
|
#include "2d/CCLayer.h"
|
2014-05-01 10:09:13 +08:00
|
|
|
#include "2d/CCRenderTexture.h"
|
|
|
|
#include "2d/CCNodeGrid.h"
|
2014-08-26 18:19:28 +08:00
|
|
|
#include "base/CCDirector.h"
|
|
|
|
#include "base/CCEventDispatcher.h"
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
NS_CC_BEGIN
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2011-07-08 15:38:32 +08:00
|
|
|
const unsigned int kSceneFade = 0xFADEFADE;
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::TransitionScene()
|
2014-04-10 19:29:07 +08:00
|
|
|
: _inScene(nullptr)
|
|
|
|
, _outScene(nullptr)
|
|
|
|
, _duration(0.0f)
|
|
|
|
, _isInSceneOnTop(false)
|
|
|
|
, _isSendCleanupToScene(false)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2014-04-10 19:29:07 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::~TransitionScene()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2014-04-10 19:29:07 +08:00
|
|
|
CC_SAFE_RELEASE(_inScene);
|
|
|
|
CC_SAFE_RELEASE(_outScene);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene * TransitionScene::create(float t, Scene *scene)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionScene * pScene = new (std::nothrow) TransitionScene();
|
2012-04-19 14:35:52 +08:00
|
|
|
if(pScene && pScene->initWithDuration(t,scene))
|
|
|
|
{
|
|
|
|
pScene->autorelease();
|
|
|
|
return pScene;
|
|
|
|
}
|
|
|
|
CC_SAFE_DELETE(pScene);
|
2013-12-18 17:47:20 +08:00
|
|
|
return nullptr;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
bool TransitionScene::initWithDuration(float t, Scene *scene)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2015-12-24 00:54:00 +08:00
|
|
|
CCASSERT(scene != nullptr, "Argument scene must be non-nil");
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
if (Scene::init())
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_duration = t;
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// retain
|
2016-01-24 19:40:44 +08:00
|
|
|
#if CC_ENABLE_GC_FOR_NATIVE_OBJECTS
|
|
|
|
auto sEngine = ScriptEngineManager::getInstance()->getScriptEngine();
|
2016-02-16 13:43:11 +08:00
|
|
|
if (sEngine)
|
|
|
|
{
|
|
|
|
sEngine->retainScriptObject(this, scene);
|
|
|
|
}
|
2016-01-24 19:40:44 +08:00
|
|
|
#endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene = scene;
|
|
|
|
_inScene->retain();
|
2013-07-12 06:24:23 +08:00
|
|
|
_outScene = Director::getInstance()->getRunningScene();
|
2013-12-18 17:47:20 +08:00
|
|
|
if (_outScene == nullptr)
|
2012-06-01 15:54:17 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
_outScene = Scene::create();
|
2017-09-20 09:05:00 +08:00
|
|
|
// just change its state is running that can run actions later
|
2017-03-08 14:26:58 +08:00
|
|
|
// issue: https://github.com/cocos2d/cocos2d-x/issues/17442
|
|
|
|
_outScene->onEnter();
|
2012-06-01 15:54:17 +08:00
|
|
|
}
|
2013-06-15 14:03:30 +08:00
|
|
|
_outScene->retain();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-07-20 13:01:27 +08:00
|
|
|
CCASSERT( _inScene != _outScene, "Incoming scene must be different from the outgoing scene" );
|
2013-03-01 15:30:40 +08:00
|
|
|
|
|
|
|
sceneOrder();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionScene::sceneOrder()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isInSceneOnTop = true;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
void TransitionScene::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
Scene::draw(renderer, transform, flags);
|
2011-07-12 11:20:41 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
if( _isInSceneOnTop ) {
|
2014-05-31 07:42:05 +08:00
|
|
|
_outScene->visit(renderer, transform, flags);
|
|
|
|
_inScene->visit(renderer, transform, flags);
|
2012-04-19 14:35:52 +08:00
|
|
|
} else {
|
2014-05-31 07:42:05 +08:00
|
|
|
_inScene->visit(renderer, transform, flags);
|
|
|
|
_outScene->visit(renderer, transform, flags);
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionScene::finish()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-12-21 11:19:24 +08:00
|
|
|
// clean up
|
|
|
|
_inScene->setVisible(true);
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(0,0);
|
2013-12-21 11:19:24 +08:00
|
|
|
_inScene->setScale(1.0f);
|
|
|
|
_inScene->setRotation(0.0f);
|
2014-03-02 00:26:54 +08:00
|
|
|
_inScene->setAdditionalTransform(nullptr);
|
2013-12-21 11:19:24 +08:00
|
|
|
|
|
|
|
_outScene->setVisible(false);
|
2014-08-28 11:41:18 +08:00
|
|
|
_outScene->setPosition(0,0);
|
2013-12-21 11:19:24 +08:00
|
|
|
_outScene->setScale(1.0f);
|
|
|
|
_outScene->setRotation(0.0f);
|
2014-03-02 00:26:54 +08:00
|
|
|
_outScene->setAdditionalTransform(nullptr);
|
2010-07-21 11:13:32 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
//[self schedule:@selector(setNewScene:) interval:0];
|
2014-10-04 00:38:36 +08:00
|
|
|
this->schedule(CC_SCHEDULE_SELECTOR(TransitionScene::setNewScene), 0);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
void TransitionScene::setNewScene(float /*dt*/)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2014-10-04 00:38:36 +08:00
|
|
|
this->unschedule(CC_SCHEDULE_SELECTOR(TransitionScene::setNewScene));
|
2013-02-26 17:12:57 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// Before replacing, save the "send cleanup to scene"
|
2013-07-12 06:24:23 +08:00
|
|
|
Director *director = Director::getInstance();
|
2013-06-15 14:03:30 +08:00
|
|
|
_isSendCleanupToScene = director->isSendCleanupToScene();
|
2013-02-26 17:12:57 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
director->replaceScene(_inScene);
|
2016-01-24 19:40:44 +08:00
|
|
|
#if CC_ENABLE_GC_FOR_NATIVE_OBJECTS
|
|
|
|
auto sEngine = ScriptEngineManager::getInstance()->getScriptEngine();
|
2016-02-16 13:43:11 +08:00
|
|
|
if (sEngine)
|
|
|
|
{
|
|
|
|
sEngine->releaseScriptObject(this, _inScene);
|
|
|
|
}
|
2016-01-24 19:40:44 +08:00
|
|
|
#endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS
|
2013-02-26 17:12:57 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// issue #267
|
2013-06-15 14:03:30 +08:00
|
|
|
_outScene->setVisible(true);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionScene::hideOutShowIn()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setVisible(true);
|
|
|
|
_outScene->setVisible(false);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// custom onEnter
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionScene::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2015-07-28 18:24:03 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript)
|
|
|
|
{
|
|
|
|
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter))
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // #if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
Scene::onEnter();
|
2013-02-26 17:12:57 +08:00
|
|
|
|
|
|
|
// disable events while transitions
|
2013-10-26 15:04:01 +08:00
|
|
|
_eventDispatcher->setEnabled(false);
|
2013-02-26 17:12:57 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// outScene should not receive the onEnter callback
|
2013-02-26 17:12:57 +08:00
|
|
|
// only the onExitTransitionDidStart
|
2013-06-15 14:03:30 +08:00
|
|
|
_outScene->onExitTransitionDidStart();
|
2013-02-26 17:12:57 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->onEnter();
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// custom onExit
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionScene::onExit()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2015-07-28 18:24:03 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript)
|
|
|
|
{
|
|
|
|
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit))
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // #if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
Scene::onExit();
|
2013-02-26 17:12:57 +08:00
|
|
|
|
|
|
|
// enable events while transitions
|
2013-10-26 15:04:01 +08:00
|
|
|
_eventDispatcher->setEnabled(true);
|
2013-06-15 14:03:30 +08:00
|
|
|
_outScene->onExit();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
// _inScene should not receive the onEnter callback
|
2012-04-19 14:35:52 +08:00
|
|
|
// only the onEnterTransitionDidFinish
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->onEnterTransitionDidFinish();
|
2016-01-08 02:52:03 +08:00
|
|
|
|
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (ScriptEngineManager::getInstance()->getScriptEngine())
|
|
|
|
ScriptEngineManager::getInstance()->getScriptEngine()->garbageCollect();
|
|
|
|
#endif // CC_ENABLE_SCRIPT_BINDING
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// custom cleanup
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionScene::cleanup()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2015-07-16 14:09:26 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript)
|
|
|
|
{
|
2015-07-28 18:24:03 +08:00
|
|
|
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnCleanup))
|
2015-07-16 14:09:26 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // #if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
Scene::cleanup();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
if( _isSendCleanupToScene )
|
|
|
|
_outScene->cleanup();
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// Oriented Transition
|
|
|
|
//
|
2012-06-14 15:13:16 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSceneOriented::TransitionSceneOriented()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2012-06-14 15:13:16 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSceneOriented::~TransitionSceneOriented()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-07-25 20:50:39 +08:00
|
|
|
TransitionSceneOriented * TransitionSceneOriented::create(float t, Scene *scene, Orientation orientation)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionSceneOriented * newScene = new (std::nothrow) TransitionSceneOriented();
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->initWithDuration(t,scene,orientation);
|
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 20:50:39 +08:00
|
|
|
bool TransitionSceneOriented::initWithDuration(float t, Scene *scene, Orientation orientation)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
if ( TransitionScene::initWithDuration(t, scene) )
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_orientation = orientation;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
return true;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// RotoZoom
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionRotoZoom::TransitionRotoZoom()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2012-06-14 15:13:16 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionRotoZoom* TransitionRotoZoom::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionRotoZoom* newScene = new (std::nothrow) TransitionRotoZoom();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionRotoZoom::~TransitionRotoZoom()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionRotoZoom:: onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setScale(0.001f);
|
|
|
|
_outScene->setScale(1.0f);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
_inScene->setAnchorPoint(Vec2(0.5f, 0.5f));
|
|
|
|
_outScene->setAnchorPoint(Vec2(0.5f, 0.5f));
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto rotozoom = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Spawn::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
ScaleBy::create(_duration/2, 0.001f),
|
|
|
|
RotateBy::create(_duration/2, 360 * 2),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
),
|
2013-06-20 14:13:12 +08:00
|
|
|
DelayTime::create(_duration/2),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2016-08-22 09:39:58 +08:00
|
|
|
);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_outScene->runAction(rotozoom);
|
|
|
|
_inScene->runAction
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
rotozoom->reverse(),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
)
|
|
|
|
);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// JumpZoom
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionJumpZoom::TransitionJumpZoom()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionJumpZoom::~TransitionJumpZoom()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionJumpZoom* TransitionJumpZoom::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionJumpZoom* newScene = new (std::nothrow) TransitionJumpZoom();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionJumpZoom::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setScale(0.5f);
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(s.width, 0);
|
2014-05-15 01:07:09 +08:00
|
|
|
_inScene->setAnchorPoint(Vec2(0.5f, 0.5f));
|
|
|
|
_outScene->setAnchorPoint(Vec2(0.5f, 0.5f));
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
ActionInterval *jump = JumpBy::create(_duration/4, Vec2(-s.width,0), s.width/4, 2);
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval *scaleIn = ScaleTo::create(_duration/4, 1.0f);
|
|
|
|
ActionInterval *scaleOut = ScaleTo::create(_duration/4, 0.5f);
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto jumpZoomOut = Sequence::create(scaleOut, jump, nullptr);
|
|
|
|
auto jumpZoomIn = Sequence::create(jump, scaleIn, nullptr);
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval *delay = DelayTime::create(_duration/2);
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_outScene->runAction(jumpZoomOut);
|
|
|
|
_inScene->runAction
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
delay,
|
|
|
|
jumpZoomIn,
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
)
|
|
|
|
);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// MoveInL
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInL::TransitionMoveInL()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2012-06-14 15:13:16 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInL::~TransitionMoveInL()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInL* TransitionMoveInL::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionMoveInL* newScene = new (std::nothrow) TransitionMoveInL();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionMoveInL::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
this->initScenes();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval *a = this->action();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->runAction
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
this->easeActionWithAction(a),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
)
|
|
|
|
);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionMoveInL::action()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2014-05-15 01:07:09 +08:00
|
|
|
return MoveTo::create(_duration, Vec2(0,0));
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionMoveInL::easeActionWithAction(ActionInterval* action)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return EaseOut::create(action, 2.0f);
|
2012-04-19 14:35:52 +08:00
|
|
|
// return [EaseElasticOut actionWithAction:action period:0.4f];
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionMoveInL::initScenes()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(-s.width,0);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// MoveInR
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInR::TransitionMoveInR()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInR::~TransitionMoveInR()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInR* TransitionMoveInR::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionMoveInR* newScene = new (std::nothrow) TransitionMoveInR();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionMoveInR::initScenes()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(s.width,0);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// MoveInT
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInT::TransitionMoveInT()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInT::~TransitionMoveInT()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInT* TransitionMoveInT::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionMoveInT* newScene = new (std::nothrow) TransitionMoveInT();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionMoveInT::initScenes()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(0,s.height);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// MoveInB
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInB::TransitionMoveInB()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInB::~TransitionMoveInB()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionMoveInB* TransitionMoveInB::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionMoveInB* newScene = new (std::nothrow) TransitionMoveInB();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionMoveInB::initScenes()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(0,-s.height);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// SlideInL
|
|
|
|
//
|
|
|
|
|
|
|
|
// The adjust factor is needed to prevent issue #442
|
|
|
|
// One solution is to use DONT_RENDER_IN_SUBPIXELS images, but NO
|
|
|
|
// The other issue is that in some transitions (and I don't know why)
|
|
|
|
// the order should be reversed (In in top of Out or vice-versa).
|
|
|
|
#define ADJUST_FACTOR 0.5f
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInL::TransitionSlideInL()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2012-11-01 22:12:13 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInL::~TransitionSlideInL()
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInL::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
this->initScenes();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval *in = this->action();
|
|
|
|
ActionInterval *out = this->action();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* inAction = easeActionWithAction(in);
|
2016-08-22 09:39:58 +08:00
|
|
|
ActionInterval* outAction = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
easeActionWithAction(out),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->runAction(inAction);
|
|
|
|
_outScene->runAction(outAction);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInL::sceneOrder()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isInSceneOnTop = false;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInL:: initScenes()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(-(s.width-ADJUST_FACTOR),0);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionSlideInL::action()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-05-15 01:07:09 +08:00
|
|
|
return MoveBy::create(_duration, Vec2(s.width-ADJUST_FACTOR,0));
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionSlideInL::easeActionWithAction(ActionInterval* action)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return EaseOut::create(action, 2.0f);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInL* TransitionSlideInL::create(float t, Scene* scene)
|
2012-12-06 18:51:33 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionSlideInL* newScene = new (std::nothrow) TransitionSlideInL();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-12-06 18:51:33 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-12-06 18:51:33 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-12-06 18:51:33 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
|
|
|
//
|
|
|
|
// SlideInR
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInR::TransitionSlideInR()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInR::~TransitionSlideInR()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInR* TransitionSlideInR::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionSlideInR* newScene = new (std::nothrow) TransitionSlideInR();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInR::sceneOrder()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isInSceneOnTop = true;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInR::initScenes()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(s.width-ADJUST_FACTOR,0);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionSlideInR:: action()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-05-15 01:07:09 +08:00
|
|
|
return MoveBy::create(_duration, Vec2(-(s.width-ADJUST_FACTOR),0));
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// SlideInT
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInT::TransitionSlideInT()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInT::~TransitionSlideInT()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInT* TransitionSlideInT::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionSlideInT* newScene = new (std::nothrow) TransitionSlideInT();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInT::sceneOrder()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isInSceneOnTop = false;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInT::initScenes()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(0,s.height-ADJUST_FACTOR);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionSlideInT::action()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-05-15 01:07:09 +08:00
|
|
|
return MoveBy::create(_duration, Vec2(0,-(s.height-ADJUST_FACTOR)));
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// SlideInB
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInB::TransitionSlideInB()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInB::~TransitionSlideInB()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSlideInB* TransitionSlideInB::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionSlideInB* newScene = new (std::nothrow) TransitionSlideInB();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInB::sceneOrder()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isInSceneOnTop = true;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSlideInB:: initScenes()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-08-28 11:41:18 +08:00
|
|
|
_inScene->setPosition(0,-(s.height-ADJUST_FACTOR));
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionSlideInB:: action()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2014-05-15 01:07:09 +08:00
|
|
|
return MoveBy::create(_duration, Vec2(0,s.height-ADJUST_FACTOR));
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// ShrinkGrow Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionShrinkGrow::TransitionShrinkGrow()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionShrinkGrow::~TransitionShrinkGrow()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionShrinkGrow* TransitionShrinkGrow::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionShrinkGrow* newScene = new (std::nothrow) TransitionShrinkGrow();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionShrinkGrow::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setScale(0.001f);
|
|
|
|
_outScene->setScale(1.0f);
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
_inScene->setAnchorPoint(Vec2(2/3.0f,0.5f));
|
|
|
|
_outScene->setAnchorPoint(Vec2(1/3.0f,0.5f));
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* scaleOut = ScaleTo::create(_duration, 0.01f);
|
|
|
|
ActionInterval* scaleIn = ScaleTo::create(_duration, 1.0f);
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->runAction(this->easeActionWithAction(scaleIn));
|
|
|
|
_outScene->runAction
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
this->easeActionWithAction(scaleOut),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
)
|
|
|
|
);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionShrinkGrow:: easeActionWithAction(ActionInterval* action)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return EaseOut::create(action, 2.0f);
|
2012-04-19 14:35:52 +08:00
|
|
|
// return [EaseElasticOut actionWithAction:action period:0.3f];
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// FlipX Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipX::TransitionFlipX()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipX::~TransitionFlipX()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionFlipX::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSceneOriented::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setVisible(false);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
float inDeltaZ, inAngleZ;
|
|
|
|
float outDeltaZ, outAngleZ;
|
|
|
|
|
2013-07-26 05:49:43 +08:00
|
|
|
if( _orientation == TransitionScene::Orientation::RIGHT_OVER )
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
inDeltaZ = 90;
|
|
|
|
inAngleZ = 270;
|
|
|
|
outDeltaZ = 90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
inDeltaZ = -90;
|
|
|
|
inAngleZ = 90;
|
|
|
|
outDeltaZ = -90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto inA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
DelayTime::create(_duration/2),
|
|
|
|
Show::create(),
|
|
|
|
OrbitCamera::create(_duration/2, 1, 0, inAngleZ, inDeltaZ, 0, 0),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto outA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0, outAngleZ, outDeltaZ, 0, 0),
|
|
|
|
Hide::create(),
|
|
|
|
DelayTime::create(_duration/2),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->runAction(inA);
|
|
|
|
_outScene->runAction(outA);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 20:50:39 +08:00
|
|
|
TransitionFlipX* TransitionFlipX::create(float t, Scene* s, Orientation o)
|
2010-08-20 14:35:37 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionFlipX* newScene = new (std::nothrow) TransitionFlipX();
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->initWithDuration(t, s, o);
|
|
|
|
newScene->autorelease();
|
2010-08-20 14:35:37 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
return newScene;
|
2010-08-20 14:35:37 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipX* TransitionFlipX::create(float t, Scene* s)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-07-26 05:49:43 +08:00
|
|
|
return TransitionFlipX::create(t, s, TransitionScene::Orientation::RIGHT_OVER);
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
//
|
|
|
|
// FlipY Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipY::TransitionFlipY()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipY::~TransitionFlipY()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionFlipY::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSceneOriented::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setVisible(false);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
float inDeltaZ, inAngleZ;
|
|
|
|
float outDeltaZ, outAngleZ;
|
|
|
|
|
2013-07-26 05:49:43 +08:00
|
|
|
if( _orientation == TransitionScene::Orientation::UP_OVER )
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
inDeltaZ = 90;
|
|
|
|
inAngleZ = 270;
|
|
|
|
outDeltaZ = 90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
inDeltaZ = -90;
|
|
|
|
inAngleZ = 90;
|
|
|
|
outDeltaZ = -90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto inA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
DelayTime::create(_duration/2),
|
|
|
|
Show::create(),
|
|
|
|
OrbitCamera::create(_duration/2, 1, 0, inAngleZ, inDeltaZ, 90, 0),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
2016-08-22 09:39:58 +08:00
|
|
|
auto outA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0, outAngleZ, outDeltaZ, 90, 0),
|
|
|
|
Hide::create(),
|
|
|
|
DelayTime::create(_duration/2),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->runAction(inA);
|
|
|
|
_outScene->runAction(outA);
|
2010-08-18 11:06:48 +08:00
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 20:50:39 +08:00
|
|
|
TransitionFlipY* TransitionFlipY::create(float t, Scene* s, Orientation o)
|
2010-08-20 14:35:37 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionFlipY* newScene = new (std::nothrow) TransitionFlipY();
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->initWithDuration(t, s, o);
|
|
|
|
newScene->autorelease();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
return newScene;
|
2010-08-20 14:35:37 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipY* TransitionFlipY::create(float t, Scene* s)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-07-26 05:49:43 +08:00
|
|
|
return TransitionFlipY::create(t, s, TransitionScene::Orientation::UP_OVER);
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
//
|
|
|
|
// FlipAngular Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipAngular::TransitionFlipAngular()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2012-06-14 15:13:16 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipAngular::~TransitionFlipAngular()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionFlipAngular::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSceneOriented::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setVisible(false);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
float inDeltaZ, inAngleZ;
|
|
|
|
float outDeltaZ, outAngleZ;
|
|
|
|
|
2013-07-26 05:49:43 +08:00
|
|
|
if( _orientation == TransitionScene::Orientation::RIGHT_OVER )
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
inDeltaZ = 90;
|
|
|
|
inAngleZ = 270;
|
|
|
|
outDeltaZ = 90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
inDeltaZ = -90;
|
|
|
|
inAngleZ = 90;
|
|
|
|
outDeltaZ = -90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto inA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
DelayTime::create(_duration/2),
|
|
|
|
Show::create(),
|
|
|
|
OrbitCamera::create(_duration/2, 1, 0, inAngleZ, inDeltaZ, -45, 0),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
2016-08-22 09:39:58 +08:00
|
|
|
auto outA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0, outAngleZ, outDeltaZ, 45, 0),
|
|
|
|
Hide::create(),
|
|
|
|
DelayTime::create(_duration/2),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->runAction(inA);
|
|
|
|
_outScene->runAction(outA);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 20:50:39 +08:00
|
|
|
TransitionFlipAngular* TransitionFlipAngular::create(float t, Scene* s, Orientation o)
|
2010-08-20 14:35:37 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionFlipAngular* newScene = new (std::nothrow) TransitionFlipAngular();
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->initWithDuration(t, s, o);
|
|
|
|
newScene->autorelease();
|
2010-08-20 14:35:37 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
return newScene;
|
2010-08-20 14:35:37 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFlipAngular* TransitionFlipAngular::create(float t, Scene* s)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-07-26 05:49:43 +08:00
|
|
|
return TransitionFlipAngular::create(t, s, TransitionScene::Orientation::RIGHT_OVER);
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
//
|
|
|
|
// ZoomFlipX Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipX::TransitionZoomFlipX()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipX::~TransitionZoomFlipX()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionZoomFlipX::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSceneOriented::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setVisible(false);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
float inDeltaZ, inAngleZ;
|
|
|
|
float outDeltaZ, outAngleZ;
|
|
|
|
|
2013-07-26 05:49:43 +08:00
|
|
|
if( _orientation == TransitionScene::Orientation::RIGHT_OVER ) {
|
2012-04-19 14:35:52 +08:00
|
|
|
inDeltaZ = 90;
|
|
|
|
inAngleZ = 270;
|
|
|
|
outDeltaZ = 90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
inDeltaZ = -90;
|
|
|
|
inAngleZ = 90;
|
|
|
|
outDeltaZ = -90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
2016-08-22 09:39:58 +08:00
|
|
|
auto inA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
DelayTime::create(_duration/2),
|
|
|
|
Spawn::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0, inAngleZ, inDeltaZ, 0, 0),
|
|
|
|
ScaleTo::create(_duration/2, 1),
|
|
|
|
Show::create(),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
2016-08-22 09:39:58 +08:00
|
|
|
auto outA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Spawn::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0, outAngleZ, outDeltaZ, 0, 0),
|
|
|
|
ScaleTo::create(_duration/2, 0.5f),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
),
|
2013-06-20 14:13:12 +08:00
|
|
|
Hide::create(),
|
|
|
|
DelayTime::create(_duration/2),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setScale(0.5f);
|
|
|
|
_inScene->runAction(inA);
|
|
|
|
_outScene->runAction(outA);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 20:50:39 +08:00
|
|
|
TransitionZoomFlipX* TransitionZoomFlipX::create(float t, Scene* s, Orientation o)
|
2010-08-20 14:35:37 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionZoomFlipX* newScene = new (std::nothrow) TransitionZoomFlipX();
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->initWithDuration(t, s, o);
|
|
|
|
newScene->autorelease();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
return newScene;
|
2010-08-20 14:35:37 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipX* TransitionZoomFlipX::create(float t, Scene* s)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-07-26 05:49:43 +08:00
|
|
|
return TransitionZoomFlipX::create(t, s, TransitionScene::Orientation::RIGHT_OVER);
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
//
|
|
|
|
// ZoomFlipY Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipY::TransitionZoomFlipY()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2012-06-14 15:13:16 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipY::~TransitionZoomFlipY()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionZoomFlipY::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSceneOriented::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setVisible(false);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
float inDeltaZ, inAngleZ;
|
|
|
|
float outDeltaZ, outAngleZ;
|
|
|
|
|
2013-07-26 05:49:43 +08:00
|
|
|
if( _orientation== TransitionScene::Orientation::UP_OVER ) {
|
2012-04-19 14:35:52 +08:00
|
|
|
inDeltaZ = 90;
|
|
|
|
inAngleZ = 270;
|
|
|
|
outDeltaZ = 90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
} else {
|
|
|
|
inDeltaZ = -90;
|
|
|
|
inAngleZ = 90;
|
|
|
|
outDeltaZ = -90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto inA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
DelayTime::create(_duration/2),
|
|
|
|
Spawn::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0, inAngleZ, inDeltaZ, 90, 0),
|
|
|
|
ScaleTo::create(_duration/2, 1),
|
|
|
|
Show::create(),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto outA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Spawn::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0, outAngleZ, outDeltaZ, 90, 0),
|
|
|
|
ScaleTo::create(_duration/2, 0.5f),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
),
|
2013-06-20 14:13:12 +08:00
|
|
|
Hide::create(),
|
|
|
|
DelayTime::create(_duration/2),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setScale(0.5f);
|
|
|
|
_inScene->runAction(inA);
|
|
|
|
_outScene->runAction(outA);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 20:50:39 +08:00
|
|
|
TransitionZoomFlipY* TransitionZoomFlipY::create(float t, Scene* s, Orientation o)
|
2010-08-20 14:35:37 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionZoomFlipY* newScene = new (std::nothrow) TransitionZoomFlipY();
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->initWithDuration(t, s, o);
|
|
|
|
newScene->autorelease();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
return newScene;
|
2010-08-20 14:35:37 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipY* TransitionZoomFlipY::create(float t, Scene* s)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-07-26 05:49:43 +08:00
|
|
|
return TransitionZoomFlipY::create(t, s, TransitionScene::Orientation::UP_OVER);
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
//
|
|
|
|
// ZoomFlipAngular Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipAngular::TransitionZoomFlipAngular()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipAngular::~TransitionZoomFlipAngular()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionZoomFlipAngular::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSceneOriented::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setVisible(false);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
float inDeltaZ, inAngleZ;
|
|
|
|
float outDeltaZ, outAngleZ;
|
|
|
|
|
2013-07-26 05:49:43 +08:00
|
|
|
if( _orientation == TransitionScene::Orientation::RIGHT_OVER ) {
|
2012-04-19 14:35:52 +08:00
|
|
|
inDeltaZ = 90;
|
|
|
|
inAngleZ = 270;
|
|
|
|
outDeltaZ = 90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
inDeltaZ = -90;
|
|
|
|
inAngleZ = 90;
|
|
|
|
outDeltaZ = -90;
|
|
|
|
outAngleZ = 0;
|
|
|
|
}
|
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto inA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
DelayTime::create(_duration/2),
|
|
|
|
Spawn::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0, inAngleZ, inDeltaZ, -45, 0),
|
|
|
|
ScaleTo::create(_duration/2, 1),
|
|
|
|
Show::create(),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
),
|
2013-06-20 14:13:12 +08:00
|
|
|
Show::create(),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
2016-08-22 09:39:58 +08:00
|
|
|
auto outA = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Spawn::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
OrbitCamera::create(_duration/2, 1, 0 , outAngleZ, outDeltaZ, 45, 0),
|
|
|
|
ScaleTo::create(_duration/2, 0.5f),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
),
|
2013-06-20 14:13:12 +08:00
|
|
|
Hide::create(),
|
|
|
|
DelayTime::create(_duration/2),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setScale(0.5f);
|
|
|
|
_inScene->runAction(inA);
|
|
|
|
_outScene->runAction(outA);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-07-25 20:50:39 +08:00
|
|
|
TransitionZoomFlipAngular* TransitionZoomFlipAngular::create(float t, Scene* s, Orientation o)
|
2010-08-20 14:35:37 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionZoomFlipAngular* newScene = new (std::nothrow) TransitionZoomFlipAngular();
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->initWithDuration(t, s, o);
|
|
|
|
newScene->autorelease();
|
2010-08-20 14:35:37 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
return newScene;
|
2010-08-20 14:35:37 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionZoomFlipAngular* TransitionZoomFlipAngular::create(float t, Scene* s)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-07-26 05:49:43 +08:00
|
|
|
return TransitionZoomFlipAngular::create(t, s, TransitionScene::Orientation::RIGHT_OVER);
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
//
|
|
|
|
// Fade Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFade::TransitionFade()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFade::~TransitionFade()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-07-05 16:49:22 +08:00
|
|
|
TransitionFade * TransitionFade::create(float duration, Scene *scene, const Color3B& color)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionFade * transition = new (std::nothrow) TransitionFade();
|
2013-12-18 17:47:20 +08:00
|
|
|
transition->initWithDuration(duration, scene, color);
|
|
|
|
transition->autorelease();
|
|
|
|
return transition;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFade* TransitionFade::create(float duration,Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-07-08 18:11:32 +08:00
|
|
|
return TransitionFade::create(duration, scene, Color3B::BLACK);
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-07-05 16:49:22 +08:00
|
|
|
bool TransitionFade::initWithDuration(float duration, Scene *scene, const Color3B& color)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
if (TransitionScene::initWithDuration(duration, scene))
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_color.r = color.r;
|
|
|
|
_color.g = color.g;
|
|
|
|
_color.b = color.b;
|
|
|
|
_color.a = 0;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
return true;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
bool TransitionFade::initWithDuration(float t, Scene *scene)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-07-08 18:11:32 +08:00
|
|
|
this->initWithDuration(t, scene, Color3B::BLACK);
|
2012-04-19 14:35:52 +08:00
|
|
|
return true;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionFade :: onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
LayerColor* l = LayerColor::create(_color);
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->setVisible(false);
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
addChild(l, 2, kSceneFade);
|
2013-06-20 14:13:12 +08:00
|
|
|
Node* f = getChildByTag(kSceneFade);
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2016-08-22 09:39:58 +08:00
|
|
|
auto a = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
FadeIn::create(_duration/2),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::hideOutShowIn,this)),
|
2013-06-20 14:13:12 +08:00
|
|
|
FadeOut::create(_duration/2),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
f->runAction(a);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionFade::onExit()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onExit();
|
2012-04-19 14:35:52 +08:00
|
|
|
this->removeChildByTag(kSceneFade, false);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// Cross Fade Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionCrossFade::TransitionCrossFade()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionCrossFade::~TransitionCrossFade()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionCrossFade* TransitionCrossFade::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionCrossFade* newScene = new (std::nothrow) TransitionCrossFade();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
void TransitionCrossFade::draw(Renderer* /*renderer*/, const Mat4 &/*transform*/, uint32_t /*flags*/)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
// override draw since both scenes (textures) are rendered in 1 scene
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionCrossFade::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// create a transparent color layer
|
|
|
|
// in which we are going to add our rendertextures
|
2013-07-07 21:08:14 +08:00
|
|
|
Color4B color(0,0,0,0);
|
2013-07-12 06:24:23 +08:00
|
|
|
Size size = Director::getInstance()->getWinSize();
|
2013-06-20 14:13:12 +08:00
|
|
|
LayerColor* layer = LayerColor::create(color);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// create the first render texture for inScene
|
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
|
|
|
RenderTexture* inTexture = RenderTexture::create((int)size.width, (int)size.height,Texture2D::PixelFormat::RGBA8888, TextureFormat::D24S8);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
if (nullptr == inTexture)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
inTexture->getSprite()->setAnchorPoint( Vec2(0.5f,0.5f) );
|
2014-08-28 11:41:18 +08:00
|
|
|
inTexture->setPosition(size.width/2, size.height/2);
|
2014-05-15 01:07:09 +08:00
|
|
|
inTexture->setAnchorPoint( Vec2(0.5f,0.5f) );
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// render inScene to its texturebuffer
|
|
|
|
inTexture->begin();
|
2013-06-15 14:03:30 +08:00
|
|
|
_inScene->visit();
|
2012-04-19 14:35:52 +08:00
|
|
|
inTexture->end();
|
|
|
|
|
|
|
|
// create the second render texture for outScene
|
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
|
|
|
RenderTexture* outTexture = RenderTexture::create((int)size.width, (int)size.height,Texture2D::PixelFormat::RGBA8888, TextureFormat::D24S8);
|
2014-05-15 01:07:09 +08:00
|
|
|
outTexture->getSprite()->setAnchorPoint( Vec2(0.5f,0.5f) );
|
2014-08-28 11:41:18 +08:00
|
|
|
outTexture->setPosition(size.width/2, size.height/2);
|
2014-05-15 01:07:09 +08:00
|
|
|
outTexture->setAnchorPoint( Vec2(0.5f,0.5f) );
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// render outScene to its texturebuffer
|
|
|
|
outTexture->begin();
|
2013-06-15 14:03:30 +08:00
|
|
|
_outScene->visit();
|
2012-04-19 14:35:52 +08:00
|
|
|
outTexture->end();
|
|
|
|
|
|
|
|
// create blend functions
|
|
|
|
|
|
|
|
// set blendfunctions
|
2017-08-22 09:33:37 +08:00
|
|
|
inTexture->getSprite()->setBlendFunc(BlendFunc::DISABLE);
|
|
|
|
outTexture->getSprite()->setBlendFunc(BlendFunc::ALPHA_PREMULTIPLIED);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// add render textures to the layer
|
|
|
|
layer->addChild(inTexture);
|
|
|
|
layer->addChild(outTexture);
|
|
|
|
|
|
|
|
// initial opacity:
|
|
|
|
inTexture->getSprite()->setOpacity(255);
|
|
|
|
outTexture->getSprite()->setOpacity(255);
|
|
|
|
|
|
|
|
// create the blend action
|
2013-06-20 14:13:12 +08:00
|
|
|
Action* layerAction = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
FadeTo::create(_duration, 0),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::hideOutShowIn,this)),
|
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
// run the blend action
|
|
|
|
outTexture->getSprite()->runAction( layerAction );
|
|
|
|
|
|
|
|
// add the layer (which contains our two rendertextures) to the scene
|
|
|
|
addChild(layer, 2, kSceneFade);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// clean up on exit
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionCrossFade::onExit()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
// remove our layer and release all containing objects
|
|
|
|
this->removeChildByTag(kSceneFade, false);
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onExit();
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// TurnOffTilesTransition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionTurnOffTiles::TransitionTurnOffTiles()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-12-19 21:49:21 +08:00
|
|
|
_outSceneProxy = NodeGrid::create();
|
|
|
|
_outSceneProxy->retain();
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
2012-06-14 15:13:16 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionTurnOffTiles::~TransitionTurnOffTiles()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-12-12 14:56:06 +08:00
|
|
|
CC_SAFE_RELEASE(_outSceneProxy);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionTurnOffTiles* TransitionTurnOffTiles::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionTurnOffTiles* newScene = new (std::nothrow) TransitionTurnOffTiles();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
// override addScenes, and change the order
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionTurnOffTiles::sceneOrder()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isInSceneOnTop = false;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionTurnOffTiles::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2013-12-16 14:21:05 +08:00
|
|
|
_outSceneProxy->setTarget(_outScene);
|
2013-12-12 14:56:06 +08:00
|
|
|
_outSceneProxy->onEnter();
|
|
|
|
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2012-04-19 14:35:52 +08:00
|
|
|
float aspect = s.width / s.height;
|
|
|
|
int x = (int)(12 * aspect);
|
|
|
|
int y = 12;
|
2010-08-18 11:06:48 +08:00
|
|
|
|
2013-07-12 14:30:26 +08:00
|
|
|
TurnOffTiles* toff = TurnOffTiles::create(_duration, Size(x,y));
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* action = easeActionWithAction(toff);
|
2013-12-12 14:56:06 +08:00
|
|
|
_outSceneProxy->runAction
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
action,
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-06-20 14:13:12 +08:00
|
|
|
StopGrid::create(),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
)
|
|
|
|
);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-12-12 14:56:06 +08:00
|
|
|
void TransitionTurnOffTiles::onExit()
|
|
|
|
{
|
2013-12-19 21:49:21 +08:00
|
|
|
_outSceneProxy->setTarget(nullptr);
|
2013-12-12 14:56:06 +08:00
|
|
|
_outSceneProxy->onExit();
|
|
|
|
TransitionScene::onExit();
|
|
|
|
}
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
void TransitionTurnOffTiles::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
|
2013-12-12 14:56:06 +08:00
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
Scene::draw(renderer, transform, flags);
|
2013-12-12 14:56:06 +08:00
|
|
|
|
|
|
|
if( _isInSceneOnTop )
|
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
_outSceneProxy->visit(renderer, transform, flags);
|
|
|
|
_inScene->visit(renderer, transform, flags);
|
2013-12-12 14:56:06 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
_inScene->visit(renderer, transform, flags);
|
|
|
|
_outSceneProxy->visit(renderer, transform, flags);
|
2013-12-12 14:56:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionTurnOffTiles:: easeActionWithAction(ActionInterval* action)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return action;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// SplitCols Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSplitCols::TransitionSplitCols()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-12-19 22:01:32 +08:00
|
|
|
_gridProxy = NodeGrid::create();
|
|
|
|
_gridProxy->retain();
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSplitCols::~TransitionSplitCols()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-12-12 14:56:06 +08:00
|
|
|
CC_SAFE_RELEASE(_gridProxy);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSplitCols* TransitionSplitCols::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionSplitCols* newScene = new (std::nothrow) TransitionSplitCols();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionSplitCols::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2013-12-12 14:56:06 +08:00
|
|
|
|
2013-12-16 14:21:05 +08:00
|
|
|
_gridProxy->setTarget(_outScene);
|
2013-12-12 14:56:06 +08:00
|
|
|
_gridProxy->onEnter();
|
2010-08-18 11:06:48 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* split = action();
|
2016-08-22 09:39:58 +08:00
|
|
|
auto seq = Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
split,
|
2013-12-12 14:56:06 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionSplitCols::switchTargetToInscene,this)),
|
2012-04-19 14:35:52 +08:00
|
|
|
split->reverse(),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
);
|
2010-08-18 11:06:48 +08:00
|
|
|
|
2013-12-12 14:56:06 +08:00
|
|
|
_gridProxy->runAction
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
easeActionWithAction(seq),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-06-20 14:13:12 +08:00
|
|
|
StopGrid::create(),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
)
|
|
|
|
);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-12-12 14:56:06 +08:00
|
|
|
void TransitionSplitCols::switchTargetToInscene()
|
|
|
|
{
|
2013-12-16 14:21:05 +08:00
|
|
|
_gridProxy->setTarget(_inScene);
|
2013-12-12 14:56:06 +08:00
|
|
|
}
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
void TransitionSplitCols::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
|
2013-12-12 14:56:06 +08:00
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
Scene::draw(renderer, transform, flags);
|
|
|
|
_gridProxy->visit(renderer, transform, flags);
|
2013-12-12 14:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void TransitionSplitCols::onExit()
|
|
|
|
{
|
2013-12-19 22:01:32 +08:00
|
|
|
_gridProxy->setTarget(nullptr);
|
2013-12-12 14:56:06 +08:00
|
|
|
_gridProxy->onExit();
|
|
|
|
TransitionScene::onExit();
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionSplitCols:: action()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return SplitCols::create(_duration/2.0f, 3);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionSplitCols::easeActionWithAction(ActionInterval * action)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return EaseInOut::create(action, 3.0f);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// SplitRows Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSplitRows::TransitionSplitRows()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2012-12-06 18:51:33 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSplitRows::~TransitionSplitRows()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionSplitRows::action()
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return SplitRows::create(_duration/2.0f, 3);
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionSplitRows* TransitionSplitRows::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionSplitRows* newScene = new (std::nothrow) TransitionSplitRows();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
|
|
|
//
|
|
|
|
// FadeTR Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeTR::TransitionFadeTR()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-12-19 22:01:32 +08:00
|
|
|
_outSceneProxy = NodeGrid::create();
|
|
|
|
_outSceneProxy->retain();
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeTR::~TransitionFadeTR()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-12-12 14:56:06 +08:00
|
|
|
CC_SAFE_RELEASE(_outSceneProxy);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeTR* TransitionFadeTR::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionFadeTR* newScene = new (std::nothrow) TransitionFadeTR();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionFadeTR::sceneOrder()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isInSceneOnTop = false;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void TransitionFadeTR::onEnter()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionScene::onEnter();
|
2013-12-19 22:01:32 +08:00
|
|
|
|
2013-12-16 14:21:05 +08:00
|
|
|
_outSceneProxy->setTarget(_outScene);
|
2013-12-12 14:56:06 +08:00
|
|
|
_outSceneProxy->onEnter();
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-07-12 06:24:23 +08:00
|
|
|
Size s = Director::getInstance()->getWinSize();
|
2012-04-19 14:35:52 +08:00
|
|
|
float aspect = s.width / s.height;
|
|
|
|
int x = (int)(12 * aspect);
|
|
|
|
int y = 12;
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-07-12 14:30:26 +08:00
|
|
|
ActionInterval* action = actionWithSize(Size(x,y));
|
2010-08-18 11:06:48 +08:00
|
|
|
|
2013-12-12 14:56:06 +08:00
|
|
|
_outSceneProxy->runAction
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
2013-06-20 14:13:12 +08:00
|
|
|
Sequence::create
|
2012-04-19 14:35:52 +08:00
|
|
|
(
|
|
|
|
easeActionWithAction(action),
|
2013-07-16 03:43:22 +08:00
|
|
|
CallFunc::create(CC_CALLBACK_0(TransitionScene::finish,this)),
|
2013-06-20 14:13:12 +08:00
|
|
|
StopGrid::create(),
|
2013-12-18 17:47:20 +08:00
|
|
|
nullptr
|
2012-04-19 14:35:52 +08:00
|
|
|
)
|
|
|
|
);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-12-12 14:56:06 +08:00
|
|
|
void TransitionFadeTR::onExit()
|
|
|
|
{
|
2013-12-19 22:01:32 +08:00
|
|
|
_outSceneProxy->setTarget(nullptr);
|
2013-12-12 14:56:06 +08:00
|
|
|
_outSceneProxy->onExit();
|
|
|
|
TransitionScene::onExit();
|
|
|
|
}
|
|
|
|
|
2014-05-31 07:42:05 +08:00
|
|
|
void TransitionFadeTR::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
|
2013-12-12 14:56:06 +08:00
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
Scene::draw(renderer, transform, flags);
|
2013-12-12 14:56:06 +08:00
|
|
|
|
|
|
|
if( _isInSceneOnTop )
|
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
_outSceneProxy->visit(renderer, transform, flags);
|
|
|
|
_inScene->visit(renderer, transform, flags);
|
2013-12-12 14:56:06 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-05-31 07:42:05 +08:00
|
|
|
_inScene->visit(renderer, transform, flags);
|
|
|
|
_outSceneProxy->visit(renderer, transform, flags);
|
2013-12-12 14:56:06 +08:00
|
|
|
}
|
|
|
|
}
|
2010-07-12 17:56:06 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionFadeTR::actionWithSize(const Size& size)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return FadeOutTRTiles::create(_duration, size);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionFadeTR:: easeActionWithAction(ActionInterval* action)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return action;
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// FadeBL Transition
|
|
|
|
//
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeBL::TransitionFadeBL()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeBL::~TransitionFadeBL()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeBL* TransitionFadeBL::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionFadeBL* newScene = new (std::nothrow) TransitionFadeBL();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionFadeBL::actionWithSize(const Size& size)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return FadeOutBLTiles::create(_duration, size);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// FadeUp Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeUp::TransitionFadeUp()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2012-12-06 18:51:33 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeUp::~TransitionFadeUp()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeUp* TransitionFadeUp::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionFadeUp* newScene = new (std::nothrow) TransitionFadeUp();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionFadeUp::actionWithSize(const Size& size)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return FadeOutUpTiles::create(_duration, size);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// FadeDown Transition
|
|
|
|
//
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeDown::TransitionFadeDown()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeDown::~TransitionFadeDown()
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
TransitionFadeDown* TransitionFadeDown::create(float t, Scene* scene)
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
TransitionFadeDown* newScene = new (std::nothrow) TransitionFadeDown();
|
2013-12-18 17:47:20 +08:00
|
|
|
if(newScene && newScene->initWithDuration(t, scene))
|
2012-11-01 22:12:13 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
newScene->autorelease();
|
|
|
|
return newScene;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(newScene);
|
|
|
|
return nullptr;
|
2012-11-01 22:12:13 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ActionInterval* TransitionFadeDown::actionWithSize(const Size& size)
|
2010-07-12 17:56:06 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
return FadeOutDownTiles::create(_duration, size);
|
2010-07-12 17:56:06 +08:00
|
|
|
}
|
2010-08-20 14:35:37 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
NS_CC_END
|