From cb213183bcae33f24a0555a4875a91a2475492e6 Mon Sep 17 00:00:00 2001 From: pipu Date: Fri, 13 Jun 2014 16:33:07 +0800 Subject: [PATCH] adjust project.pbxproj and files associated with ActionTimeLine --- build/cocos2d_libs.xcodeproj/project.pbxproj | 78 +++++++++---------- build/cocos2d_tests.xcodeproj/project.pbxproj | 34 ++++---- cocos/2d/CCFrame.h | 2 +- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index d3ca764601..694d2f0c15 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -995,14 +995,6 @@ 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; 373B9129187891F400198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; 373B912A187891FB00198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; - 38FA2E211949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */; }; - 38FA2E221949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */; }; - 38FA2E231949569800FF2BE4 /* CCTimelineActionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */; }; - 38FA2E241949569800FF2BE4 /* CCTimelineActionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */; }; - 38FA2E341949C75600FF2BE4 /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E321949C75600FF2BE4 /* CCNodeReader.cpp */; }; - 38FA2E351949C75600FF2BE4 /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E321949C75600FF2BE4 /* CCNodeReader.cpp */; }; - 38FA2E361949C75600FF2BE4 /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E331949C75600FF2BE4 /* CCNodeReader.h */; }; - 38FA2E371949C75600FF2BE4 /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E331949C75600FF2BE4 /* CCNodeReader.h */; }; 38FA2E49194AC61000FF2BE4 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E43194AC61000FF2BE4 /* CCFrame.cpp */; }; 38FA2E4A194AC61000FF2BE4 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E43194AC61000FF2BE4 /* CCFrame.cpp */; }; 38FA2E4B194AC61000FF2BE4 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E44194AC61000FF2BE4 /* CCFrame.h */; }; @@ -1011,10 +1003,18 @@ 38FA2E4E194AC61000FF2BE4 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E45194AC61000FF2BE4 /* CCTimeLine.cpp */; }; 38FA2E4F194AC61000FF2BE4 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E46194AC61000FF2BE4 /* CCTimeLine.h */; }; 38FA2E50194AC61000FF2BE4 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E46194AC61000FF2BE4 /* CCTimeLine.h */; }; - 38FA2E51194AC61000FF2BE4 /* CCTimelineAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E47194AC61000FF2BE4 /* CCTimelineAction.cpp */; }; - 38FA2E52194AC61000FF2BE4 /* CCTimelineAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E47194AC61000FF2BE4 /* CCTimelineAction.cpp */; }; - 38FA2E53194AC61000FF2BE4 /* CCTimelineAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E48194AC61000FF2BE4 /* CCTimelineAction.h */; }; - 38FA2E54194AC61000FF2BE4 /* CCTimelineAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E48194AC61000FF2BE4 /* CCTimelineAction.h */; }; + 38FA2E5C194AEA0000FF2BE4 /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E5A194AEA0000FF2BE4 /* CCActionTimeline.cpp */; }; + 38FA2E5D194AEA0000FF2BE4 /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E5A194AEA0000FF2BE4 /* CCActionTimeline.cpp */; }; + 38FA2E5E194AEA0000FF2BE4 /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E5B194AEA0000FF2BE4 /* CCActionTimeline.h */; }; + 38FA2E5F194AEA0000FF2BE4 /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E5B194AEA0000FF2BE4 /* CCActionTimeline.h */; }; + 38FA2E66194AEB0600FF2BE4 /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E62194AEB0600FF2BE4 /* CCActionTimelineCache.cpp */; }; + 38FA2E67194AEB0600FF2BE4 /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E62194AEB0600FF2BE4 /* CCActionTimelineCache.cpp */; }; + 38FA2E68194AEB0600FF2BE4 /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E63194AEB0600FF2BE4 /* CCActionTimelineCache.h */; }; + 38FA2E69194AEB0600FF2BE4 /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E63194AEB0600FF2BE4 /* CCActionTimelineCache.h */; }; + 38FA2E6A194AEB0600FF2BE4 /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E64194AEB0600FF2BE4 /* CCNodeReader.cpp */; }; + 38FA2E6B194AEB0600FF2BE4 /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E64194AEB0600FF2BE4 /* CCNodeReader.cpp */; }; + 38FA2E6C194AEB0600FF2BE4 /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E65194AEB0600FF2BE4 /* CCNodeReader.h */; }; + 38FA2E6D194AEB0600FF2BE4 /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E65194AEB0600FF2BE4 /* CCNodeReader.h */; }; 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; 460E468118080832000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; }; @@ -2295,16 +2295,16 @@ 37936A3C1869B76800E974DD /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = ""; }; 37936A3D1869B76800E974DD /* stringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringbuffer.h; sourceTree = ""; }; 37936A3E1869B76800E974DD /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = ""; }; - 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimelineActionCache.cpp; sourceTree = ""; }; - 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimelineActionCache.h; sourceTree = ""; }; - 38FA2E321949C75600FF2BE4 /* CCNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCNodeReader.cpp; sourceTree = ""; }; - 38FA2E331949C75600FF2BE4 /* CCNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNodeReader.h; sourceTree = ""; }; 38FA2E43194AC61000FF2BE4 /* CCFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFrame.cpp; sourceTree = ""; }; 38FA2E44194AC61000FF2BE4 /* CCFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFrame.h; sourceTree = ""; }; 38FA2E45194AC61000FF2BE4 /* CCTimeLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimeLine.cpp; sourceTree = ""; }; 38FA2E46194AC61000FF2BE4 /* CCTimeLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimeLine.h; sourceTree = ""; }; - 38FA2E47194AC61000FF2BE4 /* CCTimelineAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimelineAction.cpp; sourceTree = ""; }; - 38FA2E48194AC61000FF2BE4 /* CCTimelineAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimelineAction.h; sourceTree = ""; }; + 38FA2E5A194AEA0000FF2BE4 /* CCActionTimeline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionTimeline.cpp; sourceTree = ""; }; + 38FA2E5B194AEA0000FF2BE4 /* CCActionTimeline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCActionTimeline.h; sourceTree = ""; }; + 38FA2E62194AEB0600FF2BE4 /* CCActionTimelineCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionTimelineCache.cpp; sourceTree = ""; }; + 38FA2E63194AEB0600FF2BE4 /* CCActionTimelineCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCActionTimelineCache.h; sourceTree = ""; }; + 38FA2E64194AEB0600FF2BE4 /* CCNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCNodeReader.cpp; sourceTree = ""; }; + 38FA2E65194AEB0600FF2BE4 /* CCNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNodeReader.h; sourceTree = ""; }; 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = ""; }; 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoPlayerIOS.mm; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; @@ -3024,12 +3024,12 @@ 1A570046180BC59A0088DEC7 /* actions */ = { isa = PBXGroup; children = ( + 38FA2E5A194AEA0000FF2BE4 /* CCActionTimeline.cpp */, + 38FA2E5B194AEA0000FF2BE4 /* CCActionTimeline.h */, 38FA2E43194AC61000FF2BE4 /* CCFrame.cpp */, 38FA2E44194AC61000FF2BE4 /* CCFrame.h */, 38FA2E45194AC61000FF2BE4 /* CCTimeLine.cpp */, 38FA2E46194AC61000FF2BE4 /* CCTimeLine.h */, - 38FA2E47194AC61000FF2BE4 /* CCTimelineAction.cpp */, - 38FA2E48194AC61000FF2BE4 /* CCTimelineAction.h */, 2986667818B1B079000E39CA /* CCTweenFunction.cpp */, 2986667918B1B079000E39CA /* CCTweenFunction.h */, 1A570047180BC5A10088DEC7 /* CCAction.cpp */, @@ -3595,7 +3595,7 @@ 1A8C5946180E930E00EF57C3 /* cocostudio */ = { isa = PBXGroup; children = ( - 38FA2E001949569800FF2BE4 /* TimelineAction */, + 38FA2E61194AEB0600FF2BE4 /* ActionTimeline */, 50FCEB6818C72017004AD434 /* WidgetReader */, 06CAAAC1186AD63B0012A414 /* TriggerObj.h */, 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */, @@ -4039,15 +4039,15 @@ path = internal; sourceTree = ""; }; - 38FA2E001949569800FF2BE4 /* TimelineAction */ = { + 38FA2E61194AEB0600FF2BE4 /* ActionTimeline */ = { isa = PBXGroup; children = ( - 38FA2E321949C75600FF2BE4 /* CCNodeReader.cpp */, - 38FA2E331949C75600FF2BE4 /* CCNodeReader.h */, - 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */, - 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */, + 38FA2E62194AEB0600FF2BE4 /* CCActionTimelineCache.cpp */, + 38FA2E63194AEB0600FF2BE4 /* CCActionTimelineCache.h */, + 38FA2E64194AEB0600FF2BE4 /* CCNodeReader.cpp */, + 38FA2E65194AEB0600FF2BE4 /* CCNodeReader.h */, ); - path = TimelineAction; + path = ActionTimeline; sourceTree = ""; }; 46A15FD01807A56F005B8026 /* audio */ = { @@ -5146,6 +5146,7 @@ 50ABBE7F1925AB6F00A911A9 /* CCEventTouch.h in Headers */, 50ABBE5B1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */, 1A01C69E18F57BE800EFE3A6 /* CCString.h in Headers */, + 38FA2E5E194AEA0000FF2BE4 /* CCActionTimeline.h in Headers */, 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */, 50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */, 50ABBE3B1925AB6F00A911A9 /* CCData.h in Headers */, @@ -5200,10 +5201,9 @@ 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */, 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */, 1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */, - 38FA2E231949569800FF2BE4 /* CCTimelineActionCache.h in Headers */, 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */, 1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */, - 38FA2E361949C75600FF2BE4 /* CCNodeReader.h in Headers */, + 38FA2E6C194AEB0600FF2BE4 /* CCNodeReader.h in Headers */, 1A8C59CD180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, 50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */, 50ABBEC71925AB6F00A911A9 /* etc1.h in Headers */, @@ -5214,6 +5214,7 @@ 1A8C59D9180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, 50ABC0691926664800A911A9 /* CCStdC.h in Headers */, 50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */, + 38FA2E68194AEB0600FF2BE4 /* CCActionTimelineCache.h in Headers */, 50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, 1A8C59DD180E930E00EF57C3 /* CCDisplayManager.h in Headers */, 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */, @@ -5230,7 +5231,6 @@ 1A8C59FD180E930E00EF57C3 /* CCTween.h in Headers */, 1A8C5A05180E930E00EF57C3 /* CCUtilMath.h in Headers */, 50ABC0091926664800A911A9 /* CCCommon.h in Headers */, - 38FA2E53194AC61000FF2BE4 /* CCTimelineAction.h in Headers */, 50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, 1A8C5A07180E930E00EF57C3 /* CocoStudio.h in Headers */, 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */, @@ -5430,14 +5430,15 @@ 1A57007C180BC5A10088DEC7 /* CCActionInstant.h in Headers */, 50ABBE781925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, B37510861823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, + 38FA2E5F194AEA0000FF2BE4 /* CCActionTimeline.h in Headers */, 1A570080180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A570084180BC5A10088DEC7 /* CCActionManager.h in Headers */, 50ABC0141926664800A911A9 /* CCGLViewProtocol.h in Headers */, 1A570088180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, 50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */, + 38FA2E6D194AEB0600FF2BE4 /* CCNodeReader.h in Headers */, 1A57008C180BC5A10088DEC7 /* CCActionProgressTimer.h in Headers */, 2905FA8318CF08D100240AA3 /* UITextAtlas.h in Headers */, - 38FA2E371949C75600FF2BE4 /* CCNodeReader.h in Headers */, 1A570090180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */, 1A570094180BC5A10088DEC7 /* CCActionTween.h in Headers */, 1A57009B180BC5C10088DEC7 /* CCAtlasNode.h in Headers */, @@ -5481,7 +5482,6 @@ 1A5701C0180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */, 50ABBE681925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */, 5034CA42191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, - 38FA2E54194AC61000FF2BE4 /* CCTimelineAction.h in Headers */, 1A5701C4180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, 50ABBDA61925AB4100A911A9 /* CCQuadCommand.h in Headers */, 50ABBE9E1925AB6F00A911A9 /* CCRefPtr.h in Headers */, @@ -5640,6 +5640,7 @@ 06CAAACA186AD7EF0012A414 /* TriggerMng.h in Headers */, 1AD71EBC180E26E600808F54 /* CCSkeleton.h in Headers */, 1A01C69718F57BE800EFE3A6 /* CCInteger.h in Headers */, + 38FA2E69194AEB0600FF2BE4 /* CCActionTimelineCache.h in Headers */, 50FCEBB218C72017004AD434 /* ScrollViewReader.h in Headers */, 50ABBEBE1925AB6F00A911A9 /* ccUtils.h in Headers */, 50ABBE801925AB6F00A911A9 /* CCEventTouch.h in Headers */, @@ -5727,7 +5728,6 @@ 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */, 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */, - 38FA2E241949569800FF2BE4 /* CCTimelineActionCache.h in Headers */, 1A8C59FA180E930E00EF57C3 /* CCTransformHelp.h in Headers */, 50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */, 1A8C59FE180E930E00EF57C3 /* CCTween.h in Headers */, @@ -6105,7 +6105,6 @@ 46A170EA1807CECA005B8026 /* CCPhysicsJoint.cpp in Sources */, 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */, 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */, - 38FA2E51194AC61000FF2BE4 /* CCTimelineAction.cpp in Sources */, 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */, 46A170EF1807CECA005B8026 /* CCPhysicsWorld.cpp in Sources */, 46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */, @@ -6216,8 +6215,8 @@ B29594C21926D61F003EEF37 /* CCMesh.cpp in Sources */, 50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, - 38FA2E211949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */, 50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, + 38FA2E5C194AEA0000FF2BE4 /* CCActionTimeline.cpp in Sources */, 50FCEBAB18C72017004AD434 /* PageViewReader.cpp in Sources */, 1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, 50ABBD971925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, @@ -6225,7 +6224,7 @@ 50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, 1A5702F2180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, 38FA2E4D194AC61000FF2BE4 /* CCTimeLine.cpp in Sources */, - 38FA2E341949C75600FF2BE4 /* CCNodeReader.cpp in Sources */, + 38FA2E6A194AEB0600FF2BE4 /* CCNodeReader.cpp in Sources */, 1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, 1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, 50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */, @@ -6346,6 +6345,7 @@ 1A8C59B3180E930E00EF57C3 /* CCBone.cpp in Sources */, 1A8C59B7180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, 1A8C59BB180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, + 38FA2E66194AEB0600FF2BE4 /* CCActionTimelineCache.cpp in Sources */, 50ABBD871925AB4100A911A9 /* CCCustomCommand.cpp in Sources */, 1A8C59BF180E930E00EF57C3 /* CCComAudio.cpp in Sources */, 1A8C59C3180E930E00EF57C3 /* CCComController.cpp in Sources */, @@ -6564,6 +6564,7 @@ 38FA2E4A194AC61000FF2BE4 /* CCFrame.cpp in Sources */, 1A57006A180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, 1A57006E180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, + 38FA2E5D194AEA0000FF2BE4 /* CCActionTimeline.cpp in Sources */, 50ABBD8C1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, 1A570072180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, 50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, @@ -6587,7 +6588,6 @@ 50ABBE421925AB6F00A911A9 /* CCDirector.cpp in Sources */, 1A57007E180BC5A10088DEC7 /* CCActionInterval.cpp in Sources */, 1A570082180BC5A10088DEC7 /* CCActionManager.cpp in Sources */, - 38FA2E221949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */, 1A570086180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */, 1A57008A180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */, B29594CB1926D61F003EEF37 /* CCSprite3D.cpp in Sources */, @@ -6596,7 +6596,6 @@ 1A57008E180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */, 1A570092180BC5A10088DEC7 /* CCActionTween.cpp in Sources */, 1A570099180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, - 38FA2E52194AC61000FF2BE4 /* CCTimelineAction.cpp in Sources */, 50ABBD4D1925AB0000A911A9 /* MathUtil.cpp in Sources */, 50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A57009F180BC5D20088DEC7 /* CCNode.cpp in Sources */, @@ -6616,8 +6615,8 @@ 1A5701B6180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */, 50ABBEAC1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A5701BA180BCB5A0088DEC7 /* CCLabel.cpp in Sources */, - 38FA2E351949C75600FF2BE4 /* CCNodeReader.cpp in Sources */, 2905FA4B18CF08D100240AA3 /* UICheckBox.cpp in Sources */, + 38FA2E6B194AEB0600FF2BE4 /* CCNodeReader.cpp in Sources */, 1A5701BE180BCB5A0088DEC7 /* CCLabelAtlas.cpp in Sources */, 1A5701C2180BCB5A0088DEC7 /* CCLabelBMFont.cpp in Sources */, 1A087AE91860400400196EF5 /* edtaa3func.cpp in Sources */, @@ -6627,6 +6626,7 @@ 299754F5193EC95400A54AC3 /* ObjectFactory.cpp in Sources */, 1A5701DF180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, 50ABBDBE1925AB4100A911A9 /* CCTextureCache.cpp in Sources */, + 38FA2E67194AEB0600FF2BE4 /* CCActionTimelineCache.cpp in Sources */, 1A5701E3180BCB8C0088DEC7 /* CCScene.cpp in Sources */, 50ABBD611925AB0000A911A9 /* Vec4.cpp in Sources */, 50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 6d8ff80b41..7b1632cc59 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -804,10 +804,10 @@ 29080DE4191B595E0066F8DF /* UIWidgetAddNodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D89191B595E0066F8DF /* UIWidgetAddNodeTest.cpp */; }; 29080DE5191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; 29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; - 38FA2DFC194955BA00FF2BE4 /* TimelineActionTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2DFA194955BA00FF2BE4 /* TimelineActionTestScene.cpp */; }; - 38FA2DFD194955BA00FF2BE4 /* TimelineActionTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2DFA194955BA00FF2BE4 /* TimelineActionTestScene.cpp */; }; - 38FA2E261949577F00FF2BE4 /* TimelineAction in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E251949577F00FF2BE4 /* TimelineAction */; }; - 38FA2E271949577F00FF2BE4 /* TimelineAction in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E251949577F00FF2BE4 /* TimelineAction */; }; + 38FA2E73194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */; }; + 38FA2E74194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */; }; + 38FA2E76194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; + 38FA2E77194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 3E92EA821921A1400094CD21 /* Sprite3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */; }; 3E92EA831921A1400094CD21 /* Sprite3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */; }; 3E92EA851921A7720094CD21 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; @@ -1844,9 +1844,9 @@ 29080D8A191B595E0066F8DF /* UIWidgetAddNodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest.h; sourceTree = ""; }; 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidgetAddNodeTest_Editor.cpp; sourceTree = ""; }; 29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest_Editor.h; sourceTree = ""; }; - 38FA2DFA194955BA00FF2BE4 /* TimelineActionTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimelineActionTestScene.cpp; sourceTree = ""; }; - 38FA2DFB194955BA00FF2BE4 /* TimelineActionTestScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineActionTestScene.h; sourceTree = ""; }; - 38FA2E251949577F00FF2BE4 /* TimelineAction */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TimelineAction; path = "../tests/cpp-tests/Resources/TimelineAction"; sourceTree = ""; }; + 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionTimelineTestScene.cpp; sourceTree = ""; }; + 38FA2E72194AEBE100FF2BE4 /* ActionTimelineTestScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActionTimelineTestScene.h; sourceTree = ""; }; + 38FA2E75194AECF800FF2BE4 /* ActionTimeline */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ActionTimeline; path = "../tests/cpp-tests/Resources/ActionTimeline"; sourceTree = ""; }; 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sprite3DTest.cpp; path = Sprite3DTest/Sprite3DTest.cpp; sourceTree = ""; }; 3E92EA811921A1400094CD21 /* Sprite3DTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sprite3DTest.h; path = Sprite3DTest/Sprite3DTest.h; sourceTree = ""; }; 3E92EA841921A7720094CD21 /* Sprite3DTest */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Sprite3DTest; path = "../tests/cpp-tests/Resources/Sprite3DTest"; sourceTree = ""; }; @@ -2548,7 +2548,7 @@ 1AC359B418CECF0B00F37B72 /* ExtensionsTest */ = { isa = PBXGroup; children = ( - 38FA2DF9194955BA00FF2BE4 /* CocoStudioTimelineActionTest */, + 38FA2E70194AEBE100FF2BE4 /* CocoStudioActionTimelineTest */, 1AC359B518CECF0B00F37B72 /* CocosBuilderTest */, 1AC359DC18CECF0B00F37B72 /* CocoStudioArmatureTest */, 1AC359DF18CECF0B00F37B72 /* CocoStudioComponentsTest */, @@ -3248,7 +3248,7 @@ 1AC35CA818CED83500F37B72 /* Resources */ = { isa = PBXGroup; children = ( - 38FA2E251949577F00FF2BE4 /* TimelineAction */, + 38FA2E75194AECF800FF2BE4 /* ActionTimeline */, B2507B6A192589AF00FA4972 /* Shaders3D */, 3E92EA841921A7720094CD21 /* Sprite3DTest */, 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */, @@ -3766,13 +3766,13 @@ name = Frameworks; sourceTree = ""; }; - 38FA2DF9194955BA00FF2BE4 /* CocoStudioTimelineActionTest */ = { + 38FA2E70194AEBE100FF2BE4 /* CocoStudioActionTimelineTest */ = { isa = PBXGroup; children = ( - 38FA2DFA194955BA00FF2BE4 /* TimelineActionTestScene.cpp */, - 38FA2DFB194955BA00FF2BE4 /* TimelineActionTestScene.h */, + 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */, + 38FA2E72194AEBE100FF2BE4 /* ActionTimelineTestScene.h */, ); - path = CocoStudioTimelineActionTest; + path = CocoStudioActionTimelineTest; sourceTree = ""; }; 3E92EA7D1921A0C60094CD21 /* Sprite3DTest */ = { @@ -4401,10 +4401,10 @@ 1AC35CE018CED84500F37B72 /* configs in Resources */, 1AC35CE618CED84500F37B72 /* effect2.ogg in Resources */, 1AC35CFA18CED84500F37B72 /* Misc in Resources */, + 38FA2E76194AECF800FF2BE4 /* ActionTimeline in Resources */, 1AC35D0418CED84500F37B72 /* Shaders in Resources */, 1AC35CD818CED84500F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, B2507B6B192589AF00FA4972 /* Shaders3D in Resources */, - 38FA2E261949577F00FF2BE4 /* TimelineAction in Resources */, 1AC35D0618CED84500F37B72 /* spine in Resources */, 1AC35CE818CED84500F37B72 /* extensions in Resources */, 1AC35CDE18CED84500F37B72 /* components in Resources */, @@ -4445,7 +4445,6 @@ 1AC35CE318CED84500F37B72 /* effect1.raw in Resources */, 1A221C9D191771E400FD2BE4 /* ccs-res in Resources */, 1AC35C9018CECF1400F37B72 /* Icon-29.png in Resources */, - 38FA2E271949577F00FF2BE4 /* TimelineAction in Resources */, 1AC35D0918CED84500F37B72 /* TileMaps in Resources */, 1AC35CFF18CED84500F37B72 /* Particles in Resources */, 1AC35C8818CECF1400F37B72 /* Default-568h@2x.png in Resources */, @@ -4471,6 +4470,7 @@ 1AC35CF318CED84500F37B72 /* Hello.png in Resources */, 1AC35C8F18CECF1400F37B72 /* Icon-152.png in Resources */, 1AC35CE718CED84500F37B72 /* effect2.ogg in Resources */, + 38FA2E77194AECF800FF2BE4 /* ActionTimeline in Resources */, 1AC35C9718CECF1400F37B72 /* Icon-80.png in Resources */, 1AC35CEB18CED84500F37B72 /* fileLookup.plist in Resources */, 1AC35CFD18CED84500F37B72 /* music.mid in Resources */, @@ -4682,7 +4682,6 @@ 1AC35B3318CECF0C00F37B72 /* Test.cpp in Sources */, 1AC35C2318CECF0C00F37B72 /* ParticleTest.cpp in Sources */, 1AC35C6118CECF0C00F37B72 /* TouchesTest.cpp in Sources */, - 38FA2DFC194955BA00FF2BE4 /* TimelineActionTestScene.cpp in Sources */, 1AC35C6318CECF0C00F37B72 /* TransitionsTest.cpp in Sources */, 29080DB3191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */, 29080DB9191B595E0066F8DF /* UILoadingBarTest.cpp in Sources */, @@ -4707,6 +4706,7 @@ 1AC35C2B18CECF0C00F37B72 /* PerformanceLabelTest.cpp in Sources */, 1AC35C0118CECF0C00F37B72 /* TableViewTestScene.cpp in Sources */, 1AC35C4B18CECF0C00F37B72 /* ShaderTest2.cpp in Sources */, + 38FA2E73194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */, 1AC35C6518CECF0C00F37B72 /* UnitTest.cpp in Sources */, 29080DC9191B595E0066F8DF /* UISceneManager_Editor.cpp in Sources */, 1AC35B3F18CECF0C00F37B72 /* Bug-458.cpp in Sources */, @@ -4750,6 +4750,7 @@ 29080D8E191B595E0066F8DF /* CocosGUIScene.cpp in Sources */, 1AC35BFA18CECF0C00F37B72 /* WebSocketTest.cpp in Sources */, 1AC35BF218CECF0C00F37B72 /* EditBoxTest.cpp in Sources */, + 38FA2E74194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */, 1AC35B3A18CECF0C00F37B72 /* Bug-1174.cpp in Sources */, 1AC35BE418CECF0C00F37B72 /* CCControlColourPickerTest.cpp in Sources */, 29080DD4191B595E0066F8DF /* UITextAtlasTest.cpp in Sources */, @@ -4800,7 +4801,6 @@ 1AC35C1818CECF0C00F37B72 /* MotionStreakTest.cpp in Sources */, 1AC35C0618CECF0C00F37B72 /* FontTest.cpp in Sources */, 1AC35C3818CECF0C00F37B72 /* PerformanceTest.cpp in Sources */, - 38FA2DFD194955BA00FF2BE4 /* TimelineActionTestScene.cpp in Sources */, 1F33635018E37E840074764D /* RefPtrTest.cpp in Sources */, 1AC35B2818CECF0C00F37B72 /* ActionsTest.cpp in Sources */, 1AC35C4A18CECF0C00F37B72 /* ShaderTest.cpp in Sources */, diff --git a/cocos/2d/CCFrame.h b/cocos/2d/CCFrame.h index 475e6bb63f..41c48ff538 100644 --- a/cocos/2d/CCFrame.h +++ b/cocos/2d/CCFrame.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "math/Vec2.h" -#include "GL/glew.h" +#include "CCGL.h" #include "base/ccTypes.h" #include