コミット: 95a8511feba3e80744c5c2d344ba4ee1b6c19f31 - main (git)

コミットメタ情報

• リビジョン: 95a8511feba3e80744c5c2d344ba4ee1b6c19f31 (tree)
• 日時: 2012-09-22 16:21:19
• 作者: h2so5 <h2so5@git....>
• コミッター: h2so5

ログメッセージ

Merge branch 'master' of git.sourceforge.jp:/gitroot/mmo/main

Conflicts:
client/Card.hpp
client/ResourceManager.cpp

変更サマリ

• modified: client/Card.cpp
• modified: client/Card.hpp
• modified: client/GenerateJSON.cpp
• modified: client/MiniMap.cpp
• add: client/Music.cpp
• add: client/Music.hpp
• modified: client/PlayerManager.cpp
• modified: client/ResourceManager.cpp
• modified: client/ResourceManager.hpp
• add: client/bin/cards/bgmlist/main.js
• modified: client/scene/Init.cpp
• modified: client/scene/MainLoop.cpp
• modified: client/version.hpp

差分

--- a/client/Card.cpp
+++ b/client/Card.cpp
@@ -21,6 +21,8 @@
 #include "../common/database/AccountProperty.hpp"
 #include "Profiler.hpp"
 #include "GenerateJSON.hpp"
+#include "Music.hpp"
+
 
 char Card::STORAGE_DIR[] = "storage";
 char Card::SCRIPT_PATH[] = "resources/js";
@@ -78,6 +80,7 @@ Card::Card(
         context->Global()->Set(String::New("Player"),  script_object->Clone());
         context->Global()->Set(String::New("Model"),  script_object->Clone());
         context->Global()->Set(String::New("Account"), script_object->Clone());
+        context->Global()->Set(String::New("Music"),  script_object->Clone());
         context->Global()->Set(String::New("InputBox"),   script_object->Clone());
         context->Global()->Set(String::New("Card"),    script_object->Clone());
         context->Global()->Set(String::New("Screen"),  script_object->Clone());
@@ -222,6 +225,78 @@ Handle<Value> Card::Function_Player_stopMotion(const Arguments& args)
     return Undefined();
 }
 
