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

Fix minor typos in naming (#17280)

This commit is contained in:
mogemimi 2017-02-06 16:13:20 +09:00 committed by minggo
parent d37ac4007b
commit df24911a23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCParticleSystem.cpp
View File

@ -78,7 +78,7 @@ NS_CC_BEGIN
//
inline void nomalize_point(float x, float y, particle_point* out)
inline void normalize_point(float x, float y, particle_point* out)
{
float n = x * x + y * y;
// Already normalized.
@ -904,7 +904,7 @@ void ParticleSystem::update(float dt)
// radial acceleration
if (_particleData.posx[i] || _particleData.posy[i])
{
nomalize_point(_particleData.posx[i], _particleData.posy[i], &radial);
normalize_point(_particleData.posx[i], _particleData.posy[i], &radial);
}
tangential = radial;
radial.x *= _particleData.modeA.radialAccel[i];

4
cocos/3d/CCTerrain.cpp
View File

@ -149,7 +149,7 @@ void Terrain::onDraw(const Mat4 &transform, uint32_t /*flags*/)
_stateBlock->bind();
GL::enableVertexAttribs(1<<_positionLocation | 1 << _texcordLocation | 1<<_normalLocation);
GL::enableVertexAttribs(1<<_positionLocation | 1 << _texcoordLocation | 1<<_normalLocation);
glProgram->setUniformsForBuiltins(transform);
_glProgramState->applyUniforms();
glUniform3f(_lightDirLocation,_lightDir.x,_lightDir.y,_lightDir.z);
@ -815,7 +815,7 @@ void Terrain::cacheUniformAttribLocation()
{
_positionLocation = glGetAttribLocation(this->getGLProgram()->getProgram(),"a_position");
_texcordLocation = glGetAttribLocation(this->getGLProgram()->getProgram(),"a_texCoord");
_texcoordLocation = glGetAttribLocation(this->getGLProgram()->getProgram(),"a_texCoord");
_normalLocation = glGetAttribLocation(this->getGLProgram()->getProgram(),"a_normal");
_alphaMapLocation = -1;
for(int i =0;i<4;++i)

2
cocos/3d/CCTerrain.h
View File

@ -508,7 +508,7 @@ protected:
Mat4 _terrainModelMatrix;
GLuint _normalLocation;
GLuint _positionLocation;
GLuint _texcordLocation;
GLuint _texcoordLocation;
float _maxHeight;
float _minHeight;
CrackFixedType _crackFixedType;

10
cocos/ui/UILayout.cpp
View File

@ -74,7 +74,7 @@ _clippingStencil(nullptr),
_clippingRect(Rect::ZERO),
_clippingParent(nullptr),
_clippingRectDirty(true),
_stencileStateManager(new StencilStateManager()),
_stencilStateManager(new StencilStateManager()),
_doLayoutDirty(true),
_isInterceptTouch(false),
_loopFocus(false),
@ -87,7 +87,7 @@ _isFocusPassing(false)
Layout::~Layout()
{
CC_SAFE_RELEASE(_clippingStencil);
CC_SAFE_DELETE(_stencileStateManager);
CC_SAFE_DELETE(_stencilStateManager);
}
void Layout::onEnter()
@ -268,13 +268,13 @@ void Layout::stencilClippingVisit(Renderer *renderer, const Mat4& parentTransfor
renderer->pushGroup(_groupCommand.getRenderQueueID());
_beforeVisitCmdStencil.init(_globalZOrder);
_beforeVisitCmdStencil.func = CC_CALLBACK_0(StencilStateManager::onBeforeVisit, _stencileStateManager);
_beforeVisitCmdStencil.func = CC_CALLBACK_0(StencilStateManager::onBeforeVisit, _stencilStateManager);
renderer->addCommand(&_beforeVisitCmdStencil);
_clippingStencil->visit(renderer, _modelViewTransform, flags);
_afterDrawStencilCmd.init(_globalZOrder);
_afterDrawStencilCmd.func = CC_CALLBACK_0(StencilStateManager::onAfterDrawStencil, _stencileStateManager);
_afterDrawStencilCmd.func = CC_CALLBACK_0(StencilStateManager::onAfterDrawStencil, _stencilStateManager);
renderer->addCommand(&_afterDrawStencilCmd);
int i = 0; // used by _children
@ -322,7 +322,7 @@ void Layout::stencilClippingVisit(Renderer *renderer, const Mat4& parentTransfor
_afterVisitCmdStencil.init(_globalZOrder);
_afterVisitCmdStencil.func = CC_CALLBACK_0(StencilStateManager::onAfterVisit, _stencileStateManager);
_afterVisitCmdStencil.func = CC_CALLBACK_0(StencilStateManager::onAfterVisit, _stencilStateManager);
renderer->addCommand(&_afterVisitCmdStencil);
renderer->popGroup();

2
cocos/ui/UILayout.h
View File

@ -634,7 +634,7 @@ protected:
bool _clippingRectDirty;
//clipping
StencilStateManager *_stencileStateManager;
StencilStateManager *_stencilStateManager;
GroupCommand _groupCommand;
CustomCommand _beforeVisitCmdStencil;