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

Merge pull request #9950 from dabingnn/v3_perf 

cache director pointer to improve rendering performance
This commit is contained in:
minggo 2015-01-13 14:31:03 +08:00
parent 1bb4c12b1d af9e49b28d
commit bb742c30ad
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cocos/2d/CCNode.cpp
View File

@ -136,12 +136,12 @@ Node::Node(void)
, _cameraMask(1) , _cameraMask(1)
{ {
// set default scheduler and actionManager // set default scheduler and actionManager
Director *director = Director::getInstance(); _director = Director::getInstance();
_actionManager = director->getActionManager(); _actionManager = _director->getActionManager();
_actionManager->retain(); _actionManager->retain();
_scheduler = director->getScheduler(); _scheduler = _director->getScheduler();
_scheduler->retain(); _scheduler->retain();
_eventDispatcher = director->getEventDispatcher(); _eventDispatcher = _director->getEventDispatcher();
_eventDispatcher->retain(); _eventDispatcher->retain();
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
@ -1227,7 +1227,7 @@ void Node::sortAllChildren()
void Node::draw() void Node::draw()
{ {
auto renderer = Director::getInstance()->getRenderer(); auto renderer = _director->getRenderer();
draw(renderer, _modelViewTransform, true); draw(renderer, _modelViewTransform, true);
} }
@ -1237,8 +1237,8 @@ void Node::draw(Renderer* renderer, const Mat4 &transform, uint32_t flags)
void Node::visit() void Node::visit()
{ {
auto renderer = Director::getInstance()->getRenderer(); auto renderer = _director->getRenderer();
auto& parentTransform = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); auto& parentTransform = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
visit(renderer, parentTransform, true); visit(renderer, parentTransform, true);
} }
@ -1297,9 +1297,8 @@ void Node::visit(Renderer* renderer, const Mat4 &parentTransform, uint32_t paren
// IMPORTANT: // IMPORTANT:
// To ease the migration to v3.0, we still support the Mat4 stack, // To ease the migration to v3.0, we still support the Mat4 stack,
// but it is deprecated and your code should not rely on it // but it is deprecated and your code should not rely on it
Director* director = Director::getInstance(); _director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); _director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
bool visibleByCamera = isVisitableByVisitingCamera(); bool visibleByCamera = isVisitableByVisitingCamera();
@ -1330,7 +1329,7 @@ void Node::visit(Renderer* renderer, const Mat4 &parentTransform, uint32_t paren
this->draw(renderer, _modelViewTransform, flags); this->draw(renderer, _modelViewTransform, flags);
} }
director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); _director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
// FIX ME: Why need to set _orderOfArrival to 0?? // FIX ME: Why need to set _orderOfArrival to 0??
// Please refer to https://github.com/cocos2d/cocos2d-x/pull/6920 // Please refer to https://github.com/cocos2d/cocos2d-x/pull/6920
@ -1903,7 +1902,7 @@ Vec2 Node::convertToWorldSpaceAR(const Vec2& nodePoint) const
Vec2 Node::convertToWindowSpace(const Vec2& nodePoint) const Vec2 Node::convertToWindowSpace(const Vec2& nodePoint) const
{ {
Vec2 worldPoint(this->convertToWorldSpace(nodePoint)); Vec2 worldPoint(this->convertToWorldSpace(nodePoint));
return Director::getInstance()->convertToUI(worldPoint); return _director->convertToUI(worldPoint);
} }
// convenience methods which take a Touch instead of Vec2 // convenience methods which take a Touch instead of Vec2

3
cocos/2d/CCNode.h
View File

@ -49,6 +49,7 @@ class ComponentContainer;
class EventDispatcher; class EventDispatcher;
class Scene; class Scene;
class Renderer; class Renderer;
class Director;
class GLProgram; class GLProgram;
class GLProgramState; class GLProgramState;
#if CC_USE_PHYSICS #if CC_USE_PHYSICS
@ -1664,7 +1665,7 @@ protected:
Vector<Node*> _children; ///< array of children nodes Vector<Node*> _children; ///< array of children nodes
Node *_parent; ///< weak reference to parent node Node *_parent; ///< weak reference to parent node
Director* _director; //cached director pointer to improve rendering performance
int _tag; ///< a tag. Can be any number you assigned just to identify this node int _tag; ///< a tag. Can be any number you assigned just to identify this node
std::string _name; ///<a string label, an user defined string to identify this node std::string _name; ///<a string label, an user defined string to identify this node