+Handle<Value> Card::Function_Music_playBGM(const Arguments& args)
+{
+
+	if (args.Length() >= 2 && args[0]->IsString()) {
+		auto name = std::string(*String::Utf8Value(args[0]->ToString()));
+		auto fade = args[1]->ToBoolean()->BooleanValue();
+		ResourceManager::music()->Play(unicode::ToTString(name),fade);
+	}
+
+    return Undefined();
+}
+
+Handle<Value> Card::Function_Music_stopBGM(const Arguments& args)
+{
+
+	if (args.Length() == 1 && args[0]->IsBoolean()) {
+		auto fade = args[1]->ToBoolean()->BooleanValue();
+		ResourceManager::music()->Stop(fade);
+	}else if(args.Length() == 0) {
+		ResourceManager::music()->Stop(false);
+	}
+
+    return Undefined();
+}
+
+Handle<Value> Card::Function_Music_playME(const Arguments& args)
+{
+
+	if (args.Length() == 1 && args[0]->IsString()) {
+		auto name = std::string(*String::Utf8Value(args[0]->ToString()));
+		ResourceManager::music()->PlayME(unicode::ToTString(name));
+	}
+
+    return Undefined();
+}
+
+
+Handle<Value> Card::Function_Music_playSE(const Arguments& args)
+{
+
+	if (args.Length() == 1 && args[0]->IsString()) {
+		auto name = std::string(*String::Utf8Value(args[0]->ToString()));
+		ResourceManager::music()->PlaySE(unicode::ToTString(name));
+	}
+
+    return Undefined();
+}
+
+Handle<Value> Card::Function_Music_all(const Arguments& args)
+{
+    HandleScope handle;
+    auto array = Array::New();
+
+    int i = 0;
+	BOOST_FOREACH(const boost::filesystem::path& music_path, ResourceManager::music()->GetMusicList()) {
+		array->Set(i, String::New(music_path.stem().string().c_str()));
+        i++;
+    }
+    return array;
+}
+
+
+Handle<Value> Card::Function_Music_IsLoadingDone(const Arguments& args)
+{
+	if (args.Length() == 1 && args[0]->IsString()) {
+	auto name = std::string(*String::Utf8Value(args[0]->ToString()));
+	auto check = ResourceManager::music()->CheckLoadedBGM(unicode::ToTString(name));
+	return Boolean::New(check);
+	}
+	return Boolean::New(false);
+}
+
 Handle<Value> Card::Function_Account_id(const Arguments& args)
 {
     auto self = static_cast<Card*>(args.Holder()->GetPointerFromInternalField(0));
@@ -284,6 +359,7 @@ Handle<Value> Card::Function_Account_updateModelName(const Arguments& args)
         auto name = std::string(*String::Utf8Value(args[0]->ToString()));
         if (auto world_manager = self->manager_accessor_->world_manager().lock()) {
             world_manager->myself()->LoadModel(unicode::ToTString(name));
+			world_manager->myself()->ResetMotion();
         }
         auto account_manager = self->manager_accessor_->account_manager().lock();
         auto command_manager = self->manager_accessor_->command_manager().lock();
@@ -683,7 +759,62 @@ void Card::SetFunctions()
      * @static
      */
     script_.SetFunction("Player.stopMotion", Function_Player_stopMotion);
+
+    /**
+     * 音楽を再生します
+     *
+     * @method playMotion
+     * @param {String} name BGM名
+     * @static
+     */
+    script_.SetFunction("Music.play", Function_Music_playBGM);
+
     /**
+     * 音楽を停止します
+     *
+     * @method playMotion
+     * @param
+     * @static
+     */
+    script_.SetFunction("Music.stop", Function_Music_stopBGM);
+
+    /**
+     * MEを再生します
+     *
+     * @method playMotion
+     * @param {String} name ME名
+     * @static
+     */
+    script_.SetFunction("Music.playME", Function_Music_playME);
+
+	/**
+     * SEを再生します
+     *
+     * @method playMotion
+     * @param {String} name SE名
+     * @static
+     */
+    script_.SetFunction("Music.playSE", Function_Music_playSE);
+
+    /**
+     * BGM,MEのロードが終了しているかチェックします
+     *
+     * @method playMotion
+     * @param {String} name BGM、ME名
+     * @static
+     */
+    script_.SetFunction("Music.loadCheck", Function_Music_IsLoadingDone);
+
+    /**
+     * BGMのリストを返します
+     *
+     * @method playMotion
+     * @param
+     * @static
+     */
+    script_.SetFunction("Music.all", Function_Music_all);
+
+	/**
      * アカウント
      *
      * @class Account

Binary files a/client/Card.hpp and b/client/Card.hpp differ

--- a/client/GenerateJSON.cpp
+++ b/client/GenerateJSON.cpp
@@ -175,8 +175,8 @@ JsonGen::JsonGen()
 	DxLib::VECTOR prePos = {0},curPos = {0},lclPos = {0};
 	DxLib::MATRIX chglcl = {0};
 
-	char pmd_model_name_[256] = {0};
-	TCHAR pmd_author_name_[256] = {0};
+	char pmd_model_name_[MAX_PATH] = {0};
+	TCHAR pmd_author_name_[MAX_PATH] = {0};
 
 	int exist_num_pmd_ = 0;
 

--- a/client/MiniMap.cpp
+++ b/client/MiniMap.cpp
@@ -196,7 +196,7 @@ void MiniMap::DrawPosAndCalc()
 		if(tmp_pos_x < absolute_x() + 12)tmp_pos_x = absolute_x() + 12;
 		if(tmp_pos_x > absolute_x() + absolute_width() - 12)tmp_pos_x = absolute_x() + absolute_width() - 12;
 		if(tmp_pos_z < absolute_y() + 12)tmp_pos_z = absolute_y() + 12;
-		if(tmp_pos_z > absolute_y() + absolute_height() -12)tmp_pos_z = absolute_y() + absolute_height() - 12;
+		if(tmp_pos_z > absolute_y() + absolute_height() -12 - 16)tmp_pos_z = absolute_y() + absolute_height() - 12 - 16;
 		DrawCircle( tmp_pos_x, tmp_pos_z, 2, GetColor(23,162,175),TRUE);
 	}
 	prev_myself_pos_on_map_ = player_manager->char_data_providers()[player_manager->charmgr()->my_character_id()]->position();

--- /dev/null
+++ b/client/Music.cpp
@@ -0,0 +1,202 @@
+//
+// Music.cpp
+//
+
+#include <boost/filesystem.hpp>
+#include "Music.hpp"
+#include "../common/Logger.hpp"
+#include "../common/unicode.hpp"
+
+extern int LoadFile(const TCHAR *FilePath, void **FileImageAddr, int *FileSize);
+
+Music::Music() :
+bgm_handle_(),
+se_handle_(),
+prev_bgm_(-1),
+present_bgm_(-1),
+requested_bgm_(-1),
+music_paths_(),
+crossfade_now_(false),
+fade_count_(0)
+{
+}
+
+void Music::Init()
+{
+    using namespace boost::filesystem;
+    using namespace std;
+
+	music_paths_.clear();
+
+	path p("./resources/music");
+
+	try{
+		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 music_path = it_dir->path();
+					auto extension = music_path.extension().string();
+					if(	extension == ".wave" || extension == ".wav" ||
+						extension == ".ogg"  || extension == ".mp3")
+					{
+						music_paths_.push_back(music_path);
+					}
+				}
+			}
+		}
+	} catch (const filesystem_error& ex) {
+		Logger::Error(_T("%s"), unicode::ToTString(ex.what()));
+	}
+
+	se_paths_.clear();
+
+	p = "./resources/se";
+
+	try{
+		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 music_path = it_dir->path();
+					auto extension = music_path.extension().string();
+					if(	extension == ".wave" || extension == ".wav" ||
+						extension == ".ogg"  || extension == ".mp3")
+					{
+						se_paths_.push_back(music_path);
+					}
+				}
+			}
+		}
+	} catch (const filesystem_error& ex) {
+		Logger::Error(_T("%s"), unicode::ToTString(ex.what()));
+	}
+
+}
+
+void Music::Play(tstring name,bool crossfade)
+{
+	if(bgm_handle_.find(name) == bgm_handle_.end())
+	{
+		SetUseASyncLoadFlag(FALSE);
+		auto NameFind = [&](boost::filesystem::path& src)->bool
+		{
+			return src.stem().string() == unicode::ToString(name);
+		};
+		auto bgm_it_ = std::find_if(music_paths_.begin(),music_paths_.end(),NameFind);
+		void *fileaddr;
+		int filesize;
+		LoadFile(unicode::ToTString(bgm_it_->string()).c_str(),&fileaddr,&filesize);
+		auto softhandle_ = LoadSoftSoundFromMemImage(fileaddr,filesize);
+		auto handle_ = LoadSoundMemByMemImage(fileaddr,filesize);
+		if(handle_ == -1)return;
+		bgm_handle_.insert(std::make_pair<tstring,int>(unicode::ToTString(bgm_it_->stem().string()),handle_));
+		SetUseASyncLoadFlag(TRUE);
+	}
+	if(crossfade)
+	{
+		requested_bgm_ = bgm_handle_[name];
+	}else{
+		if(present_bgm_ != -1)StopSoundMem(present_bgm_);
+		present_bgm_ = bgm_handle_[name];
+		PlaySoundMem(present_bgm_,DX_PLAYTYPE_LOOP);
+	}
+	fade_count_ = 0;
+	crossfade_now_ = crossfade;
+}
+
+void Music::PlayME(tstring name)
+{
+	if(present_bgm_ != -1)prev_bgm_ = present_bgm_;
+	if(bgm_handle_.find(name) == bgm_handle_.end())
+	{
+		SetUseASyncLoadFlag(FALSE);
+		auto NameFind = [&](boost::filesystem::path& src)->bool
+		{
+			return src.stem().string() == unicode::ToString(name);
+		};
+		auto bgm_it_ = std::find_if(music_paths_.begin(),music_paths_.end(),NameFind);
+		void *fileaddr;
+		int filesize;
+		LoadFile(unicode::ToTString(bgm_it_->string()).c_str(),&fileaddr,&filesize);
+		auto softhandle_ = LoadSoftSoundFromMemImage(fileaddr,filesize);
+		auto handle_ = LoadSoundMemByMemImage(fileaddr,filesize);
+		if(handle_ == -1)return;
+		bgm_handle_.insert(std::make_pair<tstring,int>(unicode::ToTString(bgm_it_->stem().string()),handle_));
+		SetUseASyncLoadFlag(TRUE);
+	}
+	if(present_bgm_ != -1)StopSoundMem(present_bgm_);
+	present_bgm_ = bgm_handle_[name];
+	PlaySoundMem(present_bgm_,DX_PLAYTYPE_BACK);
+	crossfade_now_ = false;
+	fade_count_ = 0;
+}
+
+void Music::Stop(bool fadeout)
+{
+	if(!CheckSoundMem(present_bgm_))return;
+	if(!fadeout)
+	{
+		StopSoundMem(present_bgm_);
+	}
+	crossfade_now_ = fadeout;
+	fade_count_ = 0;
+}
+
+void Music::PlaySE(tstring name)
+{
+	if(se_handle_.find(name) == se_handle_.end())
+	{
+		SetUseASyncLoadFlag(FALSE);
+		auto NameFind = [&](boost::filesystem::path& src)->bool
+		{
+			return src.stem().string() == unicode::ToString(name);
+		};
+		auto se_it_ = std::find_if(se_paths_.begin(),se_paths_.end(),NameFind);
+		auto handle_ = LoadSoundMemToBufNumSitei(unicode::ToTString(se_it_->string()).c_str(),64);
+		if(handle_ == -1)return;
+		se_handle_.insert(std::make_pair<tstring,int>(unicode::ToTString(se_it_->stem().string()),handle_));
+	}
+	PlaySoundMem(se_handle_[name],DX_PLAYTYPE_BACK);
+}
+
+bool Music::CheckLoadedBGM(tstring name)
+{
+	if(bgm_handle_.find(name) == bgm_handle_.end())return true;
+	return CheckHandleASyncLoad(bgm_handle_[name]);
+}
+
+void Music::Update()
+{
+	if(prev_bgm_ != -1)
+	{
+		if(!CheckSoundMem(present_bgm_))
+		{
+			present_bgm_ = -1;
+			requested_bgm_ = prev_bgm_;
+			fade_count_ = 0;
+			crossfade_now_ = true;
+		}
+	}
+	if(!crossfade_now_)return;
+	if(CheckHandleASyncLoad(requested_bgm_) == false && requested_bgm_ != -1)
+	{
+		if(fade_count_ == 0)PlaySoundMem(requested_bgm_,DX_PLAYTYPE_LOOP);
+		if(fade_count_ >= 120)
+		{
+			ChangeVolumeSoundMem(100,requested_bgm_);
+			StopSoundMem(present_bgm_);
+			ChangeVolumeSoundMem(100,present_bgm_);
+			present_bgm_ = requested_bgm_;
+			requested_bgm_ = -1;
+			fade_count_ = 0;
+			crossfade_now_ = false;
+		}
+		ChangeVolumeSoundMem((int)(fade_count_/1.2),requested_bgm_);
+		ChangeVolumeSoundMem((int)((120-fade_count_)/1.2),present_bgm_);
+		++fade_count_;
+	}
+}
+
+std::vector<boost::filesystem::path>& Music::GetMusicList()
+{
+	return music_paths_;
+}
\ No newline at end of file

--- /dev/null
+++ b/client/Music.hpp
@@ -0,0 +1,42 @@
+//
+// Music.hpp
+//
+#include "../common/unicode.hpp"
+#include <v8.h>
+#include <map>
+#include <vector>
+
+//解析する信号の長さ(秒)
+#define SIGNAL_LENGTH 0.5
+//スペクトラムの数
+#define SPECTRUM_NUM 256
+//スペクトラムの拡大幅
+#define SPECTRUM_WIDTH 2
+
+
+class Music
+{
+public:
+	Music();
+	virtual ~Music(){};
+	void Init();
+	void Update();
+	void Play(tstring name,bool crossfade);
+	void Stop(bool fadeout);
+	void PlaySE(tstring name);
+	void PlayME(tstring name);
+	bool CheckLoadedBGM(tstring name);
+	std::vector<boost::filesystem::path>& GetMusicList();
+
+private:
+	bool crossfade_now_;
+	int fade_count_;
+	int present_bgm_;
+	int prev_bgm_;
+	int requested_bgm_;
+	std::map<tstring,int> bgm_handle_;
+	std::map<tstring,int> se_handle_;
+
+	std::vector<boost::filesystem::path> music_paths_;
+	std::vector<boost::filesystem::path> se_paths_;
+};

Binary files a/client/PlayerManager.cpp and b/client/PlayerManager.cpp differ

Binary files a/client/ResourceManager.cpp and b/client/ResourceManager.cpp differ

--- a/client/ResourceManager.hpp
+++ b/client/ResourceManager.hpp
@@ -19,9 +19,11 @@ using boost::property_tree::ptree;
 
 class ImageHandle;
 class ModelHandle;
+class Music;
 
 typedef std::shared_ptr<ImageHandle> ImageHandlePtr;
 typedef std::shared_ptr<ModelHandle> ModelHandlePtr;
+typedef std::shared_ptr<Music> MusicPtr;
 
 struct ReadFuncData {
 	ReadFuncData(){};
@@ -86,6 +88,9 @@ class ResourceManager {
 
 		static tstring NameToFullPath(const tstring& name);
 
+		//Musics
+		static MusicPtr& music();
+
     private:
         static int default_font_handle_;
         static std::unordered_map<tstring, ImageHandlePtr> graph_handles_;
@@ -96,6 +101,8 @@ class ResourceManager {
         static std::unordered_map<tstring, ModelHandle> model_handles_;
 		static std::vector<std::string> model_name_list_;
 		static float model_edge_size_;
+		//Musics
+		static MusicPtr music_;
 };
 
 class ImageHandle {

--- /dev/null
+++ b/client/bin/cards/bgmlist/main.js
@@ -0,0 +1,37 @@
+
+/***MetaData***
+
+{
+	"name": "BGMリスト",
+	"icon": "icon.png",
+	"api_version": 1
+}
+
+***MetaData***/
+
+var list;
+list = new UI.List({
+	docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT | UI.DOCKING_BOTTOM
+});
+
+var even_line = false;
+var music_names = Music.all();
+for (var i = 0; i < music_names.length; i++) {
+    (function (music_name) {
+        list.addItem(
+				new UI.Label({
+				    docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT,
+				    text: music_name,
+				    bgcolor: ((even_line = !even_line) ? "#EEAFEECC" : "#FFFFFFCC"),
+				    onclick: function () {
+				        Music.play(music_name,true)
+				    }
+				})
+			);
+    })(music_names[i])
+}
+
+Card.board.width = 240;
+Card.board.height = 120;
+Card.board.docking = UI.DOCKING_BOTTOM | UI.DOCKING_LEFT
+Card.board.addChild(list);
\ No newline at end of file

Binary files a/client/scene/Init.cpp and b/client/scene/Init.cpp differ

--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -10,6 +10,7 @@
 #include "../Core.hpp"
 #include <shlwapi.h>
 #include "ServerChange.hpp"
+#include "../Music.hpp"
 
 namespace scene {
 MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
@@ -54,6 +55,7 @@ void MainLoop::Update()
     card_manager_->Update();
 	minimap_.Update();
     world_manager_->Update();
+	ResourceManager::music()->Update();
 }
 
 void MainLoop::ProcessInput(InputManager* input)

--- a/client/version.hpp
+++ b/client/version.hpp
@@ -9,7 +9,7 @@
 
 #define MMO_VERSION_MAJOR 0
 #define MMO_VERSION_MINOR 3
-#define MMO_VERSION_REVISION 8
+#define MMO_VERSION_REVISION 9
 
 #define MMO_PROTOCOL_VERSION 2