Commit: 3837fca19f2ff272d35ded6bf33430b4173302d4 - main (git)

Commit MetaInfo

• Revisão: 3837fca19f2ff272d35ded6bf33430b4173302d4 (tree)
• Hora: 2012-10-29 00:18:43
• Autor: h2so5 <h2so5@git....>
• Commiter: h2so5

Mensagem de Log

FieldPlayer.hpp, PlayerManager.cpp の文字コードを変更
一部の警告箇所を修正

Mudança Sumário

• modified: client/3d/FieldPlayer.hpp
• modified: client/3d/gameloop.cpp
• modified: client/GenerateJSON.cpp
• modified: client/PlayerManager.cpp
• modified: client/scene/MainLoop.cpp
• modified: client/ui/Input.cpp
• modified: common/network/Encrypter.cpp
• modified: common/network/Signature.cpp

Diff

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

--- a/client/3d/gameloop.cpp
+++ b/client/3d/gameloop.cpp
@@ -266,7 +266,7 @@ void GameLoop::MoveCamera(InputManager* input)
         }
     }
 
-    float pad_rz = input->GetGamepadManagedAnalogRy();
+    float pad_rz = static_cast<float>(input->GetGamepadManagedAnalogRy());
     if (pad_rz > 0) {
         if (camera.radius > CAMERA_MIN_RADIUS) {
             camera.radius -= 0.5f * pad_rz;
@@ -503,9 +503,9 @@ float LightStatus::SolarPosition4(float julius_year)
 
 float LightStatus::SolarAltitude(float latitude,float sidereal_hour,float solar_declination,float right_ascension)
 {
-	long float a = (sidereal_hour - solar_declination) * (DX_PI_F / 180.0L);
-	long float h = sin(TORADIAN(right_ascension)) * sin(TORADIAN(latitude)) + cos(TORADIAN(right_ascension)) * cos(TORADIAN(latitude)) * cos(a);
-	h = asin(h) * 180.0 / DX_PI_F;
+	float a =(sidereal_hour - solar_declination) * (DX_PI_F / 180.0L);
+	float h = sin(TORADIAN(right_ascension)) * sin(TORADIAN(latitude)) + cos(TORADIAN(right_ascension)) * cos(TORADIAN(latitude)) * cos(a);
+	h = static_cast<float>(asin(h) * 180.0 / DX_PI_F);
 	return h;
 }
 
@@ -533,7 +533,7 @@ float LightStatus::SolarApparentAltitude1(float altitude,float distance)
 {
 	auto e = 0.035333333 * sqrt(altitude);
 	auto p = 0.002442818 / distance;
-	return p - e;
+	return static_cast<float>(p - e);
 }
 
 float LightStatus::SolarApparentAltitude2(float altitude,float distance)
@@ -541,7 +541,7 @@ float LightStatus::SolarApparentAltitude2(float altitude,float distance)
 	auto s = 0.266994444 / distance;
 	auto r = 0.585555555;
 	auto k = SolarApparentAltitude1(altitude, distance) - s - r;
-	return k;
+	return static_cast<float>(k);
 }
 
 void LightStatus::SetGrobalAmbientColorMatchToTime()

--- a/client/GenerateJSON.cpp
+++ b/client/GenerateJSON.cpp
@@ -266,7 +266,7 @@ JsonGen::JsonGen()
 				} while (FindNextFile(hPmdFind, &win32fd_pmd));
 				FindClose(hPmdFind);
 
-				for(int i = 0;i < pmd_paths.size();++i){
+				for(unsigned 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);
@@ -275,7 +275,7 @@ JsonGen::JsonGen()
 					// モデル名取得
 					strcpy_s(pmd_model_name_,pmd_info+7);
 					Trim(pmd_model_name_);
-					int cnt = 0x1b;
+					unsigned int cnt = 0x1b;
 					size_t info_size = ADFUNC_DXconvAnsiToWide(0,0,pmd_info+cnt);
 					TCHAR *pmd_info_t = new TCHAR[info_size + 1];
 					ADFUNC_DXconvAnsiToWide(info_size,pmd_info_t,pmd_info+cnt);

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

--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -171,8 +171,8 @@ void MainLoop::Draw()
 
 			if (world_manager_->stage()->IsVisiblePoint(point)) {
 				auto screen_pos = ConvWorldPosToScreenPos(point);
-				int x = (screen_pos.x / 2) * 2;
-				int y = (screen_pos.y / 2) * 2 - 16;
+				int x = static_cast<int>(screen_pos.x / 2) * 2;
+				int y = static_cast<int>(screen_pos.y / 2) * 2 - 16;
 
 				UILabel label_;
 				label_.set_width(160);
@@ -200,7 +200,10 @@ void MainLoop::Draw()
 		SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
 		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());
+		DrawStringToHandle(
+			config_manager_->screen_width() / 2 - width,
+			config_manager_->screen_height() / 2 - ResourceManager::default_font_size(),
+			str.c_str(),GetColor(255,255,255),ResourceManager::default_font_handle());
 		SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
 	}
 

--- a/client/ui/Input.cpp
+++ b/client/ui/Input.cpp
@@ -286,7 +286,7 @@ void Input::Draw()
 								c, text_color, font_handle_);
 							width += GetDrawStringWidthToHandle(c,1,font_handle_);
 						}
