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

Merge pull request #6769 from ricardoquesada/interpolate_fix 

default value is 0.5 for interpolation
This commit is contained in:
Ricardo Quesada 2014-05-15 16:52:47 -07:00
parent 83617c8c38 f9f0142842
commit 0cfc7827de
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -755,6 +755,7 @@ ui::Slider* ShaderMultiTexture::createSliderCtl()
slider->loadBarTexture("cocosui/sliderTrack.png"); slider->loadBarTexture("cocosui/sliderTrack.png");
slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
slider->loadProgressBarTexture("cocosui/sliderProgress.png"); slider->loadProgressBarTexture("cocosui/sliderProgress.png");
slider->setPercent(50);
slider->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 3.0f)); slider->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 3.0f));
addChild(slider); addChild(slider);
@ -801,7 +802,7 @@ bool ShaderMultiTexture::init()
_sprite->setGLProgramState(glprogramstate); _sprite->setGLProgramState(glprogramstate);
glprogramstate->setUniformTexture("u_texture1", texture1); glprogramstate->setUniformTexture("u_texture1", texture1);
glprogramstate->setUniformFloat("u_interpolate",0.5);
// slider // slider
createSliderCtl(); createSliderCtl();