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

Merge pull request #15241 from newnon/v3_gl_program_imageview 

GLProgram for ImageView
This commit is contained in:
zilongshanren 2016-03-17 11:39:58 +08:00
parent 00ec3690b2 980d5fec68
commit 535d3b3c32
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/ui/UIImageView.cpp
View File

@ -302,6 +302,18 @@ ResourceData ImageView::getRenderFile()
rData.file = _textureFile; rData.file = _textureFile;
return rData; return rData;
} }
void ImageView::setGLProgram(GLProgram* glProgram)
{
Widget::setGLProgram(glProgram);
_imageRenderer->setGLProgram(glProgram);
}
void ImageView::setGLProgramState(cocos2d::GLProgramState* glProgramState)
{
Widget::setGLProgramState(glProgramState);
_imageRenderer->setGLProgramState(glProgramState);
}
} }

2
cocos/ui/UIImageView.h
View File

@ -126,6 +126,8 @@ public:
ResourceData getRenderFile(); ResourceData getRenderFile();
virtual void setGLProgram(GLProgram* glProgram) override;
virtual void setGLProgramState(cocos2d::GLProgramState* glProgramState) override;
CC_CONSTRUCTOR_ACCESS: CC_CONSTRUCTOR_ACCESS:
//initializes state of widget. //initializes state of widget.
virtual bool init() override; virtual bool init() override;