Commit: 98c546100a61b099940000a22a7db0f1d710e446 - main (git)

Commit MetaInfo

• Revisão: 98c546100a61b099940000a22a7db0f1d710e446 (tree)
• Hora: 2012-10-28 21:59:03
• Autor: h2so5 <h2so5@git....>
• Commiter: h2so5

Mensagem de Log

起動時にステージモデルをキャッシュする機能を追加
ModelHandle2をModelHandleに改名

Mudança Sumário

• modified: .gitignore
• modified: client/3d/FieldPlayer.cpp
• modified: client/3d/FieldPlayer.hpp
• modified: client/3d/PlayerCharacter.cpp
• modified: client/3d/Stage.cpp
• modified: client/3d/Stage.hpp
• modified: client/ResourceManager.cpp
• modified: client/ResourceManager.hpp
• modified: client/scene/ChannelChange.cpp
• modified: client/scene/ChannelChange.hpp
• modified: client/scene/MainLoop.cpp
• modified: client/scene/MainLoop.hpp

Diff

--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ log_*.txt
 /client/bin/log
 /client/bin/Log.txt
 /client/bin/user
+/client/bin/cache

--- a/client/3d/FieldPlayer.cpp
+++ b/client/3d/FieldPlayer.cpp
@@ -211,10 +211,6 @@ void FieldPlayer::SetModel(const ModelHandle& model)
 
 void FieldPlayer::Update()
 {
-	if (loading_model_handle_ && loading_model_handle_.CheckLoaded()) {
-		SetModel(loading_model_handle_);
-		loading_model_handle_ = ModelHandle();
-	}
 
 	// 落ちた時に強制復帰
 	if (prev_stat_.pos.y < (*stage_)->min_height()) {

Binary files a/client/3d/FieldPlayer.hpp and b/client/3d/FieldPlayer.hpp differ

--- a/client/3d/PlayerCharacter.cpp
+++ b/client/3d/PlayerCharacter.cpp
@@ -236,7 +236,6 @@ public:
 				}
 
                 // 床へのめり込みを防止
-                float floor_y;
 				std::pair<bool, VECTOR> floor_coll;
 					// 足で接地検査
 					floor_coll = (*stage_)->FloorExists(moved_pos,model_height_,0);

--- a/client/3d/Stage.cpp
+++ b/client/3d/Stage.cpp
@@ -9,7 +9,7 @@
 #include <string>
 
 Stage::Stage(const ChannelPtr& channel,const ConfigManagerPtr &config_manager) :
-    map_handle_(ResourceManager::LoadModelFromName2(unicode::ToTString(channel->stage))),
+    map_handle_(ResourceManager::LoadModelFromName(unicode::ToTString(channel->stage))),
     map_scale_(map_handle_.property().get<float>("scale", 20.0)),
 	min_height_(map_handle_.property().get<float>("min_height", -200.0)),
 	host_change_flag_(false),
@@ -320,7 +320,7 @@ void Stage::UpdateSkymapPosition(const VECTOR& pos)
     MV1SetPosition(skymap_handle_.handle(), VGet(pos.x, 800, pos.z));
 }
 
-const ModelHandle2& Stage::map_handle() const
+const ModelHandle& Stage::map_handle() const
 {
     return map_handle_;
 }

