Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds `std::for_each` test in invocation 

and removes CArray and CMacro tests
This commit is contained in:
Ricardo Quesada 2013-12-18 19:28:09 -08:00
parent a75d9d976f
commit c044a91f6e
2 changed files with 41 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp
View File

@ -32,11 +32,10 @@
static std::function<NodeChildrenMainScene*()> createFunctions[] =
{
CL(IterateSpriteSheetForLoop),
CL(IterateSpriteSheetCArray),
CL(IterateSpriteSheetIterator),
CL(IterateSpriteSheetForEach),
CL(CallFuncsSpriteSheetForEach),
CL(CallFuncsSpriteSheetCMacro),
CL(AddSprite),
CL(AddSpriteSheet),
@ -312,43 +311,6 @@ const char* IterateSpriteSheetForLoop::testName()
return "Iterator: C++11 for loop";
}
////////////////////////////////////////////////////////
//
// IterateSpriteSheetCArray
//
////////////////////////////////////////////////////////
void IterateSpriteSheetCArray::update(float dt)
{
// iterate using fast enumeration protocol
auto& children = batchNode->getChildren();
// Object* object = NULL;
CC_PROFILER_START(this->profilerName());
//FIXME: James CCARRAY_FOREACH(children, object)
// {
// auto sprite = static_cast<Sprite*>(object);
// sprite->setVisible(false);
// }
CC_PROFILER_STOP(this->profilerName());
}
std::string IterateSpriteSheetCArray::title() const
{
return "Iterate SpriteSheet";
}
std::string IterateSpriteSheetCArray::subtitle() const
{
return "Iterate children using C Array API. See console";
}
const char* IterateSpriteSheetCArray::testName()
{
return "Iterator: CC_ARRAY_FOREACH";
}
////////////////////////////////////////////////////////
//
@ -387,6 +349,43 @@ const char* IterateSpriteSheetIterator::testName()
return "Iterator: begin(), end()";
}
////////////////////////////////////////////////////////
//
// IterateSpriteSheetForEach
//
////////////////////////////////////////////////////////
void IterateSpriteSheetForEach::update(float dt)
{
// iterate using fast enumeration protocol
auto& children = batchNode->getChildren();
CC_PROFILER_START(this->profilerName());
std::for_each(std::begin(children), std::end(children), [](Node *child) {
auto sprite = static_cast<Sprite*>(child);
sprite->setVisible(false);
});
CC_PROFILER_STOP(this->profilerName());
}
std::string IterateSpriteSheetForEach::title() const
{
return "Iterate SpriteSheet";
}
std::string IterateSpriteSheetForEach::subtitle() const
{
return "Iterate children using std::for_each(). See console";
}
const char* IterateSpriteSheetForEach::testName()
{
return "Iterator: std::for_each()";
}
////////////////////////////////////////////////////////
//
// CallFuncsSpriteSheetForEach
@ -428,38 +427,6 @@ const char* CallFuncsSpriteSheetForEach::testName()
return "Map: std::for_each";
}
////////////////////////////////////////////////////////
//
// CallFuncsSpriteSheetCMacro
//
////////////////////////////////////////////////////////
void CallFuncsSpriteSheetCMacro::update(float dt)
{
// iterate using fast enumeration protocol
auto& children = batchNode->getChildren();
CC_PROFILER_START(this->profilerName());
//FIXME: James arrayMakeObjectsPerformSelector(children, getPosition, Node*);
CC_PROFILER_STOP(this->profilerName());
}
std::string CallFuncsSpriteSheetCMacro::title() const
{
return "'map' functional call";
}
std::string CallFuncsSpriteSheetCMacro::subtitle() const
{
return "Using 'arrayMakeObjectsPerformSelector'. See console";
}
const char* CallFuncsSpriteSheetCMacro::testName()
{
return "Map: arrayMakeObjectsPerformSelector";
}
////////////////////////////////////////////////////////
//
// AddRemoveSpriteSheet

17
samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h
View File

@ -83,10 +83,10 @@ public:
virtual const char* testName();
};
class IterateSpriteSheetCArray : public IterateSpriteSheet
class IterateSpriteSheetForEach : public IterateSpriteSheet
{
public:
CREATE_FUNC(IterateSpriteSheetCArray);
CREATE_FUNC(IterateSpriteSheetForEach);
virtual void update(float dt);
@ -95,6 +95,7 @@ public:
virtual const char* testName();
};
class AddRemoveSpriteSheet : public NodeChildrenMainScene
{
public:
@ -126,18 +127,6 @@ public:
virtual const char* testName();
};
class CallFuncsSpriteSheetCMacro : public IterateSpriteSheet
{
public:
CREATE_FUNC(CallFuncsSpriteSheetCMacro);
virtual void update(float dt);
virtual std::string title() const override;
virtual std::string subtitle() const override;
virtual const char* testName();
};
///
class AddSprite : public AddRemoveSpriteSheet