-						for(int i = select_start;i < ((select_end > it.size()) ? it.size() : select_end); ++i){
+						for(int i = select_start;i < ((select_end > static_cast<int>(it.size())) ? it.size() : select_end); ++i){
 							c[0] = it[i];
 							SetDrawBlendMode(DX_BLENDMODE_ALPHA, 180);
 							DrawBox(internal_x + width,internal_y + current_line * font_height_,
@@ -296,7 +296,7 @@ void Input::Draw()
 							width += GetDrawStringWidthToHandle(c,1,font_handle_);
 							SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
 						}
-						for(int i = ((select_end > it.size()) ? it.size() : select_end);i < it.size(); ++i){
+						for(int i = ((select_end > static_cast<int>(it.size())) ? it.size() : select_end);i < it.size(); ++i){
 							c[0] = it[i];
 							DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
 								c, text_color, font_handle_);
@@ -335,7 +335,7 @@ void Input::Draw()
 						width += GetDrawStringWidthToHandle(c,1,font_handle_);
 						SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
 					}
-					for(int i = select_end;i < it.size(); ++i){
+					for(unsigned int i = select_end;i < it.size(); ++i){
 						c[0] = it[i];
 						DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
 							c, text_color, font_handle_);
@@ -626,7 +626,7 @@ void Input::ProcessInput(InputManager* input)
 							for(int i = 0;i < line_num; ++i){
 								cnt += lines_[i].size();
 							}
-							for(int i = 0;i < lines_[line_num].size(); ++i){
+							for(unsigned int i = 0;i < lines_[line_num].size(); ++i){
 								auto tmp_x = GetDrawStringWidthToHandle(&lines_[line_num][i],1,font_handle_);
 								if( tmp + tmp_x < offset_x ){
 									tmp += tmp_x;
@@ -637,7 +637,7 @@ void Input::ProcessInput(InputManager* input)
 						}
 					}else{
 						int tmp = 0,cnt = 0;
-						for(int i = 0;i < lines_[0].size(); ++i){
+						for(unsigned int i = 0;i < lines_[0].size(); ++i){
 							auto tmp_x = GetDrawStringWidthToHandle(&lines_[0][i],1,font_handle_);
 							if( tmp + tmp_x < offset_x ){
 								tmp += tmp_x;
@@ -671,7 +671,7 @@ void Input::ProcessInput(InputManager* input)
 							for(int i = 0;i < line_num; ++i,++cnt){
 								cnt += lines_[i].size();
 							}
-							for(int i = 0;i < lines_[line_num].size(); ++i){
+							for(unsigned int i = 0;i < lines_[line_num].size(); ++i){
 								auto tmp_x = GetDrawStringWidthToHandle(&lines_[line_num][i],1,font_handle_);
 								if( tmp + tmp_x < offset_x ){
 									tmp += tmp_x;
@@ -682,7 +682,7 @@ void Input::ProcessInput(InputManager* input)
 						selecting_coursorpoint_ = std::make_pair<int,int>(prev_cursor_pos,cnt);
 					}else{
 						int tmp = 0,cnt = 0;
-						for(int i = 0;i < lines_[0].size(); ++i){
+						for(unsigned int i = 0;i < lines_[0].size(); ++i){
 							auto tmp_x = GetDrawStringWidthToHandle(&lines_[0][i],1,font_handle_);
 							if( tmp + tmp_x < offset_x ){
 								tmp += tmp_x;
@@ -719,7 +719,7 @@ void Input::ProcessInput(InputManager* input)
 						for(int i = 0;i < line_num; ++i){
 							cnt += lines_[i].size();
 						}
-						for(int i = 0;i < lines_[line_num].size(); ++i){
+						for(unsigned int i = 0;i < lines_[line_num].size(); ++i){
 							auto tmp_x = GetDrawStringWidthToHandle(&lines_[line_num][i],1,font_handle_);
 							if( tmp + tmp_x < offset_x ){
 								tmp += tmp_x;
@@ -730,7 +730,7 @@ void Input::ProcessInput(InputManager* input)
 					}
 				}else{
 					int tmp = 0,cnt = 0;
-					for(int i = 0;i < lines_[0].size(); ++i){
+					for(unsigned int i = 0;i < lines_[0].size(); ++i){
 						auto tmp_x = GetDrawStringWidthToHandle(&lines_[0][i],1,font_handle_);
 						if( tmp + tmp_x < offset_x ){
 							tmp += tmp_x;

--- a/common/network/Encrypter.cpp
+++ b/common/network/Encrypter.cpp
@@ -66,7 +66,7 @@ std::string Encrypter::GetPublicKey()
     ByteQueue queue;
     public_key_.Save(queue);
 
-    size_t length = queue.CurrentSize();
+    size_t length = static_cast<size_t>(queue.CurrentSize());
     std::unique_ptr<char[]> outbuf(new char [length]);
     queue.Get((byte*)outbuf.get(), length);
 
@@ -86,7 +86,7 @@ std::string Encrypter::GetPrivateKey()
     ByteQueue queue;
     private_key_.Save(queue);
 
-    size_t length = queue.CurrentSize();
+    size_t length = static_cast<size_t>(queue.CurrentSize());
     std::unique_ptr<char[]> outbuf(new char [length]);
     queue.Get((byte*)outbuf.get(), length);
 

--- a/common/network/Signature.cpp
+++ b/common/network/Signature.cpp
@@ -56,7 +56,7 @@ std::string Signature::GetPublicKey()
     ByteQueue queue;
     public_key_.Save(queue);
 
-    size_t length = queue.CurrentSize();
+    size_t length = static_cast<size_t>(queue.CurrentSize());
     std::unique_ptr<char[]> outbuf(new char [length]);
     queue.Get((byte*)outbuf.get(), length);
 
@@ -76,7 +76,7 @@ std::string Signature::GetPrivateKey()
     ByteQueue queue;
     private_key_.Save(queue);
 
-    size_t length = queue.CurrentSize();
+    size_t length = static_cast<size_t>(queue.CurrentSize());
     std::unique_ptr<char[]> outbuf(new char [length]);
     queue.Get((byte*)outbuf.get(), length);