diff --git a/core/Action/Animate.cpp b/core/Action/Animate.cpp index 35d613ca..a44b1c87 100644 --- a/core/Action/Animate.cpp +++ b/core/Action/Animate.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::Animate::Animate() : frame_index_(0) diff --git a/core/Action/JumpBy.cpp b/core/Action/JumpBy.cpp index dd373f51..daa844e5 100644 --- a/core/Action/JumpBy.cpp +++ b/core/Action/JumpBy.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::JumpBy::JumpBy(float duration, const Point & vec, float height, int jumps) : FiniteTimeAction(duration) diff --git a/core/Action/JumpTo.cpp b/core/Action/JumpTo.cpp index ebe1968e..8be792d9 100644 --- a/core/Action/JumpTo.cpp +++ b/core/Action/JumpTo.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::JumpTo::JumpTo(float duration, const Point & pos, float height, int jumps) : JumpBy(duration, Point(), height, jumps) diff --git a/core/Action/MoveBy.cpp b/core/Action/MoveBy.cpp index 7c819e94..15104c72 100644 --- a/core/Action/MoveBy.cpp +++ b/core/Action/MoveBy.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::MoveBy::MoveBy(float duration, Point vector) diff --git a/core/Action/MoveTo.cpp b/core/Action/MoveTo.cpp index 001ac250..a058b245 100644 --- a/core/Action/MoveTo.cpp +++ b/core/Action/MoveTo.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::MoveTo::MoveTo(float duration, Point pos) : MoveBy(duration, Point()) diff --git a/core/Action/OpacityBy.cpp b/core/Action/OpacityBy.cpp index 5bdc36a2..9ec1d346 100644 --- a/core/Action/OpacityBy.cpp +++ b/core/Action/OpacityBy.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::OpacityBy::OpacityBy(float duration, float opacity) diff --git a/core/Action/OpacityTo.cpp b/core/Action/OpacityTo.cpp index e55b1299..42cd2e11 100644 --- a/core/Action/OpacityTo.cpp +++ b/core/Action/OpacityTo.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::OpacityTo::OpacityTo(float duration, float opacity) diff --git a/core/Action/RotateBy.cpp b/core/Action/RotateBy.cpp index 71ae1f33..76f6b028 100644 --- a/core/Action/RotateBy.cpp +++ b/core/Action/RotateBy.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::RotateBy::RotateBy(float duration, float rotation) diff --git a/core/Action/RotateTo.cpp b/core/Action/RotateTo.cpp index 18b64e50..cc68db3a 100644 --- a/core/Action/RotateTo.cpp +++ b/core/Action/RotateTo.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::RotateTo::RotateTo(float duration, float rotation) diff --git a/core/Action/ScaleBy.cpp b/core/Action/ScaleBy.cpp index b03a8f53..8e2b1c79 100644 --- a/core/Action/ScaleBy.cpp +++ b/core/Action/ScaleBy.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::ScaleBy::ScaleBy(float duration, float scale) diff --git a/core/Action/ScaleTo.cpp b/core/Action/ScaleTo.cpp index 0855e660..60df03d8 100644 --- a/core/Action/ScaleTo.cpp +++ b/core/Action/ScaleTo.cpp @@ -1,5 +1,5 @@ #include "..\e2daction.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::ScaleTo::ScaleTo(float duration, float scale) : ScaleBy(duration, 0, 0) diff --git a/core/Base/Audio.cpp b/core/Base/Audio.cpp index cc7d4889..6dad95b9 100644 --- a/core/Base/Audio.cpp +++ b/core/Base/Audio.cpp @@ -1,4 +1,4 @@ -#include "..\e2dbase.h" +#include "..\e2dmodule.h" e2d::Audio * e2d::Audio::instance_ = nullptr; diff --git a/core/Base/GC.cpp b/core/Base/GC.cpp index 321bac23..5dc7898c 100644 --- a/core/Base/GC.cpp +++ b/core/Base/GC.cpp @@ -1,5 +1,5 @@ -#include "..\e2dbase.h" -#include "..\e2dtool.h" +#include "..\e2dmodule.h" +#include "..\e2dutil.h" #include "..\e2dmanager.h" using namespace e2d; @@ -38,8 +38,6 @@ e2d::GC::GC() e2d::GC::~GC() { // 删除所有对象 - Timer::GetInstance()->ClearAllTasks(); - cleanup_ = true; for (const auto& ref : pool_) { diff --git a/core/Base/Game.cpp b/core/Base/Game.cpp index 870b3483..6dc93c98 100644 --- a/core/Base/Game.cpp +++ b/core/Base/Game.cpp @@ -1,8 +1,8 @@ -#include "..\e2dbase.h" -#include "..\e2dnode.h" +#include "..\e2dmodule.h" +#include "..\e2dcomponent.h" #include "..\e2dtransition.h" #include "..\e2dmanager.h" -#include "..\e2dtool.h" +#include "..\e2dutil.h" #include diff --git a/core/Base/Input.cpp b/core/Base/Input.cpp index 0c6177ad..605898f9 100644 --- a/core/Base/Input.cpp +++ b/core/Base/Input.cpp @@ -1,5 +1,5 @@ -#include "..\e2dbase.h" -#include "..\e2dtool.h" +#include "..\e2dmodule.h" +#include "..\e2dutil.h" #include "..\e2dmanager.h" #pragma comment(lib, "dinput8.lib") diff --git a/core/Base/Renderer.cpp b/core/Base/Renderer.cpp index b9435530..de891b3c 100644 --- a/core/Base/Renderer.cpp +++ b/core/Base/Renderer.cpp @@ -1,6 +1,6 @@ -#include "..\e2dbase.h" +#include "..\e2dmodule.h" #include "..\e2dmanager.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::Renderer* e2d::Renderer::instance_ = nullptr; diff --git a/core/Base/Window.cpp b/core/Base/Window.cpp index 959034a4..743f9e9d 100644 --- a/core/Base/Window.cpp +++ b/core/Base/Window.cpp @@ -1,6 +1,6 @@ -#include "..\e2dbase.h" +#include "..\e2dmodule.h" #include "..\e2dmanager.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" #include #pragma comment (lib ,"imm32.lib") diff --git a/core/Common/Collider.cpp b/core/Common/Collider.cpp index 6efcece1..3a30fd18 100644 --- a/core/Common/Collider.cpp +++ b/core/Common/Collider.cpp @@ -1,6 +1,8 @@ #include "..\e2dcommon.h" +#include "..\e2dimpl.h" +#include "..\e2dmodule.h" #include "..\e2dmanager.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::Collider::Collider(Node * parent) : visible_(true) diff --git a/core/Common/Image.cpp b/core/Common/Image.cpp index ab13e2a1..f1f2621f 100644 --- a/core/Common/Image.cpp +++ b/core/Common/Image.cpp @@ -1,6 +1,6 @@ #include "..\e2dcommon.h" -#include "..\e2dbase.h" -#include "..\e2dtool.h" +#include "..\e2dmodule.h" +#include "..\e2dutil.h" std::map e2d::Image::bitmap_cache_; diff --git a/core/Common/Resource.cpp b/core/Common/Resource.cpp index e3807d62..0e62e3c2 100644 --- a/core/Common/Resource.cpp +++ b/core/Common/Resource.cpp @@ -1,4 +1,4 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" e2d::Resource::Resource(size_t resource_name, const String & resource_type) diff --git a/core/Custom/Exception.cpp b/core/Custom/Exception.cpp index 4deccc32..fdf25b05 100644 --- a/core/Custom/Exception.cpp +++ b/core/Custom/Exception.cpp @@ -1,4 +1,4 @@ -#include "..\e2dcustom.h" +#include "..\e2dimpl.h" e2d::Exception::Exception() E2D_NOEXCEPT diff --git a/core/Custom/SystemException.cpp b/core/Custom/SystemException.cpp index 984c94c4..91e45d73 100644 --- a/core/Custom/SystemException.cpp +++ b/core/Custom/SystemException.cpp @@ -1,4 +1,4 @@ -#include "..\e2dcustom.h" +#include "..\e2dimpl.h" e2d::SystemException::SystemException() E2D_NOEXCEPT : Exception("Unknown system exception") diff --git a/core/Custom/TextRenderer.cpp b/core/Custom/TextRenderer.cpp index ffad7e99..3a323678 100644 --- a/core/Custom/TextRenderer.cpp +++ b/core/Custom/TextRenderer.cpp @@ -1,5 +1,5 @@ -#include "..\e2dcustom.h" -#include "..\e2dbase.h" +#include "..\e2dimpl.h" +#include "..\e2dmodule.h" using namespace e2d; diff --git a/core/Custom/VoiceCallback.cpp b/core/Custom/VoiceCallback.cpp index d9ef4f84..04cae99b 100644 --- a/core/Custom/VoiceCallback.cpp +++ b/core/Custom/VoiceCallback.cpp @@ -1,4 +1,4 @@ -#include "..\e2dcustom.h" +#include "..\e2dimpl.h" #include "..\e2dcommon.h" e2d::VoiceCallback::VoiceCallback() diff --git a/core/Event/MouseEvent.cpp b/core/Event/MouseEvent.cpp index c1568fe0..ae71b9f7 100644 --- a/core/Event/MouseEvent.cpp +++ b/core/Event/MouseEvent.cpp @@ -1,5 +1,5 @@ #include "..\e2devent.h" -#include "..\e2dbase.h" +#include "..\e2dmodule.h" e2d::MouseEvent::MouseEvent(HWND hWnd, UINT message, WPARAM w_param, LPARAM l_param, float dpi) : message_(message) diff --git a/core/Manager/CollisionManager.cpp b/core/Manager/CollisionManager.cpp index 4861f87f..c878e15f 100644 --- a/core/Manager/CollisionManager.cpp +++ b/core/Manager/CollisionManager.cpp @@ -1,6 +1,7 @@ #include "..\e2dmanager.h" -#include "..\e2dnode.h" -#include "..\e2dtool.h" +#include "..\e2dcomponent.h" +#include "..\e2dutil.h" +#include "..\e2dmodule.h" e2d::CollisionManager * e2d::CollisionManager::GetInstance() diff --git a/core/Node/Button.cpp b/core/Node/Button.cpp index 502c7a34..e9d0e39f 100644 --- a/core/Node/Button.cpp +++ b/core/Node/Button.cpp @@ -1,5 +1,6 @@ -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" #include "..\e2dmanager.h" +#include "..\e2dmodule.h" #define SAFE_SET(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); } diff --git a/core/Node/Canvas.cpp b/core/Node/Canvas.cpp index 1b93a0e5..9885b1c6 100644 --- a/core/Node/Canvas.cpp +++ b/core/Node/Canvas.cpp @@ -1,4 +1,5 @@ -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" +#include "..\e2dmodule.h" e2d::Canvas::Canvas(float width, float height) : render_target_(nullptr) diff --git a/core/Node/Menu.cpp b/core/Node/Menu.cpp index e36cb35c..78c647c3 100644 --- a/core/Node/Menu.cpp +++ b/core/Node/Menu.cpp @@ -1,4 +1,4 @@ -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::Menu::Menu() : enabled_(true) diff --git a/core/Node/Node.cpp b/core/Node/Node.cpp index 8fd05b19..7872be2b 100644 --- a/core/Node/Node.cpp +++ b/core/Node/Node.cpp @@ -1,4 +1,4 @@ -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" #include "..\e2devent.h" #include "..\e2dmanager.h" #include "..\e2daction.h" diff --git a/core/Node/Scene.cpp b/core/Node/Scene.cpp index 724bea71..5cb55300 100644 --- a/core/Node/Scene.cpp +++ b/core/Node/Scene.cpp @@ -1,5 +1,5 @@ -#include "..\e2dbase.h" -#include "..\e2dnode.h" +#include "..\e2dmodule.h" +#include "..\e2dcomponent.h" #include "..\e2dmanager.h" e2d::Scene::Scene() diff --git a/core/Node/Sprite.cpp b/core/Node/Sprite.cpp index cb874b67..439dc0fc 100644 --- a/core/Node/Sprite.cpp +++ b/core/Node/Sprite.cpp @@ -1,5 +1,5 @@ -#include "..\e2dnode.h" - +#include "..\e2dcomponent.h" +#include "..\e2dmodule.h" e2d::Sprite::Sprite() : image_(nullptr) diff --git a/core/Node/Text.cpp b/core/Node/Text.cpp index 53287a9a..7ad0b9a3 100644 --- a/core/Node/Text.cpp +++ b/core/Node/Text.cpp @@ -1,4 +1,5 @@ -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" +#include "..\e2dmodule.h" //------------------------------------------------------- // Style diff --git a/core/Node/ToggleButton.cpp b/core/Node/ToggleButton.cpp index f042dc44..9ecb1b4c 100644 --- a/core/Node/ToggleButton.cpp +++ b/core/Node/ToggleButton.cpp @@ -1,4 +1,4 @@ -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" #define SAFE_SET(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); } diff --git a/core/Tool/Data.cpp b/core/Tool/Data.cpp index 08a33e95..406fdc85 100644 --- a/core/Tool/Data.cpp +++ b/core/Tool/Data.cpp @@ -1,4 +1,4 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" e2d::Data::Data(const String & key, const String & field) diff --git a/core/Tool/File.cpp b/core/Tool/File.cpp index fd33a46b..abbd4d18 100644 --- a/core/Tool/File.cpp +++ b/core/Tool/File.cpp @@ -1,4 +1,5 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" +#include "..\e2dmodule.h" #include std::list e2d::File::search_paths_; diff --git a/core/Tool/Music.cpp b/core/Tool/Music.cpp index a1cdff74..4a767a0a 100644 --- a/core/Tool/Music.cpp +++ b/core/Tool/Music.cpp @@ -1,4 +1,5 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" +#include "..\e2dmodule.h" #ifndef SAFE_DELETE diff --git a/core/Tool/Path.cpp b/core/Tool/Path.cpp index 10e70ee6..3fe276c2 100644 --- a/core/Tool/Path.cpp +++ b/core/Tool/Path.cpp @@ -1,4 +1,5 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" +#include "..\e2dmodule.h" #include const e2d::String& e2d::Path::GetDataPath() diff --git a/core/Tool/Player.cpp b/core/Tool/Player.cpp index d1aa096a..a6e8a151 100644 --- a/core/Tool/Player.cpp +++ b/core/Tool/Player.cpp @@ -1,4 +1,4 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" e2d::Player * e2d::Player::instance_ = nullptr; diff --git a/core/Tool/Random.cpp b/core/Tool/Random.cpp index 09d55ec2..032f16f8 100644 --- a/core/Tool/Random.cpp +++ b/core/Tool/Random.cpp @@ -1,4 +1,4 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" std::default_random_engine &e2d::Random::GetEngine() { diff --git a/core/Tool/Task.cpp b/core/Tool/Task.cpp index 5e11f18d..04d32df8 100644 --- a/core/Tool/Task.cpp +++ b/core/Tool/Task.cpp @@ -1,4 +1,4 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" e2d::Task::Task(const Function & func, const String & name) diff --git a/core/Tool/Timer.cpp b/core/Tool/Timer.cpp index 9934b00f..ac48d40f 100644 --- a/core/Tool/Timer.cpp +++ b/core/Tool/Timer.cpp @@ -1,4 +1,4 @@ -#include "..\e2dtool.h" +#include "..\e2dutil.h" e2d::Timer * e2d::Timer::GetInstance() @@ -87,18 +87,6 @@ void e2d::Timer::RemoveAllTasks() } } -void e2d::Timer::ClearAllTasks() -{ - if (tasks_.empty()) - return; - - for (const auto& task : tasks_) - { - task->Release(); - } - tasks_.clear(); -} - void e2d::Timer::Update() { if (tasks_.empty()) diff --git a/core/Transition/BoxTransition.cpp b/core/Transition/BoxTransition.cpp index 20ae8799..d4343737 100644 --- a/core/Transition/BoxTransition.cpp +++ b/core/Transition/BoxTransition.cpp @@ -1,5 +1,6 @@ #include "..\e2dtransition.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" +#include "..\e2dmodule.h" e2d::BoxTransition::BoxTransition(Scene* scene, float duration) : Transition(scene, duration) diff --git a/core/Transition/EmergeTransition.cpp b/core/Transition/EmergeTransition.cpp index 428c03f4..1983c258 100644 --- a/core/Transition/EmergeTransition.cpp +++ b/core/Transition/EmergeTransition.cpp @@ -1,5 +1,5 @@ #include "..\e2dtransition.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::EmergeTransition::EmergeTransition(Scene* scene, float duration) : Transition(scene, duration) diff --git a/core/Transition/FadeTransition.cpp b/core/Transition/FadeTransition.cpp index 50b7d0ff..b7627944 100644 --- a/core/Transition/FadeTransition.cpp +++ b/core/Transition/FadeTransition.cpp @@ -1,5 +1,5 @@ #include "..\e2dtransition.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::FadeTransition::FadeTransition(Scene* scene, float duration) : Transition(scene, duration) diff --git a/core/Transition/MoveTransition.cpp b/core/Transition/MoveTransition.cpp index 8fd755d3..8c711c1c 100644 --- a/core/Transition/MoveTransition.cpp +++ b/core/Transition/MoveTransition.cpp @@ -1,5 +1,6 @@ #include "..\e2dtransition.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" +#include "..\e2dmodule.h" e2d::MoveTransition::MoveTransition(Scene* scene, float duration, Direction direction) : Transition(scene, duration) diff --git a/core/Transition/Transition.cpp b/core/Transition/Transition.cpp index 0635d981..ce058109 100644 --- a/core/Transition/Transition.cpp +++ b/core/Transition/Transition.cpp @@ -1,6 +1,6 @@ -#include "..\e2dbase.h" +#include "..\e2dmodule.h" #include "..\e2dtransition.h" -#include "..\e2dnode.h" +#include "..\e2dcomponent.h" e2d::Transition::Transition(Scene* scene, float duration) : done_(false) diff --git a/core/e2daction.h b/core/e2daction.h index 56dab2d6..f16e4b14 100644 --- a/core/e2daction.h +++ b/core/e2daction.h @@ -1,6 +1,6 @@ #pragma once #include "e2dcommon.h" -#include "e2dbase.h" +#include "e2dmodule.h" namespace e2d { diff --git a/core/e2dnode.h b/core/e2dcomponent.h similarity index 99% rename from core/e2dnode.h rename to core/e2dcomponent.h index 8a54f9e8..19978ec4 100644 --- a/core/e2dnode.h +++ b/core/e2dcomponent.h @@ -1,5 +1,5 @@ #pragma once -#include "e2dbase.h" +#include "e2dcommon.h" #include "e2devent.h" namespace e2d @@ -7,6 +7,7 @@ namespace e2d class Action; +class Scene; // 绘图接口 diff --git a/core/e2dcustom.h b/core/e2dimpl.h similarity index 99% rename from core/e2dcustom.h rename to core/e2dimpl.h index caf4528c..697d2d07 100644 --- a/core/e2dcustom.h +++ b/core/e2dimpl.h @@ -1,5 +1,4 @@ #pragma once -#include "e2dmacros.h" #include "e2dcommon.h" namespace e2d diff --git a/core/e2dbase.h b/core/e2dmodule.h similarity index 98% rename from core/e2dbase.h rename to core/e2dmodule.h index e6445f07..8578fbc6 100644 --- a/core/e2dbase.h +++ b/core/e2dmodule.h @@ -1,11 +1,9 @@ #pragma once -#include "e2dmacros.h" -#include "e2dcommon.h" -#include "e2dcustom.h" +#include "e2dimpl.h" +#include "e2dcomponent.h" +#include "e2dtransition.h" -// Base Classes - namespace e2d { @@ -314,9 +312,6 @@ protected: }; -class Scene; -class Transition; - // 游戏 class Game { diff --git a/core/e2dtool.h b/core/e2dutil.h similarity index 99% rename from core/e2dtool.h rename to core/e2dutil.h index bb974491..1a6805b8 100644 --- a/core/e2dtool.h +++ b/core/e2dutil.h @@ -1,5 +1,6 @@ #pragma once -#include "e2dbase.h" +#include "e2dcommon.h" +#include "e2dimpl.h" namespace e2d { @@ -292,7 +293,7 @@ protected: // 任务是否就绪 bool IsReady() const; -private: +protected: bool running_; bool stopped_; int run_times_; @@ -340,9 +341,6 @@ public: // 移除所有任务 void RemoveAllTasks(); - // 强制清空所有任务 - void ClearAllTasks(); - // 更新定时器 void Update(); diff --git a/core/easy2d.h b/core/easy2d.h index f4fc06ff..e8e07422 100644 --- a/core/easy2d.h +++ b/core/easy2d.h @@ -19,12 +19,12 @@ #include "e2dmacros.h" #include "e2dcommon.h" -#include "e2dbase.h" #include "e2dmanager.h" -#include "e2dnode.h" -#include "e2dtool.h" +#include "e2dcomponent.h" +#include "e2dutil.h" #include "e2daction.h" #include "e2dtransition.h" +#include "e2dmodule.h" #if defined(DEBUG) || defined(_DEBUG) diff --git a/project/vs2017/Easy2D.vcxproj b/project/vs2017/Easy2D.vcxproj index d7e61677..32434b8d 100644 --- a/project/vs2017/Easy2D.vcxproj +++ b/project/vs2017/Easy2D.vcxproj @@ -268,15 +268,15 @@ - + - + - - + + diff --git a/project/vs2017/Easy2D.vcxproj.filters b/project/vs2017/Easy2D.vcxproj.filters index 93fa4bea..56ca3c6b 100644 --- a/project/vs2017/Easy2D.vcxproj.filters +++ b/project/vs2017/Easy2D.vcxproj.filters @@ -241,14 +241,14 @@ - - - - + + + + \ No newline at end of file