refactoring...

core/Action/Animate.cpp

@@ -26,7 +26,7 @@ e2d::Animation * e2d::Animate::getAnimation() const
 
 void e2d::Animate::setAnimation(Animation * animation)
 {
-	if (animation && animation != _animation)
+	if (animation && animation != _animation && !animation->getFrames().empty())
 	{
 		if (_animation) _animation->release();
 		_animation = animation;

core/Action/Animation.cpp

@@ -37,6 +37,7 @@ void e2d::Animation::setInterval(float interval)
 
 void e2d::Animation::add(Image * frame)
 {
+	WARN_IF(frame == nullptr, "Animation::add failed, frame is nullptr.");
 	if (frame)
 	{
 		_frames.push_back(frame);

core/Base/Config.cpp

@@ -1,65 +0,0 @@
-#include "..\e2dbase.h"
-#include "..\e2dtool.h"
-
-e2d::Config::Config()
-	: _gameName()
-	, _showFps(false)
-	, _outlineVisible(false)
-	, _collisionEnabled(false)
-	, _colliderVisible(false)
-{
-}
-
-e2d::Config::~Config()
-{
-}
-
-void e2d::Config::setGameName(const String & name)
-{
-	_gameName = name;
-}
-
-void e2d::Config::showFps(bool show)
-{
-	_showFps = show;
-}
-
-void e2d::Config::setOutlineVisible(bool visible)
-{
-	_outlineVisible = visible;
-}
-
-void e2d::Config::setCollisionEnabled(bool enabled)
-{
-	_collisionEnabled = enabled;
-}
-
-void e2d::Config::setColliderVisible(bool visible)
-{
-	_colliderVisible = visible;
-}
-
-e2d::String e2d::Config::getGameName() const
-{
-	return _gameName;
-}
-
-bool e2d::Config::isFpsShow() const
-{
-	return _showFps;
-}
-
-bool e2d::Config::isOutlineVisible() const
-{
-	return _outlineVisible;
-}
-
-bool e2d::Config::isCollisionEnabled() const
-{
-	return _collisionEnabled;
-}
-
-bool e2d::Config::isColliderVisible() const
-{
-	return _colliderVisible;
-}

core/Base/GC.cpp

@@ -22,9 +22,6 @@ void operator delete(void * block, e2d::autorelease_t const &) E2D_NOEXCEPT
 }
 
 
-// GC 机制，用于销毁所有单例
-GC GC::_instance;
-
 e2d::GC::GC()
 	: _notifyed(false)
 	, _cleanup(false)
@@ -39,11 +36,6 @@ e2d::GC::~GC()
 
 	// 헌뇜暠튬뻠닸
 	Image::clearCache();
-
-	// 删除所有单例
-	Timer::destroyInstance();
-	ActionManager::destroyInstance();
-	CollisionManager::destroyInstance();
 }
 
 
@@ -85,6 +77,7 @@ void e2d::GC::clear()
 
 e2d::GC * e2d::GC::getInstance()
 {
+	static GC _instance;
 	return &_instance;
 }
 

core/Base/Game.cpp

@@ -9,7 +9,6 @@
 e2d::Game::Game()
 	: _quit(true)
 	, _paused(false)
-	, _config()
 	, _window(nullptr)
 	, _input(nullptr)
 	, _renderer(nullptr)
@@ -22,6 +21,8 @@ e2d::Game::Game()
 
 	_input = new (std::nothrow) Input;
 	_renderer = new (std::nothrow) Renderer;
+	_timer = Timer::getInstance();
+	_actionManager = ActionManager::getInstance();
 }
 
 e2d::Game::~Game()
@@ -32,9 +33,6 @@ e2d::Game::~Game()
 	if (_input)
 		delete _input;
 
-	if (_window)
-		delete _window;
-
 	CoUninitialize();
 }
 
@@ -44,6 +42,13 @@ e2d::Game * e2d::Game::getInstance()
 	return &instance;
 }
 
