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

Fix compile error after merging

This commit is contained in:
Huabing.Xu 2014-04-23 14:59:45 +08:00
parent f65973d9f0
commit 587f65098f
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cocos/2d/CCLabelAtlas.cpp
View File

@ -249,7 +249,7 @@ void LabelAtlas::updateColor()
//CCLabelAtlas - draw //CCLabelAtlas - draw
void LabelAtlas::draw(Renderer *renderer, const kmMat4 &transform, bool transformUpdated) void LabelAtlas::draw(Renderer *renderer, const Matrix &transform, bool transformUpdated)
{ {
AtlasNode::draw(renderer, transform, transformUpdated); AtlasNode::draw(renderer, transform, transformUpdated);
#if CC_LABELATLAS_DEBUG_DRAW #if CC_LABELATLAS_DEBUG_DRAW
@ -260,10 +260,11 @@ void LabelAtlas::draw(Renderer *renderer, const kmMat4 &transform, bool transfor
} }
#if CC_LABELATLAS_DEBUG_DRAW #if CC_LABELATLAS_DEBUG_DRAW
void LabelAtlas::drawDebugData(const kmMat4& transform, bool transformUpdated) void LabelAtlas::drawDebugData(const Matrix& transform, bool transformUpdated)
{ {
kmGLPushMatrix(); Director* director = Director::getInstance();
kmGLLoadMatrix(&transform); director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform);
auto size = getContentSize(); auto size = getContentSize();
@ -277,7 +278,7 @@ void LabelAtlas::drawDebugData(const kmMat4& transform, bool transformUpdated)
DrawPrimitives::drawPoly(vertices, 4, true); DrawPrimitives::drawPoly(vertices, 4, true);
kmGLPopMatrix(); director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
} }
#endif #endif

4
cocos/2d/CCLabelAtlas.h
View File

@ -82,7 +82,7 @@ public:
virtual void setString(const std::string &label) override; virtual void setString(const std::string &label) override;
virtual const std::string& getString(void) const override; virtual const std::string& getString(void) const override;
virtual std::string getDescription() const override; virtual std::string getDescription() const override;
virtual void draw(Renderer *renderer, const kmMat4 &transform, bool transformUpdated) override; virtual void draw(Renderer *renderer, const Matrix &transform, bool transformUpdated) override;
protected: protected:
LabelAtlas() LabelAtlas()
@ -97,7 +97,7 @@ protected:
#if CC_LABELATLAS_DEBUG_DRAW #if CC_LABELATLAS_DEBUG_DRAW
CustomCommand _customDebugDrawCommand; CustomCommand _customDebugDrawCommand;
void drawDebugData(const kmMat4& transform, bool transformUpdated); void drawDebugData(const Matrix& transform, bool transformUpdated);
#endif //CC_SPRITE_DEBUG_DRAW #endif //CC_SPRITE_DEBUG_DRAW
// string to render // string to render

11
cocos/2d/CCLabelBMFont.cpp
View File

@ -207,7 +207,7 @@ Rect LabelBMFont::getBoundingBox() const
return _label->getBoundingBox(); return _label->getBoundingBox();
} }
void LabelBMFont::draw(Renderer *renderer, const kmMat4 &transform, bool transformUpdated) void LabelBMFont::draw(Renderer *renderer, const Matrix &transform, bool transformUpdated)
{ {
Node::draw(renderer, transform, transformUpdated); Node::draw(renderer, transform, transformUpdated);
#if CC_LABELBMFONT_DEBUG_DRAW #if CC_LABELBMFONT_DEBUG_DRAW
@ -218,10 +218,11 @@ void LabelBMFont::draw(Renderer *renderer, const kmMat4 &transform, bool transfo
} }
#if CC_LABELBMFONT_DEBUG_DRAW #if CC_LABELBMFONT_DEBUG_DRAW
void LabelBMFont::drawDebugData(const kmMat4& transform, bool transformUpdated) void LabelBMFont::drawDebugData(const Matrix& transform, bool transformUpdated)
{ {
kmGLPushMatrix(); Director* director = Director::getInstance();
kmGLLoadMatrix(&transform); director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform);
auto size = getContentSize(); auto size = getContentSize();
@ -235,7 +236,7 @@ void LabelBMFont::drawDebugData(const kmMat4& transform, bool transformUpdated)
DrawPrimitives::drawPoly(vertices, 4, true); DrawPrimitives::drawPoly(vertices, 4, true);
kmGLPopMatrix(); director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
} }
#endif #endif

4
cocos/2d/CCLabelBMFont.h
View File

@ -123,12 +123,12 @@ public:
virtual Rect getBoundingBox() const override; virtual Rect getBoundingBox() const override;
virtual std::string getDescription() const override; virtual std::string getDescription() const override;
virtual void draw(Renderer *renderer, const kmMat4 &transform, bool transformUpdated) override; virtual void draw(Renderer *renderer, const Matrix &transform, bool transformUpdated) override;
private: private:
#if CC_LABELBMFONT_DEBUG_DRAW #if CC_LABELBMFONT_DEBUG_DRAW
CustomCommand _customDebugDrawCommand; CustomCommand _customDebugDrawCommand;
void drawDebugData(const kmMat4& transform, bool transformUpdated); void drawDebugData(const Matrix& transform, bool transformUpdated);
#endif // CC_LABELBMFONT_DEBUG_DRAW #endif // CC_LABELBMFONT_DEBUG_DRAW
// name of fntFile // name of fntFile