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

Merge pull request #13291 from dabingnn/v3_FixShaderTestCrash 

fix shader test crash on android device
This commit is contained in:
pandamicro 2015-08-12 10:40:14 +08:00
parent dbd0b6dd86 0dee83b154
commit dfc17edb27
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp
View File

@ -53,6 +53,8 @@ ShaderNode* ShaderNode::shaderNodeWithVertex(const std::string &vert, const std:
bool ShaderNode::initWithVertex(const std::string &vert, const std::string &frag) bool ShaderNode::initWithVertex(const std::string &vert, const std::string &frag)
{ {
_vertFileName = vert;
_fragFileName = frag;
#if CC_ENABLE_CACHE_TEXTURE_DATA #if CC_ENABLE_CACHE_TEXTURE_DATA
auto listener = EventListenerCustom::create(EVENT_RENDERER_RECREATED, [this](EventCustom* event){ auto listener = EventListenerCustom::create(EVENT_RENDERER_RECREATED, [this](EventCustom* event){
this->setGLProgramState(nullptr); this->setGLProgramState(nullptr);
@ -62,14 +64,10 @@ bool ShaderNode::initWithVertex(const std::string &vert, const std::string &frag
_eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
#endif #endif
_vertFileName = vert;
_fragFileName = frag;
loadShaderVertex(vert, frag); loadShaderVertex(vert, frag);
_time = 0; _time = 0;
_resolution = Vec2(SIZE_X, SIZE_Y); _resolution = Vec2(SIZE_X, SIZE_Y);
getGLProgramState()->setUniformVec2("resolution", _resolution);
scheduleUpdate(); scheduleUpdate();
@ -115,7 +113,6 @@ void ShaderNode::setPosition(const Vec2 &newPosition)
auto visibleSize = Director::getInstance()->getVisibleSize(); auto visibleSize = Director::getInstance()->getVisibleSize();
auto retinaFactor = Director::getInstance()->getOpenGLView()->getRetinaFactor(); auto retinaFactor = Director::getInstance()->getOpenGLView()->getRetinaFactor();
_center = Vec2(position.x * frameSize.width / visibleSize.width * retinaFactor, position.y * frameSize.height / visibleSize.height * retinaFactor); _center = Vec2(position.x * frameSize.width / visibleSize.width * retinaFactor, position.y * frameSize.height / visibleSize.height * retinaFactor);
getGLProgramState()->setUniformVec2("center", _center);
} }
void ShaderNode::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) void ShaderNode::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
@ -131,6 +128,8 @@ void ShaderNode::onDraw(const Mat4 &transform, uint32_t flags)
GLfloat vertices[12] = {0,0, w,0, w,h, 0,0, 0,h, w,h}; GLfloat vertices[12] = {0,0, w,0, w,h, 0,0, 0,h, w,h};
auto glProgramState = getGLProgramState(); auto glProgramState = getGLProgramState();
glProgramState->setUniformVec2("resolution", _resolution);
glProgramState->setUniformVec2("center", _center);
glProgramState->setVertexAttribPointer("a_position", 2, GL_FLOAT, GL_FALSE, 0, vertices); glProgramState->setVertexAttribPointer("a_position", 2, GL_FLOAT, GL_FALSE, 0, vertices);
glProgramState->apply(transform); glProgramState->apply(transform);