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

remove unused variable

This commit is contained in:
yangxiao 2014-08-22 14:43:48 +08:00
parent 70661b0ff4
commit 39cc03173b
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/3d/CCSprite3D.cpp
View File

@ -161,7 +161,6 @@ Sprite3D::Sprite3D()
Sprite3D::~Sprite3D() Sprite3D::~Sprite3D()
{ {
_glProgramStates.clear();
_meshes.clear(); _meshes.clear();
_meshVertexDatas.clear(); _meshVertexDatas.clear();
CC_SAFE_RELEASE_NULL(_skeleton); CC_SAFE_RELEASE_NULL(_skeleton);
@ -171,7 +170,6 @@ Sprite3D::~Sprite3D()
bool Sprite3D::initWithFile(const std::string &path) bool Sprite3D::initWithFile(const std::string &path)
{ {
_meshes.clear(); _meshes.clear();
_glProgramStates.clear();
_meshVertexDatas.clear(); _meshVertexDatas.clear();
CC_SAFE_RELEASE_NULL(_skeleton); CC_SAFE_RELEASE_NULL(_skeleton);
removeAllAttachNode(); removeAllAttachNode();
@ -323,7 +321,6 @@ void Sprite3D::genGLProgramState()
offset += meshattribute.attribSizeBytes; offset += meshattribute.attribSizeBytes;
} }
_glProgramStates.pushBack(programstate);
glProgramestates[mesh] = programstate; glProgramestates[mesh] = programstate;
} }

2
cocos/3d/CCSprite3D.h
View File

@ -161,9 +161,7 @@ protected:
BlendFunc _blend; BlendFunc _blend;
//since 3.3
Vector<Mesh*> _meshes; Vector<Mesh*> _meshes;
Vector<GLProgramState*> _glProgramStates;
mutable AABB _aabb; // cache current aabb mutable AABB _aabb; // cache current aabb
mutable Mat4 _nodeToWorldTransform; // cache the matrix mutable Mat4 _nodeToWorldTransform; // cache the matrix