Commit: 4a64760e680a7918feb59e688c818f02492d101e - main (git)

Commit MetaInfo

• Revisión: 4a64760e680a7918feb59e688c818f02492d101e (tree)
• Tiempo: 2012-09-11 14:46:07
• Autor: angeart <angeart@git....>
• Commiter: angeart

Log Message

GenerateJSONの追加
エッジのコンフィグ追加

Cambiar Resumen

• modified: client/3d/FieldPlayer.cpp
• modified: client/ConfigManager.cpp
• modified: client/ConfigManager.hpp
• add: client/GenerateJSON.cpp
• add: client/GenerateJSON.hpp
• modified: client/ResourceManager.cpp
• modified: client/ResourceManager.hpp
• modified: client/scene/Init.cpp

Diferencia incremental

--- a/client/3d/FieldPlayer.cpp
+++ b/client/3d/FieldPlayer.cpp
@@ -103,6 +103,7 @@ void FieldPlayer::LoadModel(const tstring& name)
 	} else {
 		SetModel(ResourceManager::LoadModelFromName(name));
 	}
+	ResourceManager::SetModelEdgeSize(model_handle_.handle());
 }
 
 void FieldPlayer::SetModel(const ModelHandle& model)

--- a/client/ConfigManager.cpp
+++ b/client/ConfigManager.cpp
@@ -28,6 +28,7 @@ void ConfigManager::Load(const std::string& filename)
     max_local_storage_size_ = pt.get<int>("max_local_storage_size", 512000);
     upnp_ = pt.get<bool>("upnp", false);
     udp_port_ = pt.get<uint16_t>("udp_port", 39391);
+	model_edge_size_ = pt.get<float>("edge_size",1.0f);
 
 }
 
@@ -98,3 +99,8 @@ bool  ConfigManager::shader_depth_field() const
 {
 	return shader_depth_field_;
 }
+
+float ConfigManager::model_edge_size() const
+{
+	return model_edge_size_;
+}
\ No newline at end of file

--- a/client/ConfigManager.hpp
+++ b/client/ConfigManager.hpp
@@ -33,6 +33,8 @@ class ConfigManager
 		bool shader_shadow_;
 		bool shader_depth_field_;
 
+		float model_edge_size_;
+
     public:
         bool fullscreen() const;
         int screen_width() const;
@@ -50,6 +52,8 @@ class ConfigManager
 		bool shader_shadow() const;
 		bool shader_depth_field() const;
 
+		float model_edge_size() const;
+
     private:
         ManagerAccessorPtr manager_accessor_;
 };

