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

fix label not appear on the screen

This commit is contained in:
Dhilan007 2014-01-04 10:56:14 +08:00
parent e017609fc4
commit b14999a7a7
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/2d/CCLabel.cpp
View File

@ -500,7 +500,7 @@ void Label::setFontSize(int fontSize)
Node::setScale(1.0f*_fontSize/DISTANCEFIELD_ATLAS_FONTSIZE); Node::setScale(1.0f*_fontSize/DISTANCEFIELD_ATLAS_FONTSIZE);
} }
void Label::draw() void Label::onDraw()
{ {
CC_PROFILER_START("CCSpriteBatchNode - draw"); CC_PROFILER_START("CCSpriteBatchNode - draw");
@ -527,6 +527,13 @@ void Label::draw()
CC_PROFILER_STOP("CCSpriteBatchNode - draw"); CC_PROFILER_STOP("CCSpriteBatchNode - draw");
} }
void Label::draw()
{
_customCommand.init(0, _vertexZ);
_customCommand.func = CC_CALLBACK_0(Label::onDraw, this);
Director::getInstance()->getRenderer()->addCommand(&_customCommand);
}
///// PROTOCOL STUFF ///// PROTOCOL STUFF
Sprite * Label::getLetter(int ID) Sprite * Label::getLetter(int ID)

3
cocos/2d/CCLabel.h
View File

@ -29,6 +29,7 @@
#include "CCSpriteBatchNode.h" #include "CCSpriteBatchNode.h"
#include "CCLabelTextFormatProtocol.h" #include "CCLabelTextFormatProtocol.h"
#include "ccTypes.h" #include "ccTypes.h"
#include "renderer/CCCustomCommand.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -119,6 +120,7 @@ public:
virtual std::string getDescription() const override; virtual std::string getDescription() const override;
virtual void draw(void) override; virtual void draw(void) override;
virtual void onDraw();
private: private:
/** /**
@ -173,6 +175,7 @@ private:
GLuint _uniformEffectColor; GLuint _uniformEffectColor;
CustomCommand _customCommand;
}; };