From b4bc49942a89c2dcf67403c02510e4619b7e9fe2 Mon Sep 17 00:00:00 2001 From: Jacky Date: Thu, 30 Oct 2014 14:21:24 +0800 Subject: [PATCH] Cancel narrow init of `cocos2d::Texture2D::TexParams` in `water.cpp` --- frameworks/cocos2d-x/cocos/custom/Water.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frameworks/cocos2d-x/cocos/custom/Water.cpp b/frameworks/cocos2d-x/cocos/custom/Water.cpp index cfb49f3a..aceab532 100644 --- a/frameworks/cocos2d-x/cocos/custom/Water.cpp +++ b/frameworks/cocos2d-x/cocos/custom/Water.cpp @@ -19,8 +19,10 @@ Water *Water::create(const std::string& tex1,const std::string& tex2,const std:: auto wave2 = TexCache->addImage(tex2); auto wave1 = TexCache->addImage(tex3); - wave1->setTexParameters(cocos2d::Texture2D::TexParams{GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT}); - wave2->setTexParameters(cocos2d::Texture2D::TexParams{GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT}); + cocos2d::Texture2D::TexParams wave1TexParams = {GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT}; + cocos2d::Texture2D::TexParams wave2TexParams = {GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT}; + wave1->setTexParameters(wave1TexParams); + wave2->setTexParameters(wave2TexParams); auto glprogram = cocos2d::GLProgram::createWithFilenames("res/shader3D/water.vsh", "res/shader3D/water.fsh"); auto glprogramstate = cocos2d::GLProgramState::getOrCreateWithGLProgram(glprogram); water->setGLProgramState(glprogramstate);