2018-01-29 16:25:32 +08:00
|
|
|
/****************************************************************************
|
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
|
|
|
|
|
|
|
http://www.cocos2d-x.org
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
|
|
in the Software without restriction, including without limitation the rights
|
|
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
THE SOFTWARE.
|
|
|
|
****************************************************************************/
|
|
|
|
|
2012-04-08 14:16:29 +08:00
|
|
|
#include "EffectsAdvancedTest.h"
|
|
|
|
|
2015-04-09 08:37:30 +08:00
|
|
|
USING_NS_CC;
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
enum
|
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
kTagTextLayer = 1,
|
2010-09-16 11:35:58 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
kTagSprite1 = 1,
|
|
|
|
kTagSprite2 = 2,
|
2010-09-16 11:35:58 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
kTagBackground = 1,
|
|
|
|
kTagLabel = 2,
|
2012-04-08 14:16:29 +08:00
|
|
|
};
|
|
|
|
|
2015-04-03 14:31:03 +08:00
|
|
|
EffectAdvanceTests::EffectAdvanceTests()
|
|
|
|
{
|
|
|
|
ADD_TEST_CASE(Effect3);
|
|
|
|
ADD_TEST_CASE(Effect2);
|
|
|
|
ADD_TEST_CASE(Effect1);
|
|
|
|
ADD_TEST_CASE(Effect4);
|
|
|
|
ADD_TEST_CASE(Effect5);
|
|
|
|
ADD_TEST_CASE(Issue631);
|
|
|
|
}
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
//------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// Effect1
|
|
|
|
//
|
|
|
|
//------------------------------------------------------------------
|
2012-04-08 14:16:29 +08:00
|
|
|
void Effect1::onEnter()
|
|
|
|
{
|
2015-04-03 14:31:03 +08:00
|
|
|
EffectAdvanceBaseTest::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-11 13:39:34 +08:00
|
|
|
//auto target = getChildByTag(kTagBackground);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// To reuse a grid the grid size and the grid type must be the same.
|
|
|
|
// in this case:
|
|
|
|
// Lens3D is Grid3D and it's size is (15,10)
|
|
|
|
// Waves3D is Grid3D and it's size is (15,10)
|
|
|
|
|
2013-08-16 16:05:27 +08:00
|
|
|
auto size = Director::getInstance()->getWinSize();
|
2014-05-15 01:07:09 +08:00
|
|
|
auto lens = Lens3D::create(0.0f, Size(15,10), Vec2(size.width/2,size.height/2), 240);
|
2013-08-16 16:05:27 +08:00
|
|
|
auto waves = Waves3D::create(10, Size(15,10), 18, 15);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-08-16 16:05:27 +08:00
|
|
|
auto reuse = ReuseGrid::create(1);
|
|
|
|
auto delay = DelayTime::create(8);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-28 14:34:52 +08:00
|
|
|
// auto orbit = OrbitCamera::create(5, 1, 2, 0, 180, 0, -90);
|
|
|
|
// auto orbit_back = orbit->reverse();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2014-07-10 00:45:27 +08:00
|
|
|
//_bgNode->runAction( RepeatForever::create( Sequence::create( orbit, orbit_back, nullptr) ) );
|
|
|
|
_bgNode->runAction( Sequence::create(lens, delay, reuse, waves, nullptr) );
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2013-12-19 05:52:10 +08:00
|
|
|
std::string Effect1::title() const
|
2010-09-16 11:35:58 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "Lens + Waves3d and OrbitCamera";
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
//------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// Effect2
|
|
|
|
//
|
|
|
|
//------------------------------------------------------------------
|
2012-04-08 14:16:29 +08:00
|
|
|
void Effect2::onEnter()
|
|
|
|
{
|
2015-04-03 14:31:03 +08:00
|
|
|
EffectAdvanceBaseTest::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-11 13:39:34 +08:00
|
|
|
//auto target = getChildByTag(kTagBackground);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// To reuse a grid the grid size and the grid type must be the same.
|
|
|
|
// in this case:
|
|
|
|
// ShakyTiles is TiledGrid3D and it's size is (15,10)
|
|
|
|
// Shuffletiles is TiledGrid3D and it's size is (15,10)
|
|
|
|
// TurnOfftiles is TiledGrid3D and it's size is (15,10)
|
2013-08-16 16:05:27 +08:00
|
|
|
auto shaky = ShakyTiles3D::create(5, Size(15,10), 4, false);
|
|
|
|
auto shuffle = ShuffleTiles::create(0, Size(15,10), 3);
|
|
|
|
auto turnoff = TurnOffTiles::create(0, Size(15,10), 3);
|
|
|
|
auto turnon = turnoff->reverse();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// reuse 2 times:
|
|
|
|
// 1 for shuffle
|
|
|
|
// 2 for turn off
|
|
|
|
// turnon tiles will use a new grid
|
2013-08-16 16:05:27 +08:00
|
|
|
auto reuse = ReuseGrid::create(2);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-08-16 16:05:27 +08:00
|
|
|
auto delay = DelayTime::create(1);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2012-06-14 15:13:16 +08:00
|
|
|
// id orbit = [OrbitCamera::create:5 radius:1 deltaRadius:2 angleZ:0 deltaAngleZ:180 angleX:0 deltaAngleX:-90];
|
2012-04-19 14:35:52 +08:00
|
|
|
// id orbit_back = [orbit reverse];
|
2010-09-16 11:35:58 +08:00
|
|
|
//
|
2013-12-11 13:39:34 +08:00
|
|
|
// [target runAction: [RepeatForever::create: [Sequence actions: orbit, orbit_back, nil]]];
|
2014-07-10 00:45:27 +08:00
|
|
|
_bgNode->runAction(Sequence::create( shaky, delay, reuse, shuffle, delay->clone(), turnoff, turnon, nullptr) );
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2013-12-19 05:52:10 +08:00
|
|
|
std::string Effect2::title() const
|
2010-09-16 11:35:58 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "ShakyTiles + ShuffleTiles + TurnOffTiles";
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// Effect3
|
|
|
|
//
|
|
|
|
//------------------------------------------------------------------
|
2012-04-08 14:16:29 +08:00
|
|
|
void Effect3::onEnter()
|
|
|
|
{
|
2015-04-03 14:31:03 +08:00
|
|
|
EffectAdvanceBaseTest::onEnter();
|
2013-12-11 13:39:34 +08:00
|
|
|
//auto bg = getChildByTag(kTagBackground);
|
|
|
|
//auto target1 = bg->getChildByTag(kTagSprite1);
|
|
|
|
//auto target2 = bg->getChildByTag(kTagSprite2);
|
2013-08-16 16:05:27 +08:00
|
|
|
auto waves = Waves::create(5, Size(15,10), 5, 20, true, false);
|
|
|
|
auto shaky = Shaky3D::create(5, Size(15,10), 4, false);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-11 13:39:34 +08:00
|
|
|
_target1->runAction( RepeatForever::create( waves ) );
|
|
|
|
_target2->runAction( RepeatForever::create( shaky ) );
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// moving background. Testing issue #244
|
2014-05-15 01:07:09 +08:00
|
|
|
auto move = MoveBy::create(3, Vec2(200,0) );
|
2014-07-10 00:45:27 +08:00
|
|
|
_bgNode->runAction(RepeatForever::create( Sequence::create(move, move->reverse(), nullptr) ));
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2013-12-19 05:52:10 +08:00
|
|
|
std::string Effect3::title() const
|
2010-09-16 11:35:58 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "Effects on 2 sprites";
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
|
|
|
|
//------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// Effect4
|
|
|
|
//
|
|
|
|
//------------------------------------------------------------------
|
2012-06-27 18:44:25 +08:00
|
|
|
|
2013-06-20 14:17:10 +08:00
|
|
|
class Lens3DTarget : public Node
|
2012-06-27 18:44:25 +08:00
|
|
|
{
|
|
|
|
public:
|
2014-05-15 01:07:09 +08:00
|
|
|
virtual void setPosition(const Vec2& var)
|
2012-06-27 18:44:25 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_lens3D->setPosition(var);
|
2012-06-27 18:44:25 +08:00
|
|
|
}
|
2013-01-29 12:59:43 +08:00
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
virtual const Vec2& getPosition() const
|
2013-01-29 12:59:43 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return _lens3D->getPosition();
|
2013-01-29 12:59:43 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:17:10 +08:00
|
|
|
static Lens3DTarget* create(Lens3D* pAction)
|
2012-06-27 18:44:25 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
Lens3DTarget* pRet = new (std::nothrow) Lens3DTarget();
|
2013-06-15 14:03:30 +08:00
|
|
|
pRet->_lens3D = pAction;
|
2012-06-27 18:44:25 +08:00
|
|
|
pRet->autorelease();
|
|
|
|
return pRet;
|
|
|
|
}
|
|
|
|
private:
|
2012-06-27 20:50:47 +08:00
|
|
|
|
|
|
|
Lens3DTarget()
|
2014-04-09 22:53:59 +08:00
|
|
|
: _lens3D(nullptr)
|
2012-06-27 20:50:47 +08:00
|
|
|
{}
|
|
|
|
|
2013-06-20 14:17:10 +08:00
|
|
|
Lens3D* _lens3D;
|
2012-06-27 18:44:25 +08:00
|
|
|
};
|
|
|
|
|
2012-04-08 14:16:29 +08:00
|
|
|
void Effect4::onEnter()
|
|
|
|
{
|
2015-04-03 14:31:03 +08:00
|
|
|
EffectAdvanceBaseTest::onEnter();
|
2013-12-16 14:21:05 +08:00
|
|
|
//Node* gridNode = NodeGrid::create();
|
2013-12-11 13:39:34 +08:00
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
auto lens = Lens3D::create(10, Size(32,24), Vec2(100,180), 150);
|
|
|
|
auto move = JumpBy::create(5, Vec2(380,0), 100, 4);
|
2013-08-16 16:05:27 +08:00
|
|
|
auto move_back = move->reverse();
|
2014-07-10 00:45:27 +08:00
|
|
|
auto seq = Sequence::create( move, move_back, nullptr);
|
2012-04-08 14:16:29 +08:00
|
|
|
|
2013-06-20 14:17:10 +08:00
|
|
|
/* In cocos2d-iphone, the type of action's target is 'id', so it supports using the instance of 'Lens3D' as its target.
|
|
|
|
While in cocos2d-x, the target of action only supports Node or its subclass,
|
|
|
|
so we make an encapsulation for Lens3D to achieve that.
|
2012-06-27 20:50:47 +08:00
|
|
|
*/
|
|
|
|
|
2013-08-16 16:05:27 +08:00
|
|
|
auto director = Director::getInstance();
|
|
|
|
auto pTarget = Lens3DTarget::create(lens);
|
2012-06-27 20:50:47 +08:00
|
|
|
// Please make sure the target been added to its parent.
|
|
|
|
this->addChild(pTarget);
|
2013-12-11 13:39:34 +08:00
|
|
|
//gridNode->addChild(pTarget);
|
2012-06-27 20:50:47 +08:00
|
|
|
|
2012-06-27 18:44:25 +08:00
|
|
|
director->getActionManager()->addAction(seq, pTarget, false);
|
2013-12-11 13:39:34 +08:00
|
|
|
|
|
|
|
_bgNode->runAction( lens );
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2013-12-19 05:52:10 +08:00
|
|
|
std::string Effect4::title() const
|
2010-09-16 11:35:58 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "Jumpy Lens3D";
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
//------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// Effect5
|
|
|
|
//
|
|
|
|
//------------------------------------------------------------------
|
2012-04-08 14:16:29 +08:00
|
|
|
void Effect5::onEnter()
|
|
|
|
{
|
2015-04-03 14:31:03 +08:00
|
|
|
EffectAdvanceBaseTest::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-07-12 06:24:23 +08:00
|
|
|
//CCDirector::getInstance()->setProjection(DirectorProjection2D);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-08-16 16:05:27 +08:00
|
|
|
auto effect = Liquid::create(2, Size(32,24), 1, 20);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-08-16 16:05:27 +08:00
|
|
|
auto stopEffect = Sequence::create(
|
2012-04-19 14:35:52 +08:00
|
|
|
effect,
|
2013-06-20 14:17:10 +08:00
|
|
|
DelayTime::create(2),
|
|
|
|
StopGrid::create(),
|
2012-06-14 15:13:16 +08:00
|
|
|
// [DelayTime::create:2],
|
2012-04-19 14:35:52 +08:00
|
|
|
// [[effect copy] autorelease],
|
2014-07-10 00:45:27 +08:00
|
|
|
nullptr);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-11 13:39:34 +08:00
|
|
|
//auto bg = getChildByTag(kTagBackground);
|
|
|
|
_bgNode->runAction(stopEffect);
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2013-12-19 05:52:10 +08:00
|
|
|
std::string Effect5::title() const
|
2010-09-16 11:35:58 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "Test Stop-Copy-Restar";
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
void Effect5::onExit()
|
|
|
|
{
|
2015-04-03 14:31:03 +08:00
|
|
|
EffectAdvanceBaseTest::onExit();
|
2010-09-16 11:35:58 +08:00
|
|
|
|
2013-07-26 04:36:19 +08:00
|
|
|
Director::getInstance()->setProjection(Director::Projection::_3D);
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
//------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// Effect5
|
|
|
|
//
|
|
|
|
//------------------------------------------------------------------
|
2012-04-08 14:16:29 +08:00
|
|
|
void Issue631::onEnter()
|
|
|
|
{
|
2015-04-03 14:31:03 +08:00
|
|
|
EffectAdvanceBaseTest::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2014-07-10 00:45:27 +08:00
|
|
|
auto effect = Sequence::create( DelayTime::create(2.0f), Shaky3D::create(5.0f, Size(5, 5), 16, false), nullptr);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// cleanup
|
2013-12-11 13:39:34 +08:00
|
|
|
//auto bg = getChildByTag(kTagBackground);
|
|
|
|
removeChild(_bgNode, true);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// background
|
2013-08-16 16:05:27 +08:00
|
|
|
auto layer = LayerColor::create( Color4B(255,0,0,255) );
|
2012-04-19 14:35:52 +08:00
|
|
|
addChild(layer, -10);
|
2013-08-16 16:05:27 +08:00
|
|
|
auto sprite = Sprite::create("Images/grossini.png");
|
2014-08-28 11:41:18 +08:00
|
|
|
sprite->setPosition(50,80);
|
2012-04-19 14:35:52 +08:00
|
|
|
layer->addChild(sprite, 10);
|
|
|
|
|
|
|
|
// foreground
|
2013-12-16 14:21:05 +08:00
|
|
|
auto layer2BaseGrid = NodeGrid::create();
|
2013-08-16 16:05:27 +08:00
|
|
|
auto layer2 = LayerColor::create(Color4B( 0, 255,0,255 ) );
|
|
|
|
auto fog = Sprite::create("Images/Fog.png");
|
2012-04-08 14:16:29 +08:00
|
|
|
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
BlendFunc bf = {backend::BlendFactor::SRC_ALPHA, backend::BlendFactor::ONE_MINUS_SRC_ALPHA};
|
2012-04-19 14:35:52 +08:00
|
|
|
fog->setBlendFunc(bf);
|
|
|
|
layer2->addChild(fog, 1);
|
2013-12-11 13:39:34 +08:00
|
|
|
addChild(layer2BaseGrid, 1);
|
|
|
|
layer2BaseGrid->addChild(layer2);
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-11 13:39:34 +08:00
|
|
|
layer2BaseGrid->runAction( RepeatForever::create(effect) );
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2013-12-19 05:52:10 +08:00
|
|
|
std::string Issue631::title() const
|
2012-04-08 14:16:29 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "Testing Opacity";
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2013-12-19 05:52:10 +08:00
|
|
|
std::string Issue631::subtitle() const
|
2012-04-08 14:16:29 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "Effect image should be 100% opaque. Testing issue #631";
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2010-09-16 11:35:58 +08:00
|
|
|
//------------------------------------------------------------------
|
|
|
|
//
|
2015-04-03 14:31:03 +08:00
|
|
|
// EffectAdvanceBaseTest
|
2010-09-16 11:35:58 +08:00
|
|
|
//
|
|
|
|
//------------------------------------------------------------------
|
2012-04-08 14:16:29 +08:00
|
|
|
|
2019-07-22 09:38:46 +08:00
|
|
|
void EffectAdvanceBaseTest::onEnter()
|
2010-09-16 11:35:58 +08:00
|
|
|
{
|
2015-04-03 14:31:03 +08:00
|
|
|
TestCase::onEnter();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-16 14:21:05 +08:00
|
|
|
_bgNode = NodeGrid::create();
|
2019-09-24 11:31:35 +08:00
|
|
|
_bgNode->setAnchorPoint(Vec2(0.5f,0.5f));
|
2013-12-11 13:39:34 +08:00
|
|
|
addChild(_bgNode);
|
|
|
|
//_bgNode->setPosition( VisibleRect::center() );
|
2013-08-16 16:05:27 +08:00
|
|
|
auto bg = Sprite::create("Images/background3.png");
|
2012-10-23 17:48:50 +08:00
|
|
|
bg->setPosition( VisibleRect::center() );
|
2013-12-11 13:39:34 +08:00
|
|
|
//addChild(bg, 0, kTagBackground);
|
|
|
|
//bg->setPosition( VisibleRect::center() );
|
|
|
|
_bgNode->addChild(bg);
|
|
|
|
|
2013-12-16 14:21:05 +08:00
|
|
|
_target1 = NodeGrid::create();
|
2019-09-24 11:31:35 +08:00
|
|
|
_target1->setAnchorPoint(Vec2(0.5f,0.5f));
|
2013-08-16 16:05:27 +08:00
|
|
|
auto grossini = Sprite::create("Images/grossinis_sister2.png");
|
2013-12-11 13:39:34 +08:00
|
|
|
_target1->addChild(grossini);
|
|
|
|
_bgNode->addChild(_target1);
|
2014-08-28 11:41:18 +08:00
|
|
|
_target1->setPosition(VisibleRect::left().x+VisibleRect::getVisibleRect().size.width/3.0f, VisibleRect::bottom().y+ 200);
|
2013-08-16 16:05:27 +08:00
|
|
|
auto sc = ScaleBy::create(2, 5);
|
|
|
|
auto sc_back = sc->reverse();
|
2014-07-10 00:45:27 +08:00
|
|
|
_target1->runAction( RepeatForever::create(Sequence::create(sc, sc_back, nullptr) ) );
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-12-11 13:39:34 +08:00
|
|
|
|
2013-12-16 14:21:05 +08:00
|
|
|
_target2 = NodeGrid::create();
|
2019-09-24 11:31:35 +08:00
|
|
|
_target2->setAnchorPoint(Vec2(0.5f,0.5f));
|
2013-08-16 16:05:27 +08:00
|
|
|
auto tamara = Sprite::create("Images/grossinis_sister1.png");
|
2013-12-11 13:39:34 +08:00
|
|
|
_target2->addChild(tamara);
|
|
|
|
_bgNode->addChild(_target2);
|
2014-08-28 11:41:18 +08:00
|
|
|
_target2->setPosition(VisibleRect::left().x+2*VisibleRect::getVisibleRect().size.width/3.0f,VisibleRect::bottom().y+200);
|
2013-08-16 16:05:27 +08:00
|
|
|
auto sc2 = ScaleBy::create(2, 5);
|
|
|
|
auto sc2_back = sc2->reverse();
|
2014-07-10 00:45:27 +08:00
|
|
|
_target2->runAction( RepeatForever::create(Sequence::create(sc2, sc2_back, nullptr) ) );
|
2013-12-11 13:39:34 +08:00
|
|
|
|
2012-04-08 14:16:29 +08:00
|
|
|
}
|
|
|
|
|
2019-07-22 09:38:46 +08:00
|
|
|
EffectAdvanceBaseTest::~EffectAdvanceBaseTest()
|
2012-04-08 14:16:29 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2015-04-03 14:31:03 +08:00
|
|
|
std::string EffectAdvanceBaseTest::title() const
|
2010-09-16 11:35:58 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "No title";
|
2010-09-16 11:35:58 +08:00
|
|
|
}
|
|
|
|
|
2015-04-03 14:31:03 +08:00
|
|
|
std::string EffectAdvanceBaseTest::subtitle() const
|
2010-09-16 11:35:58 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return "";
|
2010-09-16 11:35:58 +08:00
|
|
|
}
|