diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index f2205a3f87..f632b40d24 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -303,7 +303,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -332,8 +331,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - @@ -502,7 +499,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -531,8 +527,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters index 3129e329f0..2755aa6244 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/cocos2d.vcxproj.filters @@ -568,15 +568,6 @@ base - - 2d - - - 2d - - - 2d - @@ -1159,15 +1150,6 @@ base - - 2d - - - 2d - - - 2d - diff --git a/cocos/Android.mk b/cocos/Android.mk index ba61451572..1112b4abd9 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -21,9 +21,6 @@ cocos2d.cpp \ 2d/CCActionProgressTimer.cpp \ 2d/CCActionTiledGrid.cpp \ 2d/CCActionTween.cpp \ -2d/CCFrame.cpp \ -2d/CCTimeline.cpp \ -2d/CCActionTimeline.cpp \ 2d/CCAnimation.cpp \ 2d/CCAnimationCache.cpp \ 2d/CCAtlasNode.cpp \ diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 066aabcdce..1e795488b2 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -104,9 +104,6 @@ THE SOFTWARE. #include "2d/CCActionTween.h" #include "2d/CCActionCatmullRom.h" #include "2d/CCTweenFunction.h" -#include "2d/CCFrame.h" -#include "2d/CCTimeLine.h" -#include "2d/CCActionTimeline.h" // 2d nodes #include "2d/CCNode.h" diff --git a/cocos/2d/CCActionTimeline.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp similarity index 99% rename from cocos/2d/CCActionTimeline.cpp rename to cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp index 4724e12769..0253c4f550 100644 --- a/cocos/2d/CCActionTimeline.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp @@ -24,8 +24,9 @@ THE SOFTWARE. #include "CCActionTimeline.h" -NS_CC_BEGIN +USING_NS_CC; +NS_TIMELINE_BEGIN // ActionTimelineData ActionTimelineData* ActionTimelineData::create(int actionTag) @@ -271,4 +272,4 @@ void ActionTimeline::stepToFrame(int frameIndex) } } -NS_CC_END +NS_TIMELINE_END diff --git a/cocos/2d/CCActionTimeline.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h similarity index 91% rename from cocos/2d/CCActionTimeline.h rename to cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h index 1a4d6fe8fe..d3c7b2c3bd 100644 --- a/cocos/2d/CCActionTimeline.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h @@ -25,15 +25,12 @@ THE SOFTWARE. #ifndef __CCTIMELINE_ACTION_H__ #define __CCTIMELINE_ACTION_H__ -#include "2d/CCNode.h" -#include "2d/CCAction.h" -#include "2d/CCTimeLine.h" -#include "base/CCRef.h" +#include "CCTimeLine.h" #include "renderer/CCRenderer.h" -NS_CC_BEGIN +NS_TIMELINE_BEGIN -class CC_DLL ActionTimelineData : public Ref +class ActionTimelineData : public cocos2d::Ref { public: static ActionTimelineData* create(int actionTag); @@ -48,7 +45,7 @@ protected: }; -class CC_DLL ActionTimeline : public Action +class ActionTimeline : public cocos2d::Action { public: friend class Frame; @@ -113,7 +110,7 @@ public: virtual void addTimeline(Timeline* timeline); virtual void removeTimeline(Timeline* timeline); - virtual const Vector& getTimelines() const { return _timelineList; } + virtual const cocos2d::Vector& getTimelines() const { return _timelineList; } /** Set ActionTimeline's frame event callback function */ void setFrameEventCallFunc(std::function listener); @@ -130,7 +127,7 @@ public: virtual ActionTimeline* reverse() const override { return nullptr; } virtual void step(float delta) override; - virtual void startWithTarget(Node *target) override; + virtual void startWithTarget(cocos2d::Node *target) override; virtual bool isDone() const override { return false; } protected: virtual void gotoFrame(int frameIndex); @@ -139,8 +136,8 @@ protected: /** emit frame event, call it when enter a frame*/ virtual void emitFrameEvent(Frame* frame); - std::map> _timelineMap; - Vector _timelineList; + std::map> _timelineMap; + cocos2d::Vector _timelineList; int _duration; double _time; @@ -154,7 +151,7 @@ protected: std::function _frameEventListener; }; -NS_CC_END +NS_TIMELINE_END #endif /*__CCTIMELINE_ACTION_H__*/ diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp index c25f2ab4f7..41bd51d4d1 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp @@ -24,6 +24,9 @@ THE SOFTWARE. #include "CCActionTimelineCache.h" #include "CCNodeReader.h" +#include "CCFrame.h" +#include "CCTimeLine.h" +#include "CCActionTimeline.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h index bb59debd48..3f9547e822 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h @@ -27,10 +27,13 @@ THE SOFTWARE. #include "cocos2d.h" #include "cocostudio/DictionaryHelper.h" +#include "CCTimelineMacro.h" +NS_TIMELINE_BEGIN -namespace cocostudio { -namespace timeline{ +class ActionTimeline; +class Timeline; +class Frame; class ActionTimelineCache { @@ -49,38 +52,36 @@ public: void removeAction(const std::string& fileName); /** Clone a action with the specified name from the container. */ - cocos2d::ActionTimeline* createAction(const std::string& fileName); + ActionTimeline* createAction(const std::string& fileName); - cocos2d::ActionTimeline* loadAnimationActionWithFile(const std::string& fileName); - cocos2d::ActionTimeline* loadAnimationActionWithContent(const std::string&fileName, const std::string& content); + ActionTimeline* loadAnimationActionWithFile(const std::string& fileName); + ActionTimeline* loadAnimationActionWithContent(const std::string&fileName, const std::string& content); protected: - cocos2d::Timeline* loadTimeline(const rapidjson::Value& json); + Timeline* loadTimeline(const rapidjson::Value& json); - cocos2d::Frame* loadVisibleFrame (const rapidjson::Value& json); - cocos2d::Frame* loadPositionFrame (const rapidjson::Value& json); - cocos2d::Frame* loadScaleFrame (const rapidjson::Value& json); - cocos2d::Frame* loadSkewFrame (const rapidjson::Value& json); - cocos2d::Frame* loadRotationSkewFrame(const rapidjson::Value& json); - cocos2d::Frame* loadRotationFrame (const rapidjson::Value& json); - cocos2d::Frame* loadAnchorPointFrame (const rapidjson::Value& json); - cocos2d::Frame* loadInnerActionFrame (const rapidjson::Value& json); - cocos2d::Frame* loadColorFrame (const rapidjson::Value& json); - cocos2d::Frame* loadTextureFrame (const rapidjson::Value& json); - cocos2d::Frame* loadEventFrame (const rapidjson::Value& json); - cocos2d::Frame* loadZOrderFrame (const rapidjson::Value& json); + Frame* loadVisibleFrame (const rapidjson::Value& json); + Frame* loadPositionFrame (const rapidjson::Value& json); + Frame* loadScaleFrame (const rapidjson::Value& json); + Frame* loadSkewFrame (const rapidjson::Value& json); + Frame* loadRotationSkewFrame(const rapidjson::Value& json); + Frame* loadRotationFrame (const rapidjson::Value& json); + Frame* loadAnchorPointFrame (const rapidjson::Value& json); + Frame* loadInnerActionFrame (const rapidjson::Value& json); + Frame* loadColorFrame (const rapidjson::Value& json); + Frame* loadTextureFrame (const rapidjson::Value& json); + Frame* loadEventFrame (const rapidjson::Value& json); + Frame* loadZOrderFrame (const rapidjson::Value& json); protected: - typedef std::function FrameCreateFunc; + typedef std::function FrameCreateFunc; typedef std::pair Pair; std::unordered_map _funcs; - cocos2d::Map _animationActions; + cocos2d::Map _animationActions; }; -} -} - +NS_TIMELINE_END #endif /*__CCTIMELINE_ACTION_CACHE_H__*/ diff --git a/cocos/2d/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp similarity index 98% rename from cocos/2d/CCFrame.cpp rename to cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp index aebacf0d99..ca3b267d32 100644 --- a/cocos/2d/CCFrame.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp @@ -22,14 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/CCFrame.h" -#include "2d/CCTimeLine.h" -#include "2d/CCTimeLine.h" -#include "2d/CCActionTimeline.h" -#include "2d/CCSprite.h" -#include "2d/CCSpriteFrameCache.h" +#include "CCFrame.h" +#include "CCTimeLine.h" +#include "CCActionTimeline.h" -NS_CC_BEGIN +USING_NS_CC; + +NS_TIMELINE_BEGIN // Frame Frame::Frame() @@ -642,4 +641,4 @@ Frame* ZOrderFrame::clone() return frame; } -NS_CC_END +NS_TIMELINE_END diff --git a/cocos/2d/CCFrame.h b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h similarity index 83% rename from cocos/2d/CCFrame.h rename to cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h index 41c48ff538..4dfd88cfe7 100644 --- a/cocos/2d/CCFrame.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h @@ -25,18 +25,14 @@ THE SOFTWARE. #ifndef __CCFRAME_H__ #define __CCFRAME_H__ -#include "base/CCRef.h" -#include "math/Vec2.h" -#include "CCGL.h" -#include "base/ccTypes.h" -#include +#include "cocos2d.h" +#include "CCTimelineMacro.h" -NS_CC_BEGIN +NS_TIMELINE_BEGIN -class Sprite; class Timeline; -class CC_DLL Frame : public Ref +class Frame : public cocos2d::Ref { public: @@ -46,8 +42,8 @@ public: virtual void setTimeline(Timeline* timeline) { _timeline = timeline; } virtual Timeline* getTimeline() const { return _timeline; } - virtual void setNode(Node* node) { _node = node; } - virtual Node* getTimelineNode() const { return _node; } + virtual void setNode(cocos2d::Node* node) { _node = node; } + virtual cocos2d::Node* getTimelineNode() const { return _node; } virtual void setTween(bool tween) { _tween = tween; } virtual bool isTween() const { return _tween; } @@ -68,11 +64,11 @@ protected: bool _tween; Timeline* _timeline; - Node* _node; + cocos2d::Node* _node; }; -class CC_DLL VisibleFrame : public Frame +class VisibleFrame : public Frame { public: static VisibleFrame* create(); @@ -90,14 +86,14 @@ protected: }; -class CC_DLL TextureFrame : public Frame +class TextureFrame : public Frame { public: static TextureFrame* create(); TextureFrame(); - virtual void setNode(Node* node); + virtual void setNode(cocos2d::Node* node); virtual void onEnter(Frame *nextFrame) override; virtual Frame* clone() override; @@ -106,11 +102,11 @@ public: inline std::string getTexture() const { return _texture; } protected: - Sprite* _sprite; + cocos2d::Sprite* _sprite; std::string _texture; }; -class CC_DLL RotationFrame : public Frame +class RotationFrame : public Frame { public: static RotationFrame* create(); @@ -129,7 +125,7 @@ protected: float _betwennRotation; }; -class CC_DLL SkewFrame : public Frame +class SkewFrame : public Frame { public: static SkewFrame* create(); @@ -154,7 +150,7 @@ protected: }; -class CC_DLL RotationSkewFrame : public SkewFrame +class RotationSkewFrame : public SkewFrame { public: static RotationSkewFrame* create(); @@ -167,7 +163,7 @@ public: }; -class CC_DLL PositionFrame : public Frame +class PositionFrame : public Frame { public: static PositionFrame* create(); @@ -178,8 +174,8 @@ public: virtual void apply(float percent) override; virtual Frame* clone() override; - inline void setPosition(const Point& position) { _position = position; } - inline Point getPosition() const { return _position; } + inline void setPosition(const cocos2d::Point& position) { _position = position; } + inline cocos2d::Point getPosition() const { return _position; } inline void setX(float x) { _position.x = x; } inline void setY(float y) { _position.y = y; } @@ -187,13 +183,13 @@ public: inline float getX() const { return _position.x; } inline float getY() const { return _position.y; } protected: - Point _position; + cocos2d::Point _position; float _betweenX; float _betweenY; }; -class CC_DLL ScaleFrame : public Frame +class ScaleFrame : public Frame { public: static ScaleFrame* create(); @@ -220,7 +216,7 @@ protected: }; -class CC_DLL AnchorPointFrame : public Frame +class AnchorPointFrame : public Frame { public: static AnchorPointFrame* create(); @@ -230,11 +226,11 @@ public: virtual void onEnter(Frame *nextFrame) override; virtual Frame* clone() override; - inline void setAnchorPoint(const Point& point) { _anchorPoint = point; } - inline Point getAnchorPoint() const { return _anchorPoint; } + inline void setAnchorPoint(const cocos2d::Point& point) { _anchorPoint = point; } + inline cocos2d::Point getAnchorPoint() const { return _anchorPoint; } protected: - Point _anchorPoint; + cocos2d::Point _anchorPoint; }; @@ -246,7 +242,7 @@ enum InnerActionType SingleFrame }; -class CC_DLL InnerActionFrame : public Frame +class InnerActionFrame : public Frame { public: static InnerActionFrame* create(); @@ -267,7 +263,7 @@ protected: }; -class CC_DLL ColorFrame : public Frame +class ColorFrame : public Frame { public: static ColorFrame* create(); @@ -280,12 +276,12 @@ public: inline void setAlpha(GLubyte alpha) { _alpha = alpha; } inline GLubyte getAlpha() const { return _alpha; } - inline void setColor(const Color3B& color) { _color = color; } - inline Color3B getColor() const { return _color; } + inline void setColor(const cocos2d::Color3B& color) { _color = color; } + inline cocos2d::Color3B getColor() const { return _color; } protected: GLubyte _alpha; - Color3B _color; + cocos2d::Color3B _color; int _betweenAlpha; int _betweenRed; @@ -294,7 +290,7 @@ protected: }; -class CC_DLL EventFrame : public Frame +class EventFrame : public Frame { public: static EventFrame* create(); @@ -311,7 +307,7 @@ protected: std::string _event; }; -class CC_DLL ZOrderFrame : public Frame +class ZOrderFrame : public Frame { public: static ZOrderFrame* create(); @@ -328,7 +324,7 @@ protected: int _zorder; }; -NS_CC_END +NS_TIMELINE_END #endif /*__CCFRAME_H__*/ diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp index 2b70e8488c..1a1f7c0b51 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp @@ -24,6 +24,7 @@ THE SOFTWARE. #include "CCNodeReader.h" #include "CCActionTimelineCache.h" +#include "CCActionTimeline.h" #include "../CCSGUIReader.h" diff --git a/cocos/2d/CCTimeLine.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp similarity index 99% rename from cocos/2d/CCTimeLine.cpp rename to cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp index e04fe6fdc2..7516cbc255 100644 --- a/cocos/2d/CCTimeLine.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp @@ -25,7 +25,9 @@ THE SOFTWARE. #include "CCTimeLine.h" #include "CCActionTimeline.h" -NS_CC_BEGIN +USING_NS_CC; + +NS_TIMELINE_BEGIN Timeline* Timeline::create() { @@ -244,4 +246,4 @@ void Timeline::updateCurrentKeyFrame(int frameIndex) } } -NS_CC_END +NS_TIMELINE_END diff --git a/cocos/2d/CCTimeLine.h b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h similarity index 86% rename from cocos/2d/CCTimeLine.h rename to cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h index 474f4ded3f..d81f44488f 100644 --- a/cocos/2d/CCTimeLine.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h @@ -25,14 +25,14 @@ THE SOFTWARE. #ifndef __CCTIMELINE_H__ #define __CCTIMELINE_H__ -#include "2d/CCNode.h" -#include "2d/CCFrame.h" +#include "CCFrame.h" +#include "CCTimelineMacro.h" -NS_CC_BEGIN +NS_TIMELINE_BEGIN class ActionTimeline; -class CC_DLL Timeline : public Ref +class Timeline : public cocos2d::Ref { public: static Timeline* create(); @@ -43,7 +43,7 @@ public: virtual void gotoFrame(int frameIndex); virtual void stepToFrame(int frameIndex); - virtual const Vector& getFrames() const { return _frames; } + virtual const cocos2d::Vector& getFrames() const { return _frames; } virtual void addFrame(Frame* frame); virtual void insertFrame(Frame* frame, int index); @@ -52,8 +52,8 @@ public: virtual void setActionTag(int tag) { _actionTag = tag; } virtual int getActionTag() const { return _actionTag; } - virtual void setNode(Node* node); - virtual Node* getNode() const; + virtual void setNode(cocos2d::Node* node); + virtual cocos2d::Node* getNode() const; virtual void setActionTimeline(ActionTimeline* action) { _ActionTimeline = action; } virtual ActionTimeline* getActionTimeline() const { return _ActionTimeline; } @@ -66,7 +66,7 @@ protected: virtual void binarySearchKeyFrame (int frameIndex); virtual void updateCurrentKeyFrame(int frameIndex); - Vector _frames; + cocos2d::Vector _frames; Frame* _currentKeyFrame; int _currentKeyFrameIndex; @@ -76,10 +76,10 @@ protected: int _actionTag; ActionTimeline* _ActionTimeline; - Node* _node; + cocos2d::Node* _node; }; -NS_CC_END +NS_TIMELINE_END #endif /*__CCTIMELINE_H__*/ diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h b/cocos/editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h new file mode 100644 index 0000000000..0580adc68e --- /dev/null +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h @@ -0,0 +1,38 @@ +/**************************************************************************** +Copyright (c) 2010-2012 cocos2d-x.org +Copyright (c) 2013-2014 Chukong Technologies + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ +#ifndef __CC_TIMELINE_MACROS_H__ +#define __CC_TIMELINE_MACROS_H__ + +#ifdef __cplusplus +#define NS_TIMELINE_BEGIN namespace cocostudio { namespace timeline{ +#define NS_TIMELINE_END }} +#define USING_NS_TIMELINE using namespace cocostudio::timeline; +#else +#define NS_TIMELINE_BEGIN +#define NS_TIMELINE_END +#define USING_NS_TIMELINE +#endif + +#endif \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk index 620ef3fd9f..07bb09ceb2 100644 --- a/cocos/editor-support/cocostudio/Android.mk +++ b/cocos/editor-support/cocostudio/Android.mk @@ -55,7 +55,9 @@ WidgetReader/TextFieldReader/TextFieldReader.cpp \ WidgetReader/TextReader/TextReader.cpp \ ActionTimeline/CCNodeReader.cpp \ ActionTimeline/CCActionTimelineCache.cpp \ - +ActionTimeline/CCFrame.cpp \ +ActionTimeline/CCTimeline.cpp \ +ActionTimeline/CCActionTimeline.cpp \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../../../external diff --git a/cocos/editor-support/cocostudio/CocoStudio.h b/cocos/editor-support/cocostudio/CocoStudio.h index fa26760fd7..29d8319a38 100644 --- a/cocos/editor-support/cocostudio/CocoStudio.h +++ b/cocos/editor-support/cocostudio/CocoStudio.h @@ -60,5 +60,8 @@ THE SOFTWARE. #include "cocostudio/TriggerBase.h" #include "cocostudio/ActionTimeline/CCNodeReader.h" #include "cocostudio/ActionTimeline/CCActionTimelineCache.h" +#include "cocostudio/ActionTimeline/CCFrame.h" +#include "cocostudio/ActionTimeline/CCTimeLine.h" +#include "cocostudio/ActionTimeline/CCActionTimeline.h" #endif diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj index 850a8e10d4..e3731c1e54 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj @@ -11,8 +11,11 @@ + + + @@ -73,8 +76,12 @@ + + + + diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters index 6cff5ec355..978f5107d2 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters @@ -237,6 +237,15 @@ TimelineAction + + TimelineAction + + + TimelineAction + + + TimelineAction + @@ -425,5 +434,17 @@ TimelineAction + + TimelineAction + + + TimelineAction + + + TimelineAction + + + TimelineAction + \ No newline at end of file