--- /dev/null
+++ b/client/GenerateJSON.cpp
@@ -0,0 +1,360 @@
+#include "GenerateJSON.hpp"
+
+namespace
+{
+	int ADFUNC_DXconvAnsiToWide(int destsize, WCHAR* wstrDest, const CHAR* strSrc )
+	{
+		// 引数の*がNULLの場合はエラー
+		if( strSrc==NULL )
+			return 0;
+		int ct = strlen(strSrc) + 1;
+		if( wstrDest == NULL )
+			return MultiByteToWideChar( CP_ACP, 0, strSrc, ct, NULL, 0 );
+		int nResult = MultiByteToWideChar( CP_ACP, 0, strSrc, ct, wstrDest, destsize );
+		wstrDest[destsize-1] = 0;
+
+		if( nResult == 0 )
+			return 0;
+		return nResult;
+	}
+
+	TCHAR* _ftot_s( TCHAR* pString, size_t Size, float Value, int FracDigits )
+	{
+		if( pString == NULL )
+			goto _error;
+		TCHAR* pSource = pString;
+		if( *(long*)&Value < 0 )
+		{
+			if( (size_t)( pString - pSource ) >= Size )
+				goto _error;
+			*pString++ = '-';
+			*(long*)&Value ^= 0x80000000;
+		}
+		TCHAR* pBegin  = pString;
+		int   Integer = (int)Value;
+		for( int i = 10; i <= Integer; i *= 10, pString++ );
+		if( (size_t)( pString - pSource ) >= Size )
+			goto _error;
+		TCHAR* pCode = pString++;
+		*pCode-- = '0' + (char)( Integer % 10 );
+		for( int i = Integer / 10; i != 0; i /= 10 )
+			*pCode-- = '0' + (char)( i % 10 );
+		if( FracDigits > 0 )
+		{
+			if( (size_t)( pString - pSource ) >= Size )
+				goto _error;
+			*pString++ = '.';
+			while( FracDigits-- > 1 )
+			{
+				Value -= Integer;
+				Integer = (int)( Value *= 10.0f );
+				if( (size_t)( pString - pSource ) >= Size )
+					goto _error;
+				*pString++ = '0' + (char)Integer;
+			}
+			Integer = (int)( ( Value - Integer ) * 10.0f + 0.5f );
+			if( Integer < 10 )
+			{
+				if( (size_t)( pString - pSource ) >= Size )
+					goto _error;
+				*pString++ = '0' + (char)Integer;
+			}
+			else
+			{
+				pCode = pString - 1;
+				if( (size_t)( pString - pSource ) >= Size )
+					goto _error;
+				*pString++ = '0';
+				do
+				{
+					if( *pCode == '.' )
+						pCode--;
+					if( *pCode != '9' )
+					{
+						*pCode += 1;
+						break;
+					}
+					else
+						*pCode = '0';
+					if( pCode == pBegin )
+					{
+						if( (size_t)( pString - pSource ) >= Size )
+							goto _error;
+						TCHAR* pEnd = pString++;
+						while( pEnd-- != pCode )
+							*( pEnd + 1 ) = *pEnd;
+						*pCode = '1';
+					}
+				} while( *pCode-- == '0' );
+			}
+		}
+		if( (size_t)( pString - pSource ) >= Size )
+			goto _error;
+		*pString = '\0';
+		return pSource;
+_error:
+		__debugbreak();
+		return NULL;
+	}
+
+	BOOL DeleteDirectory( LPCTSTR lpPathName )
+	{
+		// 入力値チェック
+		if( NULL == lpPathName )
+		{
+			return FALSE;
+		}
+
+		// ディレクトリ名の保存（終端に'\'がないなら付ける）
+		TCHAR szDirectoryPathName[_MAX_PATH];
+		_tcsncpy_s( szDirectoryPathName, _MAX_PATH, lpPathName, _TRUNCATE );
+		if( '\\' != szDirectoryPathName[_tcslen(szDirectoryPathName) - 1] )
+		{	// 一番最後に'\'がないなら付加する。
+			_tcsncat_s( szDirectoryPathName, _MAX_PATH, _T("\\"), _TRUNCATE );
+		}
+
+		// ディレクトリ内のファイル走査用のファイル名作成
+		TCHAR szFindFilePathName[_MAX_PATH];
+		_tcsncpy_s( szFindFilePathName, _MAX_PATH, szDirectoryPathName, _TRUNCATE );
+		_tcsncat_s( szFindFilePathName, _MAX_PATH, _T("*"), _TRUNCATE );
+
+		// ディレクトリ内のファイル走査開始
+		WIN32_FIND_DATA		fd;
+		HANDLE hFind = FindFirstFile( szFindFilePathName, &fd );
+		if( INVALID_HANDLE_VALUE == hFind )
+		{	// 走査対象フォルダが存在しない。
+			return FALSE;
+		}
+
+		do
+		{
+			//if( '.' != fd.cFileName[0] )
+			if( 0 != _tcscmp( fd.cFileName, _T(".") )		// カレントフォルダ「.」と
+				&& 0 != _tcscmp( fd.cFileName, _T("..") ) )	// 親フォルダ「..」は、処理をスキップ
+			{
+				TCHAR szFoundFilePathName[_MAX_PATH];
+				_tcsncpy_s( szFoundFilePathName, _MAX_PATH, szDirectoryPathName, _TRUNCATE );
+				_tcsncat_s( szFoundFilePathName, _MAX_PATH, fd.cFileName, _TRUNCATE );
+
+				if( FILE_ATTRIBUTE_DIRECTORY & fd.dwFileAttributes )
+				{	// ディレクトリなら再起呼び出しで削除
+					if( !DeleteDirectory( szFoundFilePathName ) )
+					{
+						FindClose( hFind );
+						return FALSE;
+					}
+				}
+				else
+				{	// ファイルならWin32API関数を用いて削除
+					if( !DeleteFile( szFoundFilePathName ) )
+					{
+						FindClose( hFind );
+						return FALSE;
+					}
+				}
+			}
+		} while( FindNextFile( hFind, &fd ) );
+
+		FindClose( hFind );
+
+		return RemoveDirectory( lpPathName );
+	}
+
+};
+
+JsonGen::JsonGen()
+{
+	HANDLE hFind,hPmdFind,hTxtFind;							// Directory Pmd Text
+	WIN32_FIND_DATA win32fd_dir,win32fd_pmd,win32fd_txt;	// Directory Pmd Text
+	TCHAR tcsTmpPath[MAX_PATH] = {0};
+	TCHAR tcsTmpPath_Pmd[MAX_PATH] = {0};
+	TCHAR tcsTmpDir[MAX_PATH] = {0};
+
+	std::vector<std::wstring> pmd_paths;
+	std::wstring prejson;
+	DxLib::VECTOR prePos = {0},curPos = {0},lclPos = {0};
+	DxLib::MATRIX chglcl = {0};
+
+	char pmd_model_name_[256] = {0};
+	char pmd_author_name_[256] = {0};
+
+	int exist_num_pmd_ = 0;
+
+	int model_handle_ = 0;
+
+	FILE *json_file = 0;
+
+	// resources/models/内検索　列挙
+	hFind = FindFirstFile(_T("\\resources\\models\\?*"), &win32fd_dir);
+
+	if (hFind == INVALID_HANDLE_VALUE) {
+		return;
+	}
+
+	do {
+		if (win32fd_dir.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY &&
+			_tcscmp(win32fd_dir.cFileName,_T("."))!=0 &&
+			_tcscmp(win32fd_dir.cFileName,_T(".."))!=0 &&
+			_tcscmp(win32fd_dir.cFileName,_T(".svn"))!=0) {
+			_tcscpy_s(tcsTmpDir,_T("\\resources\\models\\"));
+			_tcscat_s(tcsTmpDir,win32fd_dir.cFileName);
+			_tcscat_s(tcsTmpDir,_T("\\"));
+
+			ZeroMemory(tcsTmpPath,MAX_PATH);
+			_tcscpy_s(tcsTmpPath,tcsTmpDir);
+			_tcscat_s(tcsTmpPath,_T("info.json"));
+
+			// info.jsonが存在しない場合、pmdに従って作成
+			if(!PathFileExists(tcsTmpPath))
+			{
+				ZeroMemory(tcsTmpPath_Pmd,MAX_PATH);
+				_tcscpy_s(tcsTmpPath_Pmd,tcsTmpDir);
+				_tcscat_s(tcsTmpPath_Pmd,_T("*.pmd"));
+				hPmdFind = FindFirstFile(tcsTmpPath_Pmd, &win32fd_pmd);
+				if(hPmdFind < 0)
+				{
+					FindClose(hPmdFind);
+					continue;
+				}
+
+				TCHAR cur_dir[MAX_PATH];
+				ZeroMemory(cur_dir,MAX_PATH);
+				GetCurrentDirectory(MAX_PATH,cur_dir);
+				bool flag = false;
+				for(int k = MAX_PATH - 1;k != 0;--k)
+				{
+					if( cur_dir[k] == _T('\\') )
+					{
+						cur_dir[k] = 0;
+						break;
+					}
+				}
+				do {
+					std::wstring tmp_path = cur_dir;
+					tmp_path += _T("\\resources\\models\\");
+					tmp_path += win32fd_dir.cFileName;
+					tmp_path += _T("\\");
+					tmp_path += win32fd_pmd.cFileName;
+					pmd_paths.push_back(tmp_path);
+				} while (FindNextFile(hPmdFind, &win32fd_pmd));
+				FindClose(hPmdFind);
+
+				for(int i = 0;i < pmd_paths.size();++i){
+					char pmd_info[PMDINFO_SIZE+1];
+					int fd = _topen(pmd_paths[i].c_str(),O_RDONLY);
+					read(fd,pmd_info,PMDINFO_SIZE);
+					close(fd);
+
+					// モデル名取得
+					strcpy_s(pmd_model_name_,pmd_info+7);
+
+					int cnt = 7 + strlen(pmd_info+7);
+					while(cnt < PMDINFO_SIZE){
+						if(!strncmp("モデリング",pmd_info+cnt,10))break;
+						else	++cnt;
+					}
+					if(cnt == PMDINFO_SIZE)
+					{
+						strcpy_s(pmd_author_name_,"Unknown");
+					}else{
+						for(cnt;cnt<PMDINFO_SIZE && (*(pmd_info+cnt) != 0x46 && *(pmd_info+cnt-1) != 0x81);++cnt);
+						int tmp_str_cnt = 1;
+						for(tmp_str_cnt;cnt+tmp_str_cnt<PMDINFO_SIZE && (*(pmd_info+cnt+tmp_str_cnt) != 0x0a && *(pmd_info+cnt+tmp_str_cnt) != 0x20);++tmp_str_cnt);
+						// 作者取得
+						strncpy_s(pmd_author_name_,pmd_info+cnt+1,tmp_str_cnt-1);
+					}
+
+					TCHAR tmp_mv1_path[MAX_PATH] = {0};
+					_tcscpy_s(tmp_mv1_path,pmd_paths[i].c_str());
+
+					model_handle_ = MV1LoadModel( tmp_mv1_path );
+					int tex_num = MV1GetTextureNum( model_handle_ );
+					int frame_num = MV1GetFrameNum( model_handle_ );
+
+
+					// ボーンに基づいたモデルの高さ設定
+					for(int j = 0;j < frame_num;++j)
+					{
+						curPos = MV1GetFramePosition( model_handle_, j );
+						chglcl = MV1GetFrameLocalMatrix( model_handle_, j );
+						lclPos.x = chglcl.m[3][0];
+						lclPos.y = chglcl.m[3][1];
+						lclPos.z = chglcl.m[3][2];
+
+						if(	prePos.y < curPos.y &&
+							lclPos.x == curPos.x &&
+							lclPos.y == curPos.y &&
+							lclPos.z == curPos.z)prePos = curPos;
+					}
+
+					// JSONの構築
+					prejson = _T("{\n\t\"name\": \"char:");
+					size_t tmp_w_s_m = ADFUNC_DXconvAnsiToWide(0,0,pmd_model_name_);
+					TCHAR *tmp_w_m = new TCHAR[tmp_w_s_m + 1];
+					ADFUNC_DXconvAnsiToWide(tmp_w_s_m,tmp_w_m,pmd_model_name_);
+					prejson += tmp_w_m;
+					prejson += _T(":");
+					size_t tmp_w_s_a = ADFUNC_DXconvAnsiToWide(0,0,pmd_author_name_);
+					TCHAR *tmp_w_a = new TCHAR[tmp_w_s_a + 1];
+					ADFUNC_DXconvAnsiToWide(tmp_w_s_a,tmp_w_a,pmd_author_name_);
+					prejson += tmp_w_a;
+					prejson += _T("式\",\n\t\"character\":\n\t\t{\n\t\t\t\"height\":");
+					TCHAR tmp_f[32];
+					_ftot_s(tmp_f,32,floor(prePos.y*2)/10.0f,2);
+					prejson += tmp_f;
+					prejson += _T(",\n\t\t\t\"motions\":\n\t\t\t\t{\n\t\t\t\t\t\"stand\":\"basic_stand.vmd\",\n\t\t\t\t\t\"walk\": \t\"basic_walk.vmd\",\n\t\t\t\t\t\"run\":\t\"basic_run.vmd\"\n\t\t\t\t}\n\t\t}\n}");
+					TCHAR tmp_dir[MAX_PATH];
+					_tcscpy_s(tmp_dir,_T("\\resources\\models\\"));
+					_tcscat_s(tmp_dir,tmp_w_a);
+					_tcscat_s(tmp_dir,_T("式"));
+					_tcscat_s(tmp_dir,tmp_w_m);
+					_tcscat_s(tmp_dir,_T("\\"));
+					_wmkdir(tmp_dir);
+					delete [] tmp_w_m;
+					delete [] tmp_w_a;
+					TCHAR json_path[MAX_PATH];
+					_tcscpy_s(json_path,tmp_dir);
+					_tcscat_s(json_path,_T("info.json"));
+					_tfopen_s(&json_file,json_path, _T("w, ccs=UTF-8"));
+					fseek(json_file, 0, SEEK_SET);
+					_ftprintf_s(json_file,prejson.c_str());
+					fclose(json_file);
+					TCHAR tmp_src[MAX_PATH];
+					TCHAR tmp_cpy[MAX_PATH];
+
+					// テクスチャのコピー
+					for(int t = 0;t < tex_num;++t)
+					{
+						_tcscpy_s(tmp_src,tcsTmpDir);
+						_tcscat_s(tmp_src,MV1GetTextureName( model_handle_, t));
+						_tcscpy_s(tmp_cpy,tmp_dir);
+						_tcscat_s(tmp_cpy,MV1GetTextureName( model_handle_, t));
+						CopyFile(tmp_src,tmp_cpy,TRUE);
+					}
+					TCHAR tmp_txt_f[MAX_PATH];
+					_tcscpy_s(tmp_txt_f,tcsTmpDir);
+					_tcscat_s(tmp_txt_f,_T("*.txt"));
+					hTxtFind = FindFirstFile(tmp_txt_f,&win32fd_txt);
+					do{
+						_tcscpy_s(tmp_src,tcsTmpDir);
+						_tcscat_s(tmp_src,win32fd_txt.cFileName);
+						_tcscpy_s(tmp_cpy,tmp_dir);
+						_tcscat_s(tmp_cpy,win32fd_txt.cFileName);
+						CopyFile(tmp_src,tmp_cpy,TRUE);
+					}while(FindNextFile(hTxtFind, &win32fd_txt));
+					FindClose(hTxtFind);
+					TCHAR tmp_type[128] = {0};
+					_tsplitpath(pmd_paths[i].c_str(),NULL,NULL,tmp_cpy,tmp_type);
+					_tcscat_s(tmp_cpy,tmp_type);
+					_tcscpy_s(tmp_type,tmp_dir);
+					_tcscat_s(tmp_type,tmp_cpy);
+					CopyFile(pmd_paths[i].c_str(),tmp_type,TRUE);
+				}
+
+				DeleteDirectory(tcsTmpDir);
+			}
+		}
+	} while (FindNextFile(hFind, &win32fd_dir));
+
+	FindClose(hFind);
+}
\ No newline at end of file