+void e2d::Game::initWithWindow(Window * window)
+{
+	_window = window;
+	_renderer->initWithWindow(_window);
+	_input->initWithWindow(_window);
+}
+
 void e2d::Game::start()
 {
 	_quit = false;
@@ -66,9 +71,14 @@ void e2d::Game::start()
 		{
 			last = now;
 			_input->update();
-			Timer::getInstance()->update();
+
-			ActionManager::getInstance()->update();
+			if (!_paused)
+			{
+				_timer->update();
+				_actionManager->update();
 				updateScene();
+			}
+			
 			drawScene();
 			_window->poll();
 			GC::getInstance()->flush();
@@ -96,8 +106,8 @@ void e2d::Game::resume()
 {
 	if (_paused && !_quit)
 	{
-		Timer::getInstance()->updateTime();
+		_timer->updateTime();
-		ActionManager::getInstance()->updateTime();
+		_actionManager->updateTime();
 	}
 	_paused = false;
 }
@@ -107,23 +117,6 @@ bool e2d::Game::isPaused()
 	return _paused;
 }
 
-void e2d::Game::setConfig(const Config& config)
-{
-	_config = config;
-}
-
-const e2d::Config& e2d::Game::getConfig() const
-{
-	return _config;
-}
-
-void e2d::Game::setWindow(Window * window)
-{
-	_window = window;
-	_renderer->init(_window);
-	_input->init(_window);
-}
-
 void e2d::Game::quit()
 {
 	_quit = true;
@@ -161,7 +154,7 @@ void e2d::Game::pushScene(Transition * transition, bool saveCurrentScene)
 	_transition->retain();
 
 	// 初始化场景切换动画
-	if (!_transition->_init(_currScene))
+	if (!_transition->_init(this, _currScene))
 	{
 		WARN("Transition initialize failed!");
 		_transition->release();
@@ -205,7 +198,7 @@ e2d::Scene * e2d::Game::popScene(Transition * transition)
 		_transition->_inScene->retain();
 
 		// 初始化场景切换动画
-		if (!_transition->_init(_currScene))
+		if (!_transition->_init(this, _currScene))
 		{
 			WARN("Transition initialize failed!");
 			_transition->release();
@@ -277,34 +270,15 @@ void e2d::Game::updateScene()
 
 void e2d::Game::drawScene()
 {
-	// äÖȾ»­Ãæ
 	_renderer->beginDraw();
 	{
 		if (_transition)
 		{
-			_transition->_render();
+			_transition->_render(this);
 		}
 		else if (_currScene)
 		{
-			_currScene->visit(_renderer);
+			_currScene->visit(this);
-
-			if (_config.isOutlineVisible())
-			{
-				auto brush = _renderer->getSolidColorBrush();
-				brush->SetColor(D2D1::ColorF(D2D1::ColorF::Red, 0.6f));
-				brush->SetOpacity(1.f);
-				_currScene->drawOutline(_renderer);
-			}
-			if (_config.isColliderVisible())
-			{
-				_renderer->getRenderTarget()->SetTransform(D2D1::Matrix3x2F::Identity());
-				_currScene->drawCollider();
-			}
-		}
-
-		if (_config.isFpsShow())
-		{
-			_renderer->drawFps();
 		}
 	}
 	_renderer->endDraw();

core/Base/Input.cpp

@@ -38,7 +38,7 @@ e2d::Input::~Input()
 	CoUninitialize();
 }
 
-void e2d::Input::init(Window * window)
+void e2d::Input::initWithWindow(Window * window)
 {
 	HWND hwnd = window->getHWnd();
 

core/Base/Renderer.cpp

@@ -4,7 +4,8 @@
 
 
 e2d::Renderer::Renderer()
-	: _lastRenderTime(Time::now())
+	: _showFps(false)
+	, _lastRenderTime(Time::now())
 	, _renderTimes(0)
 	, _fpsFormat(nullptr)
 	, _fpsLayout(nullptr)
@@ -65,11 +66,8 @@ e2d::Renderer::~Renderer()
 	CoUninitialize();
 }
 
-void e2d::Renderer::init(Window * window)
+void e2d::Renderer::initWithWindow(Window * window)
 {
-	if (!window)
-		return;
-
 	HWND hWnd = window->getHWnd();
 
 	RECT rc;
@@ -122,29 +120,7 @@ void e2d::Renderer::beginDraw()
 
 void e2d::Renderer::endDraw()
 {
-	// 终止渲染
+	if (_showFps)
-	HRESULT hr = _renderTarget->EndDraw();
-
-	if (hr == D2DERR_RECREATE_TARGET)
-	{
-		// 如果 Direct3D 设备在执行过程中消失，将丢弃当前的设备相关资源
-		// 并在下一次调用时重建资源
-		hr = S_OK;
-
-		SafeRelease(_fpsFormat);
-		SafeRelease(_fpsLayout);
-		SafeRelease(_textRenderer);
-		SafeRelease(_solidBrush);
-		SafeRelease(_renderTarget);
-	}
-
-	if (FAILED(hr))
-	{
-		throw SystemException("Device loss recovery failed");
-	}
-}
-
-void e2d::Renderer::drawFps()
 	{
 		int duration = (Time::now() - _lastRenderTime).milliseconds();
 
@@ -180,7 +156,7 @@ void e2d::Renderer::drawFps()
 			ThrowIfFailed(
 				_writeFactory->CreateTextLayout(
 				(const WCHAR *)fpsText,
-				(UINT32)fpsText.getLength(),
+					(UINT32)fpsText.length(),
 					_fpsFormat,
 					0,
 					0,
@@ -207,6 +183,28 @@ void e2d::Renderer::drawFps()
 		}
 	}
 
+	// 终止渲染
+	HRESULT hr = _renderTarget->EndDraw();
+
+	if (hr == D2DERR_RECREATE_TARGET)
+	{
+		// 如果 Direct3D 设备在执行过程中消失，将丢弃当前的设备相关资源
+		// 并在下一次调用时重建资源
+		hr = S_OK;
+
+		SafeRelease(_fpsFormat);
+		SafeRelease(_fpsLayout);
+		SafeRelease(_textRenderer);
+		SafeRelease(_solidBrush);
+		SafeRelease(_renderTarget);
+	}
+
+	if (FAILED(hr))
+	{
+		throw SystemException("Device loss recovery failed");
+	}
+}
+
 e2d::Color e2d::Renderer::getBackgroundColor()
 {
 	return Color(_clearColor.r, _clearColor.g, _clearColor.b, _clearColor.a);
@@ -217,6 +215,11 @@ void e2d::Renderer::setBackgroundColor(Color color)
 	_clearColor = (D2D1_COLOR_F)color;
 }
 
+void e2d::Renderer::showFps(bool show)
+{
+	_showFps = show;
+}
+
 ID2D1StrokeStyle * e2d::Renderer::getMiterStrokeStyle()
 {
 	if (!_miterStrokeStyle)

core/Base/Window.cpp

@@ -18,6 +18,9 @@ e2d::Window::Window(const String & title, int width, int height, int iconID)
 {
 	CoInitialize(nullptr);
 
+	// »ñȡϵͳ DPI
+	_dpi = static_cast<float>(::GetDpiForSystem());
+
 	WNDCLASSEX wcex = { 0 };
 	wcex.cbSize = sizeof(WNDCLASSEX);
 	wcex.lpszClassName = REGISTER_CLASS;
@@ -47,7 +50,7 @@ e2d::Window::Window(const String & title, int width, int height, int iconID)
 	RegisterClassEx(&wcex);
 
 	// 计算窗口大小
-	Rect clientRect = __adjustWindow(_width, _height);
+	Rect clientRect = _locate(_width, _height);
 
 	// 创建窗口
 	_hWnd = ::CreateWindowEx(
@@ -76,8 +79,6 @@ e2d::Window::Window(const String & title, int width, int height, int iconID)
 			HMENU hmenu = ::GetSystemMenu(consoleHWnd, FALSE);
 			::RemoveMenu(hmenu, SC_CLOSE, MF_BYCOMMAND);
 		}
-		// »ñÈ¡ DPI
-		_dpi = static_cast<float>(::GetDpiForWindow(_hWnd));
 	}
 	else
 	{
@@ -136,14 +137,10 @@ bool e2d::Window::createMutex(const String & mutex)
 	return true;
 }
 
-e2d::Rect e2d::Window::__adjustWindow(int width, int height)
+e2d::Rect e2d::Window::_locate(int width, int height)
 {
-	float dpiScaleX = 0.f, dpiScaleY = 0.f;
-	auto renderer = Game::getInstance()->getRenderer();
-	renderer->getFactory()->GetDesktopDpi(&dpiScaleX, &dpiScaleY);
-
 	Rect result;
-	RECT wRECT		= { 0, 0, LONG(ceil(width * dpiScaleX / 96.f)), LONG(ceil(height * dpiScaleY / 96.f)) };
+	RECT wRECT		= { 0, 0, LONG(ceil(width * _dpi / 96.f)), LONG(ceil(height * _dpi / 96.f)) };
 	int maxWidth	= ::GetSystemMetrics(SM_CXSCREEN);
 	int maxHeight	= ::GetSystemMetrics(SM_CYSCREEN);
 
@@ -210,7 +207,7 @@ void e2d::Window::setSize(int width, int height)
 
 	if (_hWnd)
 	{
-		Rect wRect = __adjustWindow(width, height);
+		Rect wRect = _locate(width, height);
 		::MoveWindow(
 			_hWnd,
 			int(wRect.origin.x),
@@ -295,12 +292,9 @@ void e2d::Window::setConsoleEnabled(bool enabled)
 				hwnd = ::GetConsoleWindow();
 				// 重定向输入输出
 				FILE * stdoutStream, * stdinStream, * stderrStream;
-				errno_t err = freopen_s(&stdoutStream, "conout$", "w+t", stdout);
+				freopen_s(&stdoutStream, "conout$", "w+t", stdout);
-				WARN_IF(err != 0, "freopen stdout failed!");
+				freopen_s(&stdinStream, "conin$", "r+t", stdin);
-				err = freopen_s(&stdinStream, "conin$", "r+t", stdin);
+				freopen_s(&stderrStream, "conout$", "w+t", stderr);
-				WARN_IF(err != 0, "freopen stdin failed!");
-				err = freopen_s(&stderrStream, "conout$", "w+t", stderr);
-				WARN_IF(err != 0, "freopen stderr failed!");
 				// 禁用控制台关闭按钮
 				HMENU hmenu = ::GetSystemMenu(hwnd, FALSE);
 				::RemoveMenu(hmenu, SC_CLOSE, MF_BYCOMMAND);

core/Common/Resource.cpp

@@ -38,7 +38,7 @@ const e2d::String & e2d::Resource::getResType() const
 
 size_t e2d::Resource::getKey() const
 {
-	return _isFile ? _fileName.getHashCode() : _resNameId;
+	return _isFile ? _fileName.hash() : _resNameId;
 }
 
 bool e2d::Resource::operator>(const Resource &res) const

core/Common/String.cpp

@@ -332,31 +332,17 @@ e2d::String::operator wchar_t*() const
 	return const_cast<wchar_t*>(_str.c_str());
 }
 
-e2d::String::operator const char*() const
-{
-	static std::string strTmp;
-	strTmp = static_cast<char*>(_bstr_t(_str.c_str()));
-	return strTmp.c_str();
-}
-
-e2d::String::operator char*() const
-{
-	static std::string strTmp;
-	strTmp = static_cast<char*>(_bstr_t(_str.c_str()));
-	return const_cast<char*>(strTmp.c_str());
-}
-
 bool e2d::String::isEmpty() const
 {
 	return _str.empty();
 }
 
-int e2d::String::getLength() const
+int e2d::String::length() const
 {
 	return static_cast<int>(_str.size());
 }
 
-size_t e2d::String::getHashCode() const
+size_t e2d::String::hash() const
 {
 	std::hash<std::wstring> hash;
 	return hash(_str);

core/Manager/ActionManager.cpp

@@ -3,22 +3,10 @@
 #include "..\e2dnode.h"
 
 
-e2d::ActionManager * e2d::ActionManager::_instance = nullptr;
-
 e2d::ActionManager * e2d::ActionManager::getInstance()
 {
-	if (!_instance)
+	static ActionManager instance;
-		_instance = new (std::nothrow) ActionManager;
+	return &instance;
-	return _instance;
-}
-
-void e2d::ActionManager::destroyInstance()
-{
-	if (_instance)
-	{
-		delete _instance;
-		_instance = nullptr;
-	}
 }
 
 e2d::ActionManager::ActionManager()
@@ -33,7 +21,7 @@ e2d::ActionManager::~ActionManager()
 
 void e2d::ActionManager::update()
 {
-	if (_runningActions.empty() || Game::getInstance()->isPaused())
+	if (_runningActions.empty())
 		return;
 
 	std::vector<Action*> currActions;

core/Manager/CollisionManager.cpp

@@ -3,25 +3,14 @@
 #include "..\e2dtool.h"
 
 
-e2d::CollisionManager * e2d::CollisionManager::_instance = nullptr;
-
 e2d::CollisionManager * e2d::CollisionManager::getInstance()
 {
-	if (!_instance)
+	static CollisionManager instance;
-		_instance = new (std::nothrow) CollisionManager;
+	return &instance;
-	return _instance;
-}
-
-void e2d::CollisionManager::destroyInstance()
-{
-	if (_instance)
-	{
-		delete _instance;
-		_instance = nullptr;
-	}
 }
 
 e2d::CollisionManager::CollisionManager()
+	: _collisionEnabled(false)
 {
 }
 
@@ -45,10 +34,7 @@ void e2d::CollisionManager::__removeCollider(Collider * collider)
 
 void e2d::CollisionManager::__updateCollider(Collider* collider)
 {
-	auto game = Game::getInstance();
+	if (!_collisionEnabled)
-	if (game->isPaused() ||
-		!game->getConfig().isCollisionEnabled() ||
-		game->isTransitioning())
 		return;
 
 	std::vector<Collider*> currColliders;
@@ -92,11 +78,16 @@ void e2d::CollisionManager::__updateCollider(Collider* collider)
 	}
 }
 
+void e2d::CollisionManager::setCollisionEnabled(bool enabled)
+{
+	_collisionEnabled = enabled;
+}
+
 void e2d::CollisionManager::addName(const String & name1, const String & name2)
 {
 	if (!name1.isEmpty() && !name2.isEmpty())
 	{
-		_collisionList.insert(std::make_pair(name1.getHashCode(), name2.getHashCode()));
+		_collisionList.insert(std::make_pair(name1.hash(), name2.hash()));
 	}
 }
 
@@ -106,7 +97,7 @@ void e2d::CollisionManager::addName(const std::vector<std::pair<String, String>
 	{
 		if (!name.first.isEmpty() && !name.second.isEmpty())
 		{
-			_collisionList.insert(std::make_pair(name.first.getHashCode(), name.second.getHashCode()));
+			_collisionList.insert(std::make_pair(name.first.hash(), name.second.hash()));
 		}
 	}
 }
@@ -118,8 +109,8 @@ bool e2d::CollisionManager::isCollidable(Node * node1, Node * node2)
 
 bool e2d::CollisionManager::isCollidable(const String & name1, const String & name2)
 {
-	size_t hashName1 = name1.getHashCode(), 
+	size_t hashName1 = name1.hash(), 
-		hashName2 = name2.getHashCode();
+		hashName2 = name2.hash();
 	auto pair1 = std::make_pair(hashName1, hashName2), 
 		pair2 = std::make_pair(hashName2, hashName1);
 	for (const auto& pair : _collisionList)

core/Node/Button.cpp

@@ -189,20 +189,20 @@ bool e2d::Button::dispatch(const MouseEvent & e, bool handled)
 	return Node::dispatch(e, handled);
 }
 
-void e2d::Button::visit(Renderer* renderer)
+void e2d::Button::visit(Game * game)
 {
-	Node::visit(renderer);
+	Node::visit(game);
 
 	if (_visible &&
 		!_enabled &&
 		_normal &&
-		_normal->containsPoint(Game::getInstance()->getInput()->getMousePos()))
+		_normal->containsPoint(game->getInput()->getMousePos()))
 	{
-		Game::getInstance()->getWindow()->setCursor(Window::Cursor::No);
+		game->getWindow()->setCursor(Window::Cursor::No);
 	}
 	else if (_status == Status::Mouseover || _status == Status::Selected)
 	{
-		Game::getInstance()->getWindow()->setCursor(Window::Cursor::Hand);
+		game->getWindow()->setCursor(Window::Cursor::Hand);
 	}
 }
 

core/Node/Node.cpp

@@ -79,7 +79,7 @@ e2d::Node::~Node()
 	}
 }
 
-void e2d::Node::visit(Renderer * renderer)
+void e2d::Node::visit(Game * game)
 {
 	if (!_visible)
 		return;
@@ -90,11 +90,12 @@ void e2d::Node::visit(Renderer * renderer)
 	// 保留差别属性
 	_extrapolate = this->getProperty();
 
-	auto pRT = renderer->getRenderTarget();
+	auto renderer = game->getRenderer();
+	auto renderTarget = renderer->getRenderTarget();
 	if (_clipEnabled)
 	{
-		pRT->SetTransform(_finalMatri);
+		renderTarget->SetTransform(_finalMatri);
-		pRT->PushAxisAlignedClip(
+		renderTarget->PushAxisAlignedClip(
 			D2D1::RectF(0, 0, _width, _height),
 			D2D1_ANTIALIAS_MODE_PER_PRIMITIVE
 		);
@@ -102,7 +103,7 @@ void e2d::Node::visit(Renderer * renderer)
 
 	if (_children.empty())
 	{
-		pRT->SetTransform(_finalMatri);
+		renderTarget->SetTransform(_finalMatri);
 		this->draw(renderer);
 	}
 	else
@@ -117,7 +118,7 @@ void e2d::Node::visit(Renderer * renderer)
 			// 访问 Order 小于零的节点
 			if (child->getOrder() < 0)
 			{
-				child->visit(renderer);
+				child->visit(game);
 			}
 			else
 			{
@@ -125,17 +126,17 @@ void e2d::Node::visit(Renderer * renderer)
 			}
 		}
 
-		pRT->SetTransform(_finalMatri);
+		renderTarget->SetTransform(_finalMatri);
 		this->draw(renderer);
 
 		// 访问剩余节点
 		for (; i < _children.size(); ++i)
-			_children[i]->visit(renderer);
+			_children[i]->visit(game);
 	}
 
 	if (_clipEnabled)
 	{
-		pRT->PopAxisAlignedClip();
+		renderTarget->PopAxisAlignedClip();
 	}
 }
 
@@ -659,7 +660,7 @@ e2d::Scene * e2d::Node::getParentScene() const
 std::vector<e2d::Node*> e2d::Node::getChildren(const String& name) const
 {
 	std::vector<Node*> vChildren;
-	size_t hash = name.getHashCode();
+	size_t hash = name.hash();
 
 	for (const auto& child : _children)
 	{
@@ -674,7 +675,7 @@ std::vector<e2d::Node*> e2d::Node::getChildren(const String& name) const
 
 e2d::Node * e2d::Node::getChild(const String& name) const
 {
-	size_t hash = name.getHashCode();
+	size_t hash = name.hash();
 
 	for (const auto& child : _children)
 	{
@@ -744,7 +745,7 @@ void e2d::Node::removeChildren(const String& childName)
 	}
 
 	// 计算名称 Hash 值
-	size_t hash = childName.getHashCode();
+	size_t hash = childName.hash();
 
 	auto iter = std::find_if(
 		_children.begin(),
@@ -935,7 +936,7 @@ void e2d::Node::setName(const String& name)
 		// 保存节点名
 		_name = name;
 		// 保存节点 Hash 名
-		_hashName = name.getHashCode();
+		_hashName = name.hash();
 	}
 }
 

core/Node/Scene.cpp

@@ -3,9 +3,39 @@
 #include "..\e2dmanager.h"
 
 e2d::Scene::Scene()
+	: _outlineVisible(false)
+	, _colliderVisible(false)
 {
 }
 
 e2d::Scene::~Scene()
 {
 }
+
+void e2d::Scene::setOutlineVisible(bool visible)
+{
+	_outlineVisible = visible;
+}
+
+void e2d::Scene::setColliderVisible(bool visible)
+{
+	_colliderVisible = visible;
+}
+
+void e2d::Scene::visit(Game * game)
+{
+	Node::visit(game);
+
+	if (_outlineVisible)
+	{
+		auto brush = game->getRenderer()->getSolidColorBrush();
+		brush->SetColor(D2D1::ColorF(D2D1::ColorF::Red, 0.6f));
+		brush->SetOpacity(1.f);
+		this->drawOutline(game->getRenderer());
+	}
+	if (_colliderVisible)
+	{
+		game->getRenderer()->getRenderTarget()->SetTransform(D2D1::Matrix3x2F::Identity());
+		this->drawCollider();
+	}
+}

core/Node/Text.cpp

@@ -384,7 +384,7 @@ void e2d::Text::_createLayout()
 	}
 	
 	HRESULT hr;
-	UINT32 length = (UINT32)_text.getLength();
+	UINT32 length = (UINT32)_text.length();
 	auto writeFactory = Game::getInstance()->getRenderer()->getWriteFactory();
 
 	// 对文本自动换行情况下进行处理

core/Tool/File.cpp

@@ -122,7 +122,7 @@ void e2d::File::addSearchPath(const String & path)
 {
 	String tmp = path;
 	tmp.replace(L"/", L"\\");
-	if (tmp[tmp.getLength() - 1] != L'\\')
+	if (tmp[tmp.length() - 1] != L'\\')
 	{
 		tmp << L"\\";
 	}
@@ -135,11 +135,11 @@ void e2d::File::addSearchPath(const String & path)
 
 bool e2d::File::createFolder(const String & dirPath)
 {
-	if (dirPath.isEmpty() || dirPath.getLength() >= MAX_PATH)
+	if (dirPath.isEmpty() || dirPath.length() >= MAX_PATH)
 		return false;
 
 	wchar_t tmpDirPath[_MAX_PATH] = { 0 };
-	int length = dirPath.getLength();
+	int length = dirPath.length();
 
 	for (int i = 0; i < length; ++i)
 	{
@@ -177,7 +177,7 @@ e2d::String e2d::File::getSaveFilePath(const String& title, const String& defExt
 	ofn.lpstrTitle = (LPCWSTR)title;					// 标题
 	ofn.lpstrDefExt = (LPCWSTR)defExt;					// 默认追加的扩展名
 
-	if (GetSaveFileName(&ofn))
+	if (::GetSaveFileName(&ofn))
 	{
 		return strFilename;
 	}

core/Tool/Path.cpp

@@ -12,10 +12,12 @@ e2d::String e2d::Path::getDataPath()
 	{
 		// 设置数据的保存路径
 		String localAppDataPath = Path::getLocalAppDataPath();
-		String gameName = Game::getInstance()->getConfig().getGameName();
+		String title = Game::getInstance()->getWindow()->getTitle();
-		if (!localAppDataPath.isEmpty() && !gameName.isEmpty())
+		String folderName = String::parse(title.hash());
+
+		if (!localAppDataPath.isEmpty())
 		{
-			dataPath = localAppDataPath + L"\\Easy2DGameData\\" << gameName << L"\\";
+			dataPath = localAppDataPath + L"\\Easy2DGameData\\" << folderName << L"\\";
 
 			File file(dataPath);
 			if (!file.exists() && !File::createFolder(dataPath))
@@ -35,11 +37,12 @@ e2d::String e2d::Path::getTempPath()
 	{
 		// 设置临时文件保存路径
 		wchar_t path[_MAX_PATH];
-		String gameName = Game::getInstance()->getConfig().getGameName();
+		String title = Game::getInstance()->getWindow()->getTitle();
+		String folderName = String::parse(title.hash());
 
-		if (0 != ::GetTempPath(_MAX_PATH, path) && !gameName.isEmpty())
+		if (0 != ::GetTempPath(_MAX_PATH, path))
 		{
-			tempPath << path << L"\\Easy2DGameTemp\\" << gameName << L"\\";
+			tempPath << path << L"\\Easy2DGameTemp\\" << folderName << L"\\";
 
 			File file(tempPath);
 			if (!file.exists() && !File::createFolder(tempPath))

core/Tool/Timer.cpp

@@ -1,21 +1,10 @@
 #include "..\e2dtool.h"
 
-e2d::Timer * e2d::Timer::_instance = nullptr;
 
 e2d::Timer * e2d::Timer::getInstance()
 {
-	if (!_instance)
+	static Timer instance;
-		_instance = new (std::nothrow) Timer;
+	return &instance;
-	return _instance;
-}
-
-void e2d::Timer::destroyInstance()
-{
-	if (_instance)
-	{
-		delete _instance;
-		_instance = nullptr;
-	}
 }
 
 e2d::Timer::Timer()
@@ -112,7 +101,7 @@ void e2d::Timer::clearAllTasks()
 
 void e2d::Timer::update()
 {
-	if (_tasks.empty() || Game::getInstance()->isPaused())
+	if (_tasks.empty())
 		return;
 
 	std::vector<Task*> currTasks;

core/Transition/BoxTransition.cpp

@@ -6,9 +6,9 @@ e2d::BoxTransition::BoxTransition(Scene* scene, float duration)
 {
 }
 
-bool e2d::BoxTransition::_init(Scene * prev)
+bool e2d::BoxTransition::_init(Game * game, Scene * prev)
 {
-	if (Transition::_init(prev))
+	if (Transition::_init(game, prev))
 	{
 		_inLayerParam.opacity = 0;
 		return true;

core/Transition/EmergeTransition.cpp

@@ -6,9 +6,9 @@ e2d::EmergeTransition::EmergeTransition(Scene* scene, float duration)
 {
 }
 
-bool e2d::EmergeTransition::_init(Scene * prev)
+bool e2d::EmergeTransition::_init(Game * game, Scene * prev)
 {
-	if (Transition::_init(prev))
+	if (Transition::_init(game, prev))
 	{
 		_outLayerParam.opacity = 1;
 		_inLayerParam.opacity = 0;

core/Transition/FadeTransition.cpp

@@ -6,9 +6,9 @@ e2d::FadeTransition::FadeTransition(Scene* scene, float duration)
 {
 }
 
-bool e2d::FadeTransition::_init(Scene * prev)
+bool e2d::FadeTransition::_init(Game * game, Scene * prev)
 {
-	if (Transition::_init(prev))
+	if (Transition::_init(game, prev))
 	{
 		_outLayerParam.opacity = 1;
 		_inLayerParam.opacity = 0;

core/Transition/MoveTransition.cpp

@@ -7,9 +7,9 @@ e2d::MoveTransition::MoveTransition(Scene* scene, float duration, Direction dire
 {
 }
 
-bool e2d::MoveTransition::_init(Scene * prev)
+bool e2d::MoveTransition::_init(Game * game, Scene * prev)
 {
-	if (Transition::_init(prev))
+	if (Transition::_init(game, prev))
 	{
 		float width = _windowSize.width;
 		float height = _windowSize.height;

core/Transition/Transition.cpp

@@ -31,7 +31,7 @@ bool e2d::Transition::isDone()
 	return _end;
 }
 
-bool e2d::Transition::_init(Scene * prev)
+bool e2d::Transition::_init(Game * game, Scene * prev)
 {
 	_started = Time::now();
 	_outScene = prev;
@@ -39,9 +39,8 @@ bool e2d::Transition::_init(Scene * prev)
 	if (_outScene)
 		_outScene->retain();
 	
-	// ´´½¨Í¼²ã
 	HRESULT hr = S_OK;
-	auto renderer = Game::getInstance()->getRenderer();
+	auto renderer = game->getRenderer();
 	if (_inScene)
 	{
 		hr = renderer->getRenderTarget()->CreateLayer(&_inLayer);
@@ -57,7 +56,7 @@ bool e2d::Transition::_init(Scene * prev)
 		return false;
 	}
 
-	_windowSize = Game::getInstance()->getWindow()->getSize();
+	_windowSize = game->getWindow()->getSize();
 	_outLayerParam = _inLayerParam = D2D1::LayerParameters(
 		D2D1::InfiniteRect(),
 		nullptr,
@@ -84,10 +83,9 @@ void e2d::Transition::_update()
 	}
 }
 
-void e2d::Transition::_render()
+void e2d::Transition::_render(Game * game)
 {
-	auto renderer = Game::getInstance()->getRenderer();
+	auto renderTarget = game->getRenderer()->getRenderTarget();
-	auto pRT = renderer->getRenderTarget();
 
 	if (_outScene)
 	{
@@ -98,14 +96,14 @@ void e2d::Transition::_render()
 			std::min(rootPos.x + _windowSize.width, _windowSize.width),
 			std::min(rootPos.y + _windowSize.height, _windowSize.height)
 		);
-		pRT->SetTransform(D2D1::Matrix3x2F::Identity());
+		renderTarget->SetTransform(D2D1::Matrix3x2F::Identity());
-		pRT->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
+		renderTarget->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
-		pRT->PushLayer(_outLayerParam, _outLayer);
+		renderTarget->PushLayer(_outLayerParam, _outLayer);
 
-		_outScene->visit(renderer);
+		_outScene->visit(game);
 
-		pRT->PopLayer();
+		renderTarget->PopLayer();
-		pRT->PopAxisAlignedClip();
+		renderTarget->PopAxisAlignedClip();
 	}
 
 	if (_inScene)
@@ -117,14 +115,14 @@ void e2d::Transition::_render()
 			std::min(rootPos.x + _windowSize.width, _windowSize.width),
 			std::min(rootPos.y + _windowSize.height, _windowSize.height)
 		);
-		pRT->SetTransform(D2D1::Matrix3x2F::Identity());
+		renderTarget->SetTransform(D2D1::Matrix3x2F::Identity());
-		pRT->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
+		renderTarget->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
-		pRT->PushLayer(_inLayerParam, _inLayer);
+		renderTarget->PushLayer(_inLayerParam, _inLayer);
 
-		_inScene->visit(renderer);
+		_inScene->visit(game);
 
-		pRT->PopLayer();
+		renderTarget->PopLayer();
-		pRT->PopAxisAlignedClip();
+		renderTarget->PopAxisAlignedClip();
 	}
 }
 

core/e2dbase.h

@@ -10,68 +10,6 @@ namespace e2d
 {
 
 
-// 配置
-class Config
-{
-public:
-	Config();
-
-	virtual ~Config();
-
-	// 修改游戏名称
-	// 默认：空
-	void setGameName(
-		const String& name
-	);
-
-	// 显示或隐藏 FPS
-	// 默认：隐藏
-	void showFps(
-		bool show
-	);
-
-	// 显示或隐藏节点轮廓
-	// 默认：隐藏
-	void setOutlineVisible(
-		bool visible
-	);
-
-	// 打开或关闭碰撞监听
-	// 默认：关闭
-	void setCollisionEnabled(
-		bool enabled
-	);
-
-	// 打开或关闭碰撞体可视化
-	// 默认：关闭
-	void setColliderVisible(
-		bool visible
-	);
-
-	// 获取游戏名称
-	String getGameName() const;
-
-	// 获取 FPS 显示状态
-	bool isFpsShow() const;
-
-	// 获取节点轮廓显示状态
-	bool isOutlineVisible() const;
-
-	// 获取碰撞监听状态
-	bool isCollisionEnabled() const;
-
-	// 获取碰撞体可视化状态
-	bool isColliderVisible() const;
-
-protected:
-	bool			_showFps;
-	bool			_outlineVisible;
-	bool			_collisionEnabled;
-	bool			_colliderVisible;
-	String			_gameName;
-};
-
-
 // 窗体
 class Window
 {
@@ -171,8 +109,8 @@ public:
 	void poll();
 
 private:
-	// 根据客户区大小计算合适的窗口区域
+	// 根据客户区大小定位窗口
-	Rect __adjustWindow(
+	Rect _locate(
 		int width,
 		int height
 	);
@@ -232,14 +170,14 @@ public:
 	// 获得鼠标Z轴（鼠标滚轮）坐标增量
 	float getMouseDeltaZ();
 
-	// 刷新输入设备状态
+	// 初始化输入设备
-	void update();
+	void initWithWindow(
-
-	// 初始化渲染器（不应手动调用该函数）
-	void init(
 		Window * window
 	);
 
+	// 刷新输入设备状态
+	void update();
+
 private:
 	IDirectInput8W* _directInput;
 	IDirectInputDevice8W* _keyboardDevice;
@@ -249,7 +187,7 @@ private:
 };
 
 
-// 图形设备
+// 渲染器
 class Renderer
 {
 public:
@@ -265,6 +203,12 @@ public:
 		Color color
 	);
 
+	// 显示或隐藏 FPS
+	// 默认：隐藏
+	void showFps(
+		bool show
+	);
+
 	// 获取文字渲染器
 	TextRenderer * getTextRenderer() const { return _textRenderer; }
 
@@ -292,8 +236,8 @@ public:
 	// 获取 Round 样式的 ID2D1StrokeStyle
 	ID2D1StrokeStyle * getRoundStrokeStyle();
 
-	// 初始化渲染器（不应手动调用该函数）
+	// 初始化渲染器
-	void init(
+	void initWithWindow(
 		Window * window
 	);
 
@@ -303,10 +247,8 @@ public:
 	// 结束渲染
 	void endDraw();
 
-	// 渲染 FPS
-	void drawFps();
-
 private:
+	bool					_showFps;
 	int						_renderTimes;
 	Time					_lastRenderTime;
 	D2D1_COLOR_F			_clearColor;
@@ -324,6 +266,8 @@ private:
 };
 
 
+class Timer;
+class ActionManager;
 class Scene;
 class Transition;
 
@@ -334,6 +278,11 @@ public:
 	// 获取 Game 实例
 	static Game * getInstance();
 
+	// 初始化
+	void initWithWindow(
+		Window * window
+	);
+
 	// 获取窗体
 	Window * getWindow() const { return _window; }
 
@@ -343,19 +292,6 @@ public:
 	// 获取图形设备
 	Renderer * getRenderer() const { return _renderer; }
 
-	// 获取游戏配置
-	const Config& getConfig() const;
-
-	// 设置窗体
-	void setWindow(
-		Window * window
-	);
-
-	// 修改游戏配置
-	void setConfig(
-		const Config& config
-	);
-
 	// 启动游戏
 	void start();
 
@@ -419,18 +355,19 @@ protected:
 private:
 	bool		_quit;
 	bool		_paused;
-	Config		_config;
 	Window*		_window;
 	Input*		_input;
 	Renderer*	_renderer;
+	Timer*		_timer;
 	Scene*		_currScene;
 	Scene*		_nextScene;
 	Transition*	_transition;
+	ActionManager*		_actionManager;
 	std::stack<Scene*>	_scenes;
 };
 
 
-// 垃圾回收器
+// 垃圾回收池
 class GC
 {
 public:
@@ -464,8 +401,6 @@ private:
 	bool _notifyed;
 	bool _cleanup;
 	std::set<Ref*> _pool;
-
-	static GC _instance;
 };
 
 }

core/e2dcommon.h

@@ -135,14 +135,14 @@ public:
 
 	~String();
 
-	// 判断字符串是否为空
-	bool isEmpty() const;
-
 	// 获取字符串长度
-	int getLength() const;
+	int length() const;
 
 	// 获取该字符串的散列值
-	size_t getHashCode() const;
+	size_t hash() const;
+
+	// 判断字符串是否为空
+	bool isEmpty() const;
 
 	// 获取 Unicode 字符串
 	std::wstring getWString() const;
@@ -244,8 +244,6 @@ public:
 	// 类型转换操作符
 	E2D_OP_EXPLICIT operator const wchar_t* () const;
 	E2D_OP_EXPLICIT operator wchar_t* () const;
-	E2D_OP_EXPLICIT operator const char* () const;
-	E2D_OP_EXPLICIT operator char* () const;
 
 	// 比较运算符
 	bool operator== (const String &) const;

core/e2dmanager.h

@@ -18,9 +18,6 @@ public:
 	// 获取动作管理器实例
 	static ActionManager * getInstance();
 
-	// 销毁实例
-	static void destroyInstance();
-
 	// 获取所有名称相同的动作
 	std::vector<Action *> get(
 		const String& name
@@ -100,8 +97,6 @@ private:
 private:
 	std::vector<Action*> _actions;
 	std::vector<Action*> _runningActions;
-
-	static ActionManager * _instance;
 };
 
 
@@ -115,8 +110,11 @@ public:
 	// 获取碰撞体管理器实例
 	static CollisionManager * getInstance();
 
-	// 销毁实例
+	// 打开或关闭碰撞监听
-	static void destroyInstance();
+	// 默认：关闭
+	void setCollisionEnabled(
+		bool enabled
+	);
 
 	// 添加可互相碰撞物体的名称
 	void addName(
@@ -164,10 +162,9 @@ private:
 	);
 
 private:
+	bool _collisionEnabled;
 	std::vector<Collider*> _colliders;
 	std::set<std::pair<size_t, size_t>> _collisionList;
-
-	static CollisionManager * _instance;
 };
 
 }

core/e2dnode.h

@@ -398,7 +398,7 @@ public:
 
 	// 遍历节点
 	virtual void visit(
-		Renderer * renderer
+		Game * game
 	);
 
 	// 渲染节点轮廓
@@ -474,8 +474,29 @@ public:
 	// 说明：返回 false 将阻止窗口关闭
 	virtual bool onCloseWindow() { return true; }
 
+	// 显示或隐藏节点轮廓
+	// 默认：隐藏
+	void setOutlineVisible(
+		bool visible
+	);
+
+	// 打开或关闭碰撞体可视化
+	// 默认：关闭
+	void setColliderVisible(
+		bool visible
+	);
+
+	// 遍历节点
+	virtual void visit(
+		Game * game
+	) override;
+
 protected:
 	E2D_DISABLE_COPY(Scene);
+
+protected:
+	bool _outlineVisible;
+	bool _colliderVisible;
 };
 
 
@@ -843,9 +864,9 @@ public:
 		bool handled
 	) override;
 
-	// 渲染节点
+	// 遍历节点
 	virtual void visit(
-		Renderer * renderer
+		Game * game
 	) override;
 
 protected:

core/e2dtool.h

@@ -283,9 +283,6 @@ public:
 	// 获取定时器实例
 	static Timer * getInstance();
 
-	// 销毁实例
-	static void destroyInstance();
-
 	// 添加任务
 	void addTask(
 		Task * task
@@ -333,8 +330,6 @@ private:
 
 private:
 	std::vector<Task*> _tasks;
-
-	static Timer * _instance;
 };
 
 

core/e2dtransition.h

@@ -28,6 +28,7 @@ public:
 protected:
 	// 初始化场景过渡动画
 	virtual bool _init(
+		Game * game,
 		Scene * prev
 	);
 
@@ -35,7 +36,9 @@ protected:
 	virtual void _update();
 
 	// 渲染场景过渡动画
-	virtual void _render();
+	virtual void _render(
+		Game * game
+	);
 
 	// 停止场景过渡动画
 	virtual void _stop();
@@ -73,6 +76,7 @@ protected:
 	virtual void _update() override;
 
 	virtual bool _init(
+		Game * game,
 		Scene * prev
 	) override;
 };
@@ -92,6 +96,7 @@ protected:
 	virtual void _update() override;
 
 	virtual bool _init(
+		Game * game,
 		Scene * prev
 	) override;
 };
@@ -111,6 +116,7 @@ protected:
 	virtual void _update() override;
 
 	virtual bool _init(
+		Game * game,
 		Scene * prev
 	) override;
 };
@@ -131,6 +137,7 @@ protected:
 	virtual void _update() override;
 
 	virtual bool _init(
+		Game * game,
 		Scene * prev
 	) override;
 

project/vs2012/Easy2D.vcxproj

@@ -51,7 +51,6 @@
     <ClCompile Include="..\..\core\Action\ScaleTo.cpp" />
     <ClCompile Include="..\..\core\Action\Sequence.cpp" />
     <ClCompile Include="..\..\core\Action\Spawn.cpp" />
-    <ClCompile Include="..\..\core\Base\Config.cpp" />
     <ClCompile Include="..\..\core\Base\Game.cpp" />
     <ClCompile Include="..\..\core\Base\GC.cpp" />
     <ClCompile Include="..\..\core\Base\Input.cpp" />

project/vs2012/Easy2D.vcxproj.filters

@@ -232,9 +232,6 @@
     <ClCompile Include="..\..\core\Event\MouseEvent.cpp">
       <Filter>Event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Config.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Node\Scene.cpp">
       <Filter>Node</Filter>
     </ClCompile>

project/vs2013/Easy2D.vcxproj

@@ -195,7 +195,6 @@
     <ClCompile Include="..\..\core\Action\ScaleTo.cpp" />
     <ClCompile Include="..\..\core\Action\Sequence.cpp" />
     <ClCompile Include="..\..\core\Action\Spawn.cpp" />
-    <ClCompile Include="..\..\core\Base\Config.cpp" />
     <ClCompile Include="..\..\core\Base\Game.cpp" />
     <ClCompile Include="..\..\core\Base\GC.cpp" />
     <ClCompile Include="..\..\core\Base\Input.cpp" />

project/vs2013/Easy2D.vcxproj.filters

@@ -232,9 +232,6 @@
     <ClCompile Include="..\..\core\Event\MouseEvent.cpp">
       <Filter>Event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Config.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Node\Scene.cpp">
       <Filter>Node</Filter>
     </ClCompile>

project/vs2017/Easy2D.vcxproj

@@ -215,7 +215,6 @@
     <ClCompile Include="..\..\core\Action\Sequence.cpp" />
     <ClCompile Include="..\..\core\Action\FiniteTimeAction.cpp" />
     <ClCompile Include="..\..\core\Action\Spawn.cpp" />
-    <ClCompile Include="..\..\core\Base\Config.cpp" />
     <ClCompile Include="..\..\core\Base\Game.cpp" />
     <ClCompile Include="..\..\core\Base\GC.cpp" />
     <ClCompile Include="..\..\core\Base\Input.cpp" />

project/vs2017/Easy2D.vcxproj.filters

@@ -225,9 +225,6 @@
     <ClCompile Include="..\..\core\Common\Duration.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Config.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Node\Scene.cpp">
       <Filter>Node</Filter>
     </ClCompile>