--- a/client/3d/Stage.hpp
+++ b/client/3d/Stage.hpp
@@ -34,7 +34,7 @@ class Stage {
         bool IsVisiblePoint(const VECTOR& point) const;
         bool IsNearPoint(const VECTOR& point) const;
 
-        const ModelHandle2& map_handle() const;
+        const ModelHandle& map_handle() const;
         const ModelHandle& skymap_handle() const;
         float map_scale() const;
         float min_height() const;
@@ -50,13 +50,12 @@ class Stage {
 		ConfigManagerPtr config_manager() const;
 
     private:
-        ModelHandle2 map_handle_;
+        ModelHandle map_handle_;
+		ModelHandle skymap_handle_;
         float map_scale_;
 		float min_height_;
 
 		std::unordered_set<int> draw_after_meshes_;
-
-        ModelHandle skymap_handle_;
 		std::vector<ModelHandle> warpobj_handles_;
 
         std::vector<VECTOR> start_points_;

--- a/client/ResourceManager.cpp
+++ b/client/ResourceManager.cpp
@@ -4,11 +4,23 @@
 
 #include <fstream>
 #include <boost/filesystem.hpp>
+#include <boost/crc.hpp>
 #include "ResourceManager.hpp"
 #include "../common/Logger.hpp"
 #include "../common/unicode.hpp"
 #include "Music.hpp"
 
+
+// MV1書き出し関数
+namespace DxLib
+{
+extern int MV1SaveModelToMV1File( int MHandle, const char *FileName,
+	int SaveType = ((0x0001) | (0x0002)), int AnimMHandle = -1,
+	int AnimNameCheck = TRUE, int Normal8BitFlag = 1,
+	int Position16BitFlag = 1, int Weight8BitFlag = 0,
+	int Anim16BitFlag = 1 );
+};
+
 ResourceManager::MemoryPool ResourceManager::mempool;
 
 const static TCHAR* CHAT_FONT_NAME = _T("UmePlus P Gothic");
@@ -109,10 +121,10 @@ std::vector<std::string> ResourceManager::model_name_list_;
 ptree ResourceManager::model_name_tree_;
 void ResourceManager::BuildModelFileTree()
 {
-    using namespace boost::filesystem;
-    using namespace std;
+	using namespace boost::filesystem;
+	using namespace std;
 
-    model_name_tree_.clear();
+	model_name_tree_.clear();
 	model_name_list_.clear();
 
 	std::function<void(const path& p)> search_dir;
@@ -120,51 +132,55 @@ void ResourceManager::BuildModelFileTree()
 
 		using namespace boost::filesystem;
 
-        if (exists(p) && is_directory(p)) {
-            for (auto it_dir = directory_iterator(p); it_dir != directory_iterator(); ++it_dir) {
-                if (is_directory(*it_dir)) {
-                    path json_path = it_dir->path() / "info.json";
-                    if (exists(json_path)) {
-
-                        path model_path;
-                        for (auto it = directory_iterator(*it_dir); it != directory_iterator(); ++it) {
-                            auto extension = it->path().extension().string();
-
-                            if (extension == ".mv1" || extension == ".x"
-                             || extension == ".pmd" || extension == ".pmx") {
-                                model_path = it->path();
-                                break;
-                            }
-                        }
-
-                        if (!model_path.empty()) {
-                            ptree pt_json;
-                            read_json(json_path.string(), pt_json);
+		if (exists(p) && is_directory(p)) {
+			for (auto it_dir = directory_iterator(p); it_dir != directory_iterator(); ++it_dir) {
+				if (is_directory(*it_dir)) {
+					path json_path = it_dir->path() / "info.json";
+					if (exists(json_path)) {
+
+						path model_path;
+						for (auto it = directory_iterator(*it_dir); it != directory_iterator(); ++it) {
+							auto extension = it->path().extension().string();
+
+							if (extension == ".mv1" || extension == ".x"
+								|| extension == ".pmd" || extension == ".pmx") {
+									model_path = it->path();
+									break;
+							}
+						}
+
+						if (!model_path.empty()) {
+							ptree pt_json;
+							read_json(json_path.string(), pt_json);
 							MergePtree(&pt_json, GetDefaultInfoJSON());
 
-                            std::string name = pt_json.get<std::string>("name", "");
-                            pt_json.put<std::string>("modelpath", unicode::sjis2utf8(model_path.string()));
+							std::string name = pt_json.get<std::string>("name", "");
+							auto model_path_str = unicode::sjis2utf8(model_path.string());
+
+							pt_json.put<std::string>("modelpath", model_path_str);
 							if (!name.empty()) {
 								model_name_list_.push_back(name);
-							}
+								model_name_tree_.put_child(ptree::path_type(name + ":_info_", ':'), pt_json);
 
-                            if (name.size() > 0) {
-                                model_name_tree_.put_child(ptree::path_type(name + ":_info_", ':'), pt_json);
-                            }
-                        }
-                    } else {
+								// ステージデータをキャッシュ
+								if (name.find("stage:") == 0) {
+									CreateModelCache(model_path_str, pt_json);
+								}
+							}
+						}
+					} else {
 						search_dir(it_dir->path());
 					}
-                }
-            }
-        }
+				}
+			}
+		}
 	};
 
-    try {
+	try {
 		search_dir("./models");
-    } catch (const filesystem_error& ex) {
-        Logger::Error(_T("%s"), unicode::ToTString(ex.what()));
-    }
+	} catch (const filesystem_error& ex) {
+		Logger::Error(_T("%s"), unicode::ToTString(ex.what()));
+	}
 
 }
 
@@ -272,6 +288,49 @@ void SetMotionNames(int handle, const ReadFuncData& funcdata)
 	}
 }
 
