diff --git a/core/Action/Animate.cpp b/core/Action/Animate.cpp index 64eae462..7158815b 100644 --- a/core/Action/Animate.cpp +++ b/core/Action/Animate.cpp @@ -13,16 +13,6 @@ e2d::Animate::Animate(Animation * animation) this->setAnimation(animation); } -e2d::Animate * e2d::Animate::create() -{ - return GC::create(); -} - -e2d::Animate * e2d::Animate::create(Animation * animation) -{ - return GC::create(animation); -} - e2d::Animate::~Animate() { } diff --git a/core/Action/Animation.cpp b/core/Action/Animation.cpp index c5521979..6bf1cb40 100644 --- a/core/Action/Animation.cpp +++ b/core/Action/Animation.cpp @@ -22,26 +22,6 @@ e2d::Animation::Animation(double interval, const std::vector& frames) this->add(frames); } -e2d::Animation * e2d::Animation::create() -{ - return GC::create(); -} - -e2d::Animation * e2d::Animation::create(const std::vector& frames) -{ - return GC::create(frames); -} - -e2d::Animation * e2d::Animation::create(double interval) -{ - return GC::create(interval); -} - -e2d::Animation * e2d::Animation::create(double interval, const std::vector& frames) -{ - return GC::create(interval, frames); -} - e2d::Animation::~Animation() { } diff --git a/core/Action/CallFunc.cpp b/core/Action/CallFunc.cpp index 54686c8a..1f5bb284 100644 --- a/core/Action/CallFunc.cpp +++ b/core/Action/CallFunc.cpp @@ -5,11 +5,6 @@ e2d::CallFunc::CallFunc(const Function& func) : { } -e2d::CallFunc * e2d::CallFunc::create(const Function & func) -{ - return GC::create(func); -} - e2d::CallFunc * e2d::CallFunc::clone() const { return GC::create(_func); diff --git a/core/Action/Delay.cpp b/core/Action/Delay.cpp index af3d6991..ce686470 100644 --- a/core/Action/Delay.cpp +++ b/core/Action/Delay.cpp @@ -6,11 +6,6 @@ e2d::Delay::Delay(double duration) { } -e2d::Delay * e2d::Delay::create(double duration) -{ - return GC::create(duration); -} - e2d::Delay * e2d::Delay::clone() const { return GC::create(_delay); diff --git a/core/Action/JumpBy.cpp b/core/Action/JumpBy.cpp index 9f9e8f70..5bdfb3ac 100644 --- a/core/Action/JumpBy.cpp +++ b/core/Action/JumpBy.cpp @@ -8,11 +8,6 @@ e2d::JumpBy::JumpBy(double duration, const Vector & vec, double height, int jump { } -e2d::JumpBy * e2d::JumpBy::create(double duration, const Vector & vec, double height, int jumps) -{ - return GC::create(duration, vec, height, jumps); -} - e2d::JumpBy * e2d::JumpBy::clone() const { return GC::create(_duration, _deltaPos, _height, _jumps); diff --git a/core/Action/JumpTo.cpp b/core/Action/JumpTo.cpp index 4f4d8bed..39955320 100644 --- a/core/Action/JumpTo.cpp +++ b/core/Action/JumpTo.cpp @@ -6,11 +6,6 @@ e2d::JumpTo::JumpTo(double duration, const Point & pos, double height, int jumps { } -e2d::JumpTo * e2d::JumpTo::create(double duration, const Point & pos, double height, int jumps) -{ - return GC::create(duration, pos, height, jumps); -} - e2d::JumpTo * e2d::JumpTo::clone() const { return GC::create(_duration, _endPos, _height, _jumps); diff --git a/core/Action/Loop.cpp b/core/Action/Loop.cpp index 9f9bde4e..7c7219f7 100644 --- a/core/Action/Loop.cpp +++ b/core/Action/Loop.cpp @@ -15,11 +15,6 @@ e2d::Loop::Loop(Action * action, int times /* = -1 */) } } -e2d::Loop * e2d::Loop::create(Action * action, int times) -{ - return GC::create(action, times); -} - e2d::Loop::~Loop() { } diff --git a/core/Action/MoveBy.cpp b/core/Action/MoveBy.cpp index cd13cbb5..5aef6f22 100644 --- a/core/Action/MoveBy.cpp +++ b/core/Action/MoveBy.cpp @@ -7,11 +7,6 @@ e2d::MoveBy::MoveBy(double duration, Vector vector) _deltaPos = vector; } -e2d::MoveBy * e2d::MoveBy::create(double duration, Vector vector) -{ - return GC::create(duration, vector); -} - void e2d::MoveBy::_init() { ActionGradual::_init(); diff --git a/core/Action/MoveTo.cpp b/core/Action/MoveTo.cpp index e4896249..5df27af6 100644 --- a/core/Action/MoveTo.cpp +++ b/core/Action/MoveTo.cpp @@ -6,11 +6,6 @@ e2d::MoveTo::MoveTo(double duration, Point pos) _endPos = pos; } -e2d::MoveTo * e2d::MoveTo::create(double duration, Point pos) -{ - return GC::create(duration, pos); -} - e2d::MoveTo * e2d::MoveTo::clone() const { return GC::create(_duration, _endPos); diff --git a/core/Action/OpacityBy.cpp b/core/Action/OpacityBy.cpp index 39c0e8e8..a0cdee58 100644 --- a/core/Action/OpacityBy.cpp +++ b/core/Action/OpacityBy.cpp @@ -7,11 +7,6 @@ e2d::OpacityBy::OpacityBy(double duration, double opacity) _deltaVal = opacity; } -e2d::OpacityBy * e2d::OpacityBy::create(double duration, double opacity) -{ - return GC::create(duration, opacity); -} - void e2d::OpacityBy::_init() { ActionGradual::_init(); diff --git a/core/Action/OpacityTo.cpp b/core/Action/OpacityTo.cpp index 24b1fcc9..8212c882 100644 --- a/core/Action/OpacityTo.cpp +++ b/core/Action/OpacityTo.cpp @@ -7,11 +7,6 @@ e2d::OpacityTo::OpacityTo(double duration, double opacity) _endVal = opacity; } -e2d::OpacityTo * e2d::OpacityTo::create(double duration, double opacity) -{ - return GC::create(duration, opacity); -} - e2d::OpacityTo * e2d::OpacityTo::clone() const { return GC::create(_duration, _endVal); diff --git a/core/Action/RotateBy.cpp b/core/Action/RotateBy.cpp index 8d058413..dcb5db1a 100644 --- a/core/Action/RotateBy.cpp +++ b/core/Action/RotateBy.cpp @@ -7,11 +7,6 @@ e2d::RotateBy::RotateBy(double duration, double rotation) _deltaVal = rotation; } -e2d::RotateBy * e2d::RotateBy::create(double duration, double rotation) -{ - return GC::create(duration, rotation); -} - void e2d::RotateBy::_init() { ActionGradual::_init(); diff --git a/core/Action/RotateTo.cpp b/core/Action/RotateTo.cpp index 9cb394b6..b72f877e 100644 --- a/core/Action/RotateTo.cpp +++ b/core/Action/RotateTo.cpp @@ -7,11 +7,6 @@ e2d::RotateTo::RotateTo(double duration, double rotation) _endVal = rotation; } -e2d::RotateTo * e2d::RotateTo::create(double duration, double rotation) -{ - return GC::create(duration, rotation); -} - e2d::RotateTo * e2d::RotateTo::clone() const { return GC::create(_duration, _endVal); diff --git a/core/Action/ScaleBy.cpp b/core/Action/ScaleBy.cpp index 9a1b11b1..535afa83 100644 --- a/core/Action/ScaleBy.cpp +++ b/core/Action/ScaleBy.cpp @@ -15,16 +15,6 @@ e2d::ScaleBy::ScaleBy(double duration, double scaleX, double scaleY) _deltaY = scaleY; } -e2d::ScaleBy * e2d::ScaleBy::create(double duration, double scale) -{ - return GC::create(duration, scale); -} - -e2d::ScaleBy * e2d::ScaleBy::create(double duration, double scaleX, double scaleY) -{ - return GC::create(duration, scaleX, scaleY); -} - void e2d::ScaleBy::_init() { ActionGradual::_init(); diff --git a/core/Action/ScaleTo.cpp b/core/Action/ScaleTo.cpp index cf1283f2..6891815f 100644 --- a/core/Action/ScaleTo.cpp +++ b/core/Action/ScaleTo.cpp @@ -14,16 +14,6 @@ e2d::ScaleTo::ScaleTo(double duration, double scaleX, double scaleY) _endScaleY = scaleY; } -e2d::ScaleTo * e2d::ScaleTo::create(double duration, double scale) -{ - return GC::create(duration, scale); -} - -e2d::ScaleTo * e2d::ScaleTo::create(double duration, double scaleX, double scaleY) -{ - return GC::create(duration, scaleX, scaleY); -} - e2d::ScaleTo * e2d::ScaleTo::clone() const { return GC::create(_duration, _endScaleX, _endScaleY); diff --git a/core/Action/Sequence.cpp b/core/Action/Sequence.cpp index c28404a9..f002e635 100644 --- a/core/Action/Sequence.cpp +++ b/core/Action/Sequence.cpp @@ -11,16 +11,6 @@ e2d::Sequence::Sequence(const std::vector& actions) this->add(actions); } -e2d::Sequence * e2d::Sequence::create() -{ - return GC::create(); -} - -e2d::Sequence * e2d::Sequence::create(const std::vector& actions) -{ - return GC::create(actions); -} - e2d::Sequence::~Sequence() { } diff --git a/core/Action/Spawn.cpp b/core/Action/Spawn.cpp index 600fcc50..64b9d3ab 100644 --- a/core/Action/Spawn.cpp +++ b/core/Action/Spawn.cpp @@ -9,16 +9,6 @@ e2d::Spawn::Spawn(const std::vector& actions) this->add(actions); } -e2d::Spawn * e2d::Spawn::create() -{ - return GC::create(); -} - -e2d::Spawn * e2d::Spawn::create(const std::vector& actions) -{ - return GC::create(actions); -} - e2d::Spawn::~Spawn() { } diff --git a/core/Collider/ColliderCircle.cpp b/core/Collider/ColliderCircle.cpp index baeb1c4a..f0661250 100644 --- a/core/Collider/ColliderCircle.cpp +++ b/core/Collider/ColliderCircle.cpp @@ -26,21 +26,6 @@ e2d::ColliderCircle::ColliderCircle(Node * node) this->setAutoResize(true); } -e2d::ColliderCircle * e2d::ColliderCircle::create() -{ - return GC::create(); -} - -e2d::ColliderCircle * e2d::ColliderCircle::create(Point center, double radius) -{ - return GC::create(center, radius); -} - -e2d::ColliderCircle * e2d::ColliderCircle::create(Node * node) -{ - return GC::create(node); -} - e2d::ColliderCircle::~ColliderCircle() { SafeReleaseInterface(_d2dCircle); diff --git a/core/Collider/ColliderEllipse.cpp b/core/Collider/ColliderEllipse.cpp index 156f0baf..dcc53995 100644 --- a/core/Collider/ColliderEllipse.cpp +++ b/core/Collider/ColliderEllipse.cpp @@ -26,21 +26,6 @@ e2d::ColliderEllipse::ColliderEllipse(Node * node) this->setAutoResize(true); } -e2d::ColliderEllipse * e2d::ColliderEllipse::create() -{ - return GC::create(); -} - -e2d::ColliderEllipse * e2d::ColliderEllipse::create(Point center, double radiusX, double radiusY) -{ - return GC::create(center, radiusX, radiusY); -} - -e2d::ColliderEllipse * e2d::ColliderEllipse::create(Node * node) -{ - return GC::create(node); -} - e2d::ColliderEllipse::~ColliderEllipse() { SafeReleaseInterface(_d2dEllipse); diff --git a/core/Collider/ColliderRect.cpp b/core/Collider/ColliderRect.cpp index 285384a1..c1a3bca5 100644 --- a/core/Collider/ColliderRect.cpp +++ b/core/Collider/ColliderRect.cpp @@ -19,21 +19,6 @@ e2d::ColliderRect::ColliderRect(Node * node) this->setAutoResize(true); } -e2d::ColliderRect * e2d::ColliderRect::create() -{ - return GC::create(); -} - -e2d::ColliderRect * e2d::ColliderRect::create(double x, double y, double width, double height) -{ - return GC::create(x, y, width, height); -} - -e2d::ColliderRect * e2d::ColliderRect::create(Node * node) -{ - return GC::create(node); -} - e2d::ColliderRect::~ColliderRect() { SafeReleaseInterface(_d2dRectangle); diff --git a/core/Common/Image.cpp b/core/Common/Image.cpp index e06a4412..1bb87765 100644 --- a/core/Common/Image.cpp +++ b/core/Common/Image.cpp @@ -42,31 +42,6 @@ e2d::Image::Image(int resNameId, const String& resType, double cropX, double cro this->crop(cropX, cropY, cropWidth, cropHeight); } -e2d::Image * e2d::Image::create() -{ - return GC::create(); -} - -e2d::Image * e2d::Image::create(const String & filePath) -{ - return GC::create(filePath); -} - -e2d::Image * e2d::Image::create(int resNameId, const String & resType) -{ - return GC::create(resNameId, resType); -} - -e2d::Image * e2d::Image::create(const String & filePath, double cropX, double cropY, double cropWidth, double cropHeight) -{ - return GC::create(filePath, cropX, cropY, cropWidth, cropHeight); -} - -e2d::Image * e2d::Image::create(int resNameId, const String & resType, double cropX, double cropY, double cropWidth, double cropHeight) -{ - return GC::create(resNameId, resType, cropX, cropY, cropWidth, cropHeight); -} - e2d::Image::~Image() { } diff --git a/core/Common/Scene.cpp b/core/Common/Scene.cpp index 39507a65..62de7caf 100644 --- a/core/Common/Scene.cpp +++ b/core/Common/Scene.cpp @@ -7,7 +7,7 @@ e2d::Scene::Scene() , _colliderVisiable(false) , _root(nullptr) { - _root = Node::create(); + _root = GC::create(); if (_root) { _root->retain(); @@ -19,11 +19,6 @@ e2d::Scene::Scene() } } -e2d::Scene * e2d::Scene::create() -{ - return GC::create(); -} - e2d::Scene::~Scene() { } diff --git a/core/Node/Button.cpp b/core/Node/Button.cpp index 24bc52c5..297a3786 100644 --- a/core/Node/Button.cpp +++ b/core/Node/Button.cpp @@ -78,31 +78,6 @@ e2d::Button::Button(Node * normal, Node * mouseover, Node * selected, Node * dis this->setClickFunc(func); } -e2d::Button * e2d::Button::create() -{ - return GC::create