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

replace genGLProgramState to genMaterial

This commit is contained in:
yangxiao 2015-09-17 14:45:16 +08:00
parent ea538cd9da
commit 256832d000
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/3d/CCSprite3D.cpp
View File

@ -352,7 +352,7 @@ bool Sprite3D::initFrom(const NodeDatas& nodeDatas, const MeshDatas& meshdatas,
createAttachSprite3DNode(it,materialdatas);
}
}
genGLProgramState();
genMaterial();
return true;
}
@ -405,7 +405,7 @@ Sprite3D* Sprite3D::createSprite3DNode(NodeData* nodedata,ModelData* modeldata,c
sprite->addMesh(mesh);
sprite->autorelease();
sprite->genGLProgramState();
sprite->genMaterial();
}
return sprite;
}
@ -462,7 +462,7 @@ Material* Sprite3D::getMaterial(int meshIndex) const
}
void Sprite3D::genGLProgramState(bool useLight)
void Sprite3D::genMaterial(bool useLight)
{
_shaderUsingLight = useLight;
@ -736,7 +736,7 @@ void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
}
if (usingLight != _shaderUsingLight)
{
genGLProgramState(usingLight);
genMaterial(usingLight);
}
}

4
cocos/3d/CCSprite3D.h
View File

@ -223,8 +223,8 @@ CC_CONSTRUCTOR_ACCESS:
*/
virtual void visit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags) override;
/**generate default GLProgramState*/
void genGLProgramState(bool useLight = false);
/**generate default material*/
void genMaterial(bool useLight = false);
void createNode(NodeData* nodedata, Node* root, const MaterialDatas& matrialdatas, bool singleSprite);
void createAttachSprite3DNode(NodeData* nodedata,const MaterialDatas& matrialdatas);