+std::string ResourceManager::GetCacheFilename(const ptree& info, const std::shared_ptr<char>& fileimage, int filesize)
+{
+	boost::crc_32_type crc;
+	crc.process_block(static_cast<void*>(fileimage.get()),
+		static_cast<void*>(fileimage.get() + filesize));
+
+	boost::crc_32_type crc_info;
+	std::stringstream stream;
+	boost::archive::text_oarchive oa(stream);
+	oa << info;
+	while(stream.good()) {
+		crc_info.process_byte(stream.get());
+	}
+
+	auto cache_filename = "./cache/" + 
+		boost::lexical_cast<std::string>(crc.checksum()) + "_" +
+		boost::lexical_cast<std::string>(crc_info.checksum()) +
+		".mv1";
+
+	return cache_filename;
+}
+
+void ResourceManager::CreateModelCache(std::string filepath, const ptree& info)
+{
+	auto funcdata = std::make_shared<ReadFuncData>(info);
+
+	std::shared_ptr<char> fileimage;
+    int filesize;
+
+    LoadFile(unicode::ToTString(filepath).c_str(), &fileimage, &filesize );
+	auto cache_filename = GetCacheFilename(info, fileimage, filesize);
+
+	if (!boost::filesystem::exists(cache_filename)) {
+		int handle = MV1LoadModelFromMem(fileimage.get(), filesize, FileReadFunc, FileReleaseFunc, &(*funcdata));
+
+		if (!boost::filesystem::exists("./cache")) {
+			boost::filesystem::create_directory("./cache");
+		}
+		MV1SaveModelToMV1File(handle, cache_filename.c_str());
+		MV1DeleteModel(handle);
+	}
+}
+
 void ResourceManager::RequestModelFromName(const tstring& name)
 {
 	if (!IsCachedModelName(name)) {
@@ -293,7 +352,7 @@ ReadFuncData::ReadFuncData(const ptree& info)
 {
 	tstring filepath = unicode::ToTString(info.get<std::string>("modelpath", ""));
 	auto path = boost::filesystem::wpath(unicode::ToWString(filepath));
-    model_dir = path.parent_path();
+	model_dir = path.parent_path();
 
 	if (path.extension() == _T(".pmd") || path.extension() == _T(".pmx")) {
 		auto motions_array = info.get_child("character.motions", ptree());
@@ -345,61 +404,13 @@ ReadFuncData::ReadFuncData(const ptree& info)
 			}
 		}
 	}
-    motions_it = motions.begin();
+	motions_it = motions.begin();
 }
 
 std::unordered_map<std::string, std::string> ResourceManager::set_motions_ = std::unordered_map<std::string, std::string>();
 float ResourceManager::model_edge_size_ = 1.0f;
