Skip to content

Commit 5debbf8

Browse files
committed
remove redundant line
1 parent ed357e7 commit 5debbf8

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

cocos/3d/CCSprite3D.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#include "CCSprite3D.h"
33
#include "CCSprite3DDataCache.h"
44
#include "CCMesh.h"
5-
65
#include "CCObjLoader.h"
7-
#include "2d/platform/CCFileUtils.h"
6+
87
#include "base/CCDirector.h"
98
#include "2d/CCTextureCache.h"
9+
#include "2d/platform/CCFileUtils.h"
1010
#include "renderer/CCRenderer.h"
1111
#include "renderer/CCGLProgramState.h"
1212
#include "renderer/CCGLProgramCache.h"
@@ -15,7 +15,6 @@ NS_CC_BEGIN
1515

1616
std::string s_attributeNames[] = {GLProgram::ATTRIBUTE_NAME_POSITION, GLProgram::ATTRIBUTE_NAME_COLOR, GLProgram::ATTRIBUTE_NAME_TEX_COORD, GLProgram::ATTRIBUTE_NAME_NORMAL};
1717

18-
//std::map<std::string, std::vector<std::string> > __cachedSpriteTexNames;
1918

2019
Sprite3D* Sprite3D::create(const std::string &modelPath)
2120
{

cocos/3d/CCSprite3D.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44

55
#include <vector>
66
#include "base/CCVector.h"
7-
87
#include "base/ccTypes.h"
98
#include "2d/CCNode.h"
109
#include "2d/CCProtocols.h"
11-
1210
#include "renderer/CCMeshCommand.h"
1311

1412
NS_CC_BEGIN
1513

1614
class GLProgramState;
1715
class Mesh;
1816
class Texture2D;
19-
//class Sprite3DEffect;
2017

2118
class Sprite3D : public Node, public BlendProtocol
2219
{
@@ -54,7 +51,6 @@ class Sprite3D : public Node, public BlendProtocol
5451
MeshCommand _meshCommand;
5552

5653
Texture2D* _texture;
57-
//Vector<Texture2D*> _textures;
5854

5955
BlendFunc _blend;
6056

0 commit comments

Comments
 (0)