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

Merge pull request #318 from zhukaixy/texturecube 

Texturecube
This commit is contained in:
XiaoYang 2015-05-05 09:19:02 +08:00
parent 5ed65e13c9 a103d792f3
commit 89b5e8d99f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View File

@ -2440,8 +2440,8 @@ void Sprite3DCubeMapTest::addNewSpriteWithCoords(Vec2 p)
Texture2D::TexParams tRepeatParams;
tRepeatParams.magFilter = GL_LINEAR;
tRepeatParams.minFilter = GL_LINEAR;
tRepeatParams.wrapS = GL_MIRRORED_REPEAT;
tRepeatParams.wrapT = GL_MIRRORED_REPEAT;
tRepeatParams.wrapS = GL_CLAMP_TO_EDGE;
tRepeatParams.wrapT = GL_CLAMP_TO_EDGE;
_textureCube->setTexParameters(tRepeatParams);
// pass the texture sampler to our custom shader
@ -2501,8 +2501,8 @@ void Sprite3DCubeMapTest::addNewSpriteWithCoords(Vec2 p)
Texture2D::TexParams tRepeatParams;
tRepeatParams.magFilter = GL_NEAREST;
tRepeatParams.minFilter = GL_NEAREST;
tRepeatParams.wrapS = GL_MIRRORED_REPEAT;
tRepeatParams.wrapT = GL_MIRRORED_REPEAT;
tRepeatParams.wrapS = GL_CLAMP_TO_EDGE;
tRepeatParams.wrapT = GL_CLAMP_TO_EDGE;
_textureCube->setTexParameters(tRepeatParams);
state->setUniformTexture("u_cubeTex", _textureCube);