-ModelHandle ResourceManager::LoadModelFromName(const tstring& name)
-{
- 	auto fullpath = ptree::path_type(unicode::ToString(NameToFullPath(name)), ':');
-	ptree p = model_name_tree_.get_child(fullpath, ptree());
-
-	ptree info = p.get_child("_info_", ptree());
-	tstring filepath = unicode::ToTString(info.get<std::string>("modelpath", ""));
-	if(!filepath.size())
-	{
-		fullpath = ptree::path_type(unicode::ToString(NameToFullPath(UNKNOWN_MODEL_NAME)), ':');
-		p = model_name_tree_.get_child(fullpath, ptree());
-		info = p.get_child("_info_", ptree());
-		filepath = unicode::ToTString(info.get<std::string>("modelpath", ""));
-	}
-    if (filepath.size() > 0) {
-        auto it = model_handles_.find(unicode::ToTString(filepath));
-        if (it != model_handles_.end()) {
-            return it->second.Clone();
-        }else{
-			auto funcdata = std::make_shared<ReadFuncData>(info);
-			set_motions_ = funcdata->set_motions;
-
-			//void *FileImage ;
-			std::shared_ptr<char> FileImage;
-            int FileSize ;
-
-            LoadFile(unicode::ToTString(filepath).c_str(), &FileImage, &FileSize );
-
-			int handle = MV1LoadModelFromMem( FileImage.get(), FileSize, FileReadFunc, FileReleaseFunc, &(*funcdata));
-
-			auto material_num = MV1GetMaterialNum(handle);
-			for(int i = 0; i < material_num; ++i){
-				MV1SetMaterialType(handle,i,DX_MATERIAL_TYPE_TOON_2);
-			}
 
-
-			SetMotionNames(handle, *funcdata);
-
-            auto model_handle = ModelHandle(handle, funcdata, std::make_shared<ptree>(info));
-            model_handles_[unicode::ToTString(filepath)] = model_handle;
-
-            Logger::Debug(_T("Model %d"), handle);
-            return model_handle.Clone();
-		}
-    } else {
-        return ModelHandle();
-    }
-}
-
-ModelHandle2 ResourceManager::LoadModelFromName2(const tstring& name)
+ModelHandle ResourceManager::LoadModelFromName(const tstring& name)
 {
  	auto fullpath = ptree::path_type(unicode::ToString(NameToFullPath(name)), ':');
 	ptree p = model_name_tree_.get_child(fullpath, ptree());
@@ -416,16 +427,23 @@ ModelHandle2 ResourceManager::LoadModelFromName2(const tstring& name)
     if (filepath.size() > 0) {
         auto it = shared_model_data_.find(unicode::ToTString(filepath));
         if (it != shared_model_data_.end()) {
-            return ModelHandle2(it->second);
+            return ModelHandle(it->second);
         }else{
 			auto funcdata = std::make_shared<ReadFuncData>(info);
 			set_motions_ = funcdata->set_motions;
 
-			//void *FileImage ;
 			std::shared_ptr<char> FileImage;
-            int FileSize ;
+            int FileSize;
 
             LoadFile(unicode::ToTString(filepath).c_str(), &FileImage, &FileSize );
+			
+			// キャッシュ読み込み
+			// モーションなしのモデルでないと上手くいかない
+			auto cache_filename = GetCacheFilename(info, FileImage, FileSize);
+			if (boost::filesystem::exists(cache_filename)) {
+				FileImage.reset();
+				LoadFile(unicode::ToTString(cache_filename).c_str(), &FileImage, &FileSize);
+			}
 
 			int handle = MV1LoadModelFromMem( FileImage.get(), FileSize, FileReadFunc, FileReleaseFunc, &(*funcdata));
 
@@ -436,20 +454,22 @@ ModelHandle2 ResourceManager::LoadModelFromName2(const tstring& name)
 
 			SetMotionNames(handle, *funcdata);
 
+			// CreateModelCache(handle, info, FileImage, FileSize);
+
 			SharedModelDataPtr shared_data = 
 				std::make_shared<SharedModelData>(handle, std::make_shared<ptree>(info));
 
             shared_model_data_[unicode::ToTString(filepath)] = shared_data;
 
             Logger::Debug(_T("Model %d"), handle);
-            return ModelHandle2(shared_data);
+            return ModelHandle(shared_data);
 		}
     } else {
-        return ModelHandle2();
+        return ModelHandle();
     }
 }
 