--- /dev/null
+++ b/client/GenerateJSON.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <io.h>
+#include <fcntl.h>
+#include <vector>
+#include <string>
+#include <math.h>
+#include <Windows.h>
+#include <shlwapi.h>
+#include <DxLib.h>
+
+#pragma comment(lib, "shlwapi.lib")
+
+#define PMDINFO_SIZE 0x11A
+
+class JsonGen
+{
+public:
+	JsonGen();
+	virtual ~JsonGen(){};
+};
\ No newline at end of file

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

--- a/client/ResourceManager.hpp
+++ b/client/ResourceManager.hpp
@@ -79,6 +79,8 @@ class ResourceManager {
         static void RequestModelFromName(const tstring&);
         static bool IsCachedModelName(const tstring&);
 		static const std::vector<std::string>& GetModelNameList();
+		static void SetModelEdgeSize(int handle);
+		static void set_model_edge_size(float edge_size);
 
 	private:
 		static tstring NameToFullPath(const tstring& name);
@@ -92,7 +94,7 @@ class ResourceManager {
         static std::unordered_map<tstring, tstring> model_names_;
         static std::unordered_map<tstring, ModelHandle> model_handles_;
 		static std::vector<std::string> model_name_list_;
-
+		static float model_edge_size_;
 };
 
 class ImageHandle {

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