Skip to content

Commit c5e2d55

Browse files
committed
remove unused outline shader files
1 parent 09a100c commit c5e2d55

File tree

4 files changed

+0
-43
lines changed

4 files changed

+0
-43
lines changed

build/cocos2d_libs.xcodeproj/project.pbxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,14 +1081,10 @@
10811081
3E92EA4F192130D70094CD21 /* CCSprite3DDataCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA4C192130D70094CD21 /* CCSprite3DDataCache.cpp */; };
10821082
3E92EA50192130D70094CD21 /* CCSprite3DDataCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E92EA4D192130D70094CD21 /* CCSprite3DDataCache.h */; };
10831083
3E92EA51192130D70094CD21 /* CCSprite3DDataCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E92EA4D192130D70094CD21 /* CCSprite3DDataCache.h */; };
1084-
3E92EA5B19215FA10094CD21 /* Colored.es2.frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E92EA5419215FA10094CD21 /* Colored.es2.frag.h */; };
1085-
3E92EA5C19215FA10094CD21 /* Colored.es2.frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E92EA5419215FA10094CD21 /* Colored.es2.frag.h */; };
10861084
3E92EA5D19215FA10094CD21 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA5519215FA10094CD21 /* CCSprite3D.cpp */; };
10871085
3E92EA5E19215FA10094CD21 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA5519215FA10094CD21 /* CCSprite3D.cpp */; };
10881086
3E92EA5F19215FA10094CD21 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E92EA5619215FA10094CD21 /* CCSprite3D.h */; };
10891087
3E92EA6019215FA10094CD21 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E92EA5619215FA10094CD21 /* CCSprite3D.h */; };
1090-
3E92EA6719215FA10094CD21 /* Textured.es2.vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E92EA5A19215FA10094CD21 /* Textured.es2.vert.h */; };
1091-
3E92EA6819215FA10094CD21 /* Textured.es2.vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E92EA5A19215FA10094CD21 /* Textured.es2.vert.h */; };
10921088
3E9B5E1119254D2C00BB28BC /* CCMeshCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9B5E0F19254D2C00BB28BC /* CCMeshCommand.cpp */; };
10931089
3E9B5E1219254D2C00BB28BC /* CCMeshCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9B5E0F19254D2C00BB28BC /* CCMeshCommand.cpp */; };
10941090
3E9B5E1319254D2C00BB28BC /* CCMeshCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9B5E1019254D2C00BB28BC /* CCMeshCommand.h */; };
@@ -2322,10 +2318,8 @@
23222318
3E92EA3D19212FD40094CD21 /* CCObjLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCObjLoader.h; path = ../cocos/3d/CCObjLoader.h; sourceTree = "<group>"; };
23232319
3E92EA4C192130D70094CD21 /* CCSprite3DDataCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCSprite3DDataCache.cpp; path = ../cocos/3d/CCSprite3DDataCache.cpp; sourceTree = "<group>"; };
23242320
3E92EA4D192130D70094CD21 /* CCSprite3DDataCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCSprite3DDataCache.h; path = ../cocos/3d/CCSprite3DDataCache.h; sourceTree = "<group>"; };
2325-
3E92EA5419215FA10094CD21 /* Colored.es2.frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Colored.es2.frag.h; path = ../cocos/3d/Colored.es2.frag.h; sourceTree = "<group>"; };
23262321
3E92EA5519215FA10094CD21 /* CCSprite3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCSprite3D.cpp; path = ../cocos/3d/CCSprite3D.cpp; sourceTree = "<group>"; };
23272322
3E92EA5619215FA10094CD21 /* CCSprite3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCSprite3D.h; path = ../cocos/3d/CCSprite3D.h; sourceTree = "<group>"; };
2328-
3E92EA5A19215FA10094CD21 /* Textured.es2.vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Textured.es2.vert.h; path = ../cocos/3d/Textured.es2.vert.h; sourceTree = "<group>"; };
23292323
3E9B5E0F19254D2C00BB28BC /* CCMeshCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCMeshCommand.cpp; sourceTree = "<group>"; };
23302324
3E9B5E1019254D2C00BB28BC /* CCMeshCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMeshCommand.h; sourceTree = "<group>"; };
23312325
3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = "<group>"; };
@@ -4067,10 +4061,8 @@
40674061
3E92EA3919212FB40094CD21 /* 3d */ = {
40684062
isa = PBXGroup;
40694063
children = (
4070-
3E92EA5419215FA10094CD21 /* Colored.es2.frag.h */,
40714064
3E92EA5519215FA10094CD21 /* CCSprite3D.cpp */,
40724065
3E92EA5619215FA10094CD21 /* CCSprite3D.h */,
4073-
3E92EA5A19215FA10094CD21 /* Textured.es2.vert.h */,
40744066
3E92EA4C192130D70094CD21 /* CCSprite3DDataCache.cpp */,
40754067
3E92EA4D192130D70094CD21 /* CCSprite3DDataCache.h */,
40764068
3E92EA3A19212FD40094CD21 /* CCMesh.cpp */,
@@ -5080,7 +5072,6 @@
50805072
1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */,
50815073
1A57019F180BCB590088DEC7 /* CCFont.h in Headers */,
50825074
1A5701A3180BCB590088DEC7 /* CCFontAtlas.h in Headers */,
5083-
3E92EA5B19215FA10094CD21 /* Colored.es2.frag.h in Headers */,
50845075
1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */,
50855076
1A5701A7180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */,
50865077
1A5701B3180BCB590088DEC7 /* CCFontFNT.h in Headers */,
@@ -5185,7 +5176,6 @@
51855176
500DC99619106300007B91BF /* CCScheduler.h in Headers */,
51865177
1A57035A180BD0B00088DEC7 /* unzip.h in Headers */,
51875178
296CAD241915EC8000C64FBF /* CCEventFocus.h in Headers */,
5188-
3E92EA6719215FA10094CD21 /* Textured.es2.vert.h in Headers */,
51895179
500DC98819106300007B91BF /* CCNS.h in Headers */,
51905180
1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */,
51915181
1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */,
@@ -5525,7 +5515,6 @@
55255515
500DC9AD19106300007B91BF /* ZipUtils.h in Headers */,
55265516
50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */,
55275517
1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */,
5528-
3E92EA6819215FA10094CD21 /* Textured.es2.vert.h in Headers */,
55295518
1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */,
55305519
5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */,
55315520
1A570070180BC5A10088DEC7 /* CCActionEase.h in Headers */,
@@ -5720,7 +5709,6 @@
57205709
1AD71E9C180E26E600808F54 /* AnimationState.h in Headers */,
57215710
1AD71EA0180E26E600808F54 /* AnimationStateData.h in Headers */,
57225711
50FCEB9E18C72017004AD434 /* ImageViewReader.h in Headers */,
5723-
3E92EA5C19215FA10094CD21 /* Colored.es2.frag.h in Headers */,
57245712
500DC98119106300007B91BF /* CCEventType.h in Headers */,
57255713
1AD71EA4180E26E600808F54 /* Atlas.h in Headers */,
57265714
1AD71EA8180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */,

cocos/3d/CCSprite3D.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
#include "renderer/CCGLProgramState.h"
1313
#include "renderer/CCGLProgramCache.h"
1414

15-
//begin include shader file
16-
#define STRINGIFY(A) #A
17-
#include "Textured.es2.vert.h"
18-
#include "Colored.es2.frag.h"
19-
//end include shader file
20-
2115
NS_CC_BEGIN
2216

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

cocos/3d/Colored.es2.frag.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

cocos/3d/Textured.es2.vert.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)