-void ResourceManager::ClearModelHandle2()
+void ResourceManager::ClearModelHandle()
 {
 	std::list<tstring> erase_keys;
 	BOOST_FOREACH(const auto& it, shared_model_data_) {
@@ -577,71 +597,6 @@ ImageHandle::operator int() const
     return handle_;
 }
 
-ModelHandle::ModelHandle(int handle, const ReadFuncDataPtr& funcdata, const std::shared_ptr<ptree>& property, bool async_load) :
-        handle_(handle),
-		funcdata_(funcdata),
-        property_(property),
-        name_(property_->get<std::string>("name", "")),
-        async_load_(async_load)
-{
-
-}
-
-ModelHandle ModelHandle::Clone()
-{
-    if (CheckHandleASyncLoad(handle_) == TRUE) {
-        return ModelHandle(handle_, funcdata_, property_, true);
-    } else {
-        return ModelHandle(MV1DuplicateModel(handle_), funcdata_, property_);
-    }
-}
-
-bool ModelHandle::CheckLoaded()
-{
-	if (!async_load_) {
-		return true;
-	} else if (async_load_ && CheckHandleASyncLoad(handle_) == FALSE) {
-        handle_ = MV1DuplicateModel(handle_);
-		SetMotionNames(handle_, *funcdata_);
-		async_load_ = false;
-		return true;
-	} else {
-		return false;
-	}
-}
-
-ModelHandle::operator bool() const
-{
-	return handle_ != -1;
-}
-
-ModelHandle::ModelHandle() :
-        handle_(-1),
-        property_(std::make_shared<ptree>())
-{
-
-}
-
-ModelHandle::~ModelHandle()
-{
-
-}
-
-int ModelHandle::handle() const
-{
-    return handle_;
-}
-
-const ptree& ModelHandle::property() const
-{
-    return *property_;
-}
-
-std::string ModelHandle::name() const
-{
-    return name_;
-}
-
 SharedModelData::SharedModelData(int base_handle, const PtreePtr& property) :
 	base_handle_(base_handle),
 	property_(property)
@@ -670,24 +625,34 @@ SharedModelData::~SharedModelData()
 	MV1DeleteModel(base_handle_);
 }
 
-ModelHandle2::ModelHandle2(const SharedModelDataPtr& shared_data) :
+ModelHandle::ModelHandle(const SharedModelDataPtr& shared_data) :
 	shared_data_(shared_data),
 	handle_(shared_data->DuplicateHandle())
 {
 
 }
 
-ModelHandle2::operator bool() const
+ModelHandle::ModelHandle()
+{
+
+}
+
+ModelHandle::operator bool() const
 {
 	return static_cast<bool>(shared_data_);
 }
 
-int ModelHandle2::handle() const
+int ModelHandle::handle() const
 {
 	return handle_;
 }
 
-const ptree& ModelHandle2::property() const
+const ptree& ModelHandle::property() const
 {
 	return shared_data_->property();
+}
+
+std::string ModelHandle::name() const
+{
+    return property().get<std::string>("name", "");
 }
\ No newline at end of file

--- a/client/ResourceManager.hpp
+++ b/client/ResourceManager.hpp
@@ -22,7 +22,7 @@ class ModelHandle;
 class Music;
 
 class SharedModelData;
-class ModelHandle2;
+class ModelHandle;
 
 typedef std::shared_ptr<ImageHandle> ImageHandlePtr;
 typedef std::shared_ptr<ModelHandle> ModelHandlePtr;
@@ -106,10 +106,12 @@ class ResourceManager {
         // models
         static void BuildModelFileTree();
         static void CacheBakedModel();
+
         static ModelHandle LoadModelFromName(const tstring&);
+        static void ClearModelHandle();
 
-        static ModelHandle2 LoadModelFromName2(const tstring&);
-        static void ClearModelHandle2();
+		static std::string GetCacheFilename(const ptree& info, const std::shared_ptr<char>& fileimage, int filesize);
+		static void CreateModelCache(std::string filepath, const ptree& info);
 
         static void RequestModelFromName(const tstring&);
         static bool IsCachedModelName(const tstring&);
@@ -171,46 +173,6 @@ class ImageHandle {
 
 };
 
-class ModelHandle {
-    friend class ResourceManager;
-
-    private:
-        ModelHandle(int handle, const ReadFuncDataPtr& funcdata, const std::shared_ptr<ptree>& property, bool async_load = false);
-        ModelHandle Clone();
-
-    public:
-        ModelHandle();
-        ~ModelHandle();
-
-        int handle() const;
-        const ptree& property() const;
-        std::string name() const;
-		
-        operator bool() const;
-
-		bool CheckLoaded();
-
-    private:
-        int handle_;
-		ReadFuncDataPtr funcdata_;
-        std::shared_ptr<ptree> property_;
-        std::string name_;
-        bool async_load_;
-
-	public:
-		void *operator new(size_t size)
-		{
-			return tlsf_new(ResourceManager::memory_pool(), size);
-		}
-		void *operator new(size_t, void *p){return p;}
-		void operator delete(void *p)
-		{
-			tlsf_delete(ResourceManager::memory_pool(), p);
-		}
-		void operator delete(void *, void *){};
-
-};
-
 typedef std::shared_ptr<ptree> PtreePtr;
 
 class SharedModelData {
@@ -227,12 +189,14 @@ class SharedModelData {
 		PtreePtr property_;
 };
 
-class ModelHandle2 {
+class ModelHandle {
 	public:
-		ModelHandle2(const SharedModelDataPtr& shared_data = SharedModelDataPtr());
+		ModelHandle(const SharedModelDataPtr& shared_data);
+		ModelHandle();
 		operator bool() const;
 	    int handle() const;
         const ptree& property() const;
+        std::string name() const;
 
 	private:
 		SharedModelDataPtr shared_data_;

--- a/client/scene/ChannelChange.cpp
+++ b/client/scene/ChannelChange.cpp
@@ -17,7 +17,8 @@ ChannelChange::ChannelChange(unsigned char channel, const ManagerAccessorPtr& ma
     account_manager_(manager_accessor->account_manager().lock()),
     config_manager_(manager_accessor->config_manager().lock()),
     player_manager_(manager_accessor->player_manager().lock()),
-	channel_(channel)
+	channel_(channel),
+	fade_counter_(0)
 {
 
 }
@@ -28,18 +29,7 @@ ChannelChange::~ChannelChange()
 
 void ChannelChange::Begin()
 {
-	// 古いステージを削除
-	player_manager_->ResetStage();
-	manager_accessor_->set_world_manager(WorldManagerPtr());
 
-	ResourceManager::ClearModelHandle2();
-
-	command_manager_->Write(network::ServerUpdateAccountProperty(CHANNEL, network::Utils::Serialize(channel_)));
-
-	auto channel_ptr = command_manager_->channels().at(channel_);
-	StagePtr stage = std::make_shared<Stage>(channel_ptr,manager_accessor_->config_manager().lock());
-	world_manager_ = std::make_shared<WorldManager>(stage, manager_accessor_);
-    manager_accessor_->set_world_manager(world_manager_);
 }
 
 void ChannelChange::End()
@@ -48,11 +38,22 @@ void ChannelChange::End()
 
 void ChannelChange::Update()
 {
-	//if(world_manager_->stage()->host_change_flag())
-	//{
-		//account_manager_->set_host(world_manager_->stage()->host_change_flag().second);
+	if (fade_counter_ < 120) {
+		fade_counter_++;
+	} else {
+		// 古いステージを削除
+		player_manager_->ResetStage();
+		manager_accessor_->set_world_manager(WorldManagerPtr());
+
+		command_manager_->Write(network::ServerUpdateAccountProperty(CHANNEL, network::Utils::Serialize(channel_)));
+
+		auto channel_ptr = command_manager_->channels().at(channel_);
+		StagePtr stage = std::make_shared<Stage>(channel_ptr,manager_accessor_->config_manager().lock());
+		world_manager_ = std::make_shared<WorldManager>(stage, manager_accessor_);
+		manager_accessor_->set_world_manager(world_manager_);
+
 		next_scene_ = std::make_shared<scene::MainLoop>(manager_accessor_);
-	//}
+	}
 }
 
 void ChannelChange::ProcessInput(InputManager* input)
@@ -62,6 +63,13 @@ void ChannelChange::ProcessInput(InputManager* input)
 
 void ChannelChange::Draw()
 {
+	if (fade_counter_ < 120) {
+		SetDrawBlendMode(DX_BLENDMODE_ALPHA, 255 * fade_counter_ / 120);
+		int width, height;
+		GetScreenState(&width, &height, nullptr);
+		DrawBox(0, 0, width, height, GetColor(0, 0, 0), TRUE);
+		SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
+	}
 }
 
 }
\ No newline at end of file

--- a/client/scene/ChannelChange.hpp
+++ b/client/scene/ChannelChange.hpp
@@ -31,6 +31,7 @@ class ChannelChange : public Base{
 		PlayerManagerPtr player_manager_;
 
 		unsigned char channel_;
+		int fade_counter_;
 };
 
 }
\ No newline at end of file

--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -36,7 +36,8 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
       inputbox_(std::make_shared<InputBox>(manager_accessor_)),
 	  minimap_(std::make_shared<MiniMap>(manager_accessor)),
 	  snapshot_number_(0),
-	  snapshot_(false)
+	  snapshot_(false),
+	  fade_counter_(0)
 {
     manager_accessor_->set_window_manager(window_manager_);
 
@@ -55,6 +56,7 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
     world_manager_->myself()->Init(unicode::ToTString(account_manager_->model_name()));
 
 	socket_server_manager_->Start();
+
 }
 
 MainLoop::~MainLoop()
@@ -79,6 +81,15 @@ void MainLoop::Update()
     world_manager_->Update();
 	ResourceManager::music()->Update();
 
+	static int cleanup_counter = 0;
+	if (cleanup_counter % (60 * 30) == 0) {
+		ResourceManager::ClearModelHandle();
+	}
+	cleanup_counter++;
+
+	if (fade_counter_ < 120) {
+		fade_counter_++;
+	}
 }
 
 void MainLoop::ProcessInput(InputManager* input)
@@ -187,9 +198,18 @@ void MainLoop::Draw()
 		SetDrawBlendMode(DX_BLENDMODE_MUL, 120);
 		DrawBox(0,0,config_manager_->screen_width(),config_manager_->screen_height(),GetColor(0,0,0),1);
 		SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-		auto str = unicode::ToTString("サーバーとの接続が切断されました");
+		auto str = unicode::ToTString(_T("サーバーとの接続が切断されました"));
 		auto width = GetDrawStringWidthToHandle(str.c_str(),str.length(),ResourceManager::default_font_handle());
 		DrawStringToHandle(config_manager_->screen_width()/2.0f - width,config_manager_->screen_height()/2.0f - ResourceManager::default_font_size(),str.c_str(),GetColor(255,255,255),ResourceManager::default_font_handle());
+		SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
+	}
+
+	if (fade_counter_ < 120) {
+		SetDrawBlendMode(DX_BLENDMODE_ALPHA, 255 * (120 - fade_counter_) / 120);
+		int width, height;
+		GetScreenState(&width, &height, nullptr);
+		DrawBox(0, 0, width, height, GetColor(0, 0, 0), TRUE);
+		SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
 	}
 }
 

--- a/client/scene/MainLoop.hpp
+++ b/client/scene/MainLoop.hpp
@@ -45,6 +45,7 @@ class MainLoop : public Base {
 		int snapshot_number_;
 		bool snapshot_;
 
+		int fade_counter_;
 		//SocketServer socket_server_;
 };