Commit: 027b16db0a1f5c3744d6720dbf7ef35293f11001 - shomlib (git)

Commit MetaInfo

• Revision: 027b16db0a1f5c3744d6720dbf7ef35293f11001 (tree)
• Time: 2012-11-18 23:44:17
• Author: shom5xg <shom@.(no...>
• Commiter: shom5xg

Log Message

変数名修正

Change Summary

• modified: core/src/core/window.cpp

Incremental Difference

--- a/core/src/core/window.cpp
+++ b/core/src/core/window.cpp
@@ -19,15 +19,15 @@ using namespace window_def;
 
 namespace
 {
-	b32 b_window_close = FALSE;
+	b32 s_bWindowClose = FALSE;
 
-	b32 b_window_active = TRUE;
-	b32 b_message_box_appearing = FALSE;
+	b32 s_bWindowActive = TRUE;
+	b32 s_bMessageBoxAppearing = FALSE;
 
-	u32 client_width  = sc_client_width_init;
-	u32 client_height = sc_client_height_init;
-	u32 window_pos_x  = sc_window_pos_x_init;
-	u32 window_pos_y  = sc_window_pos_y_init;
+	u32 s_uClientWidth  = sc_client_width_init;
+	u32 s_uClientHeight = sc_client_height_init;
+	u32 s_uWindowPosX   = sc_window_pos_x_init;
+	u32 s_uWindowPosY   = sc_window_pos_y_init;
 }
 
 
@@ -67,7 +67,7 @@ HWND	window::InitApp( HINSTANCE hinst, int nCmdShow )
 					sc_sz_wnd_class_name, sc_sz_wnd_name, 
 					~(WS_MAXIMIZEBOX | WS_THICKFRAME) & WS_OVERLAPPEDWINDOW, 
 					//最大化ボタンを持たない・境界変更のできない
-					0, 0, client_width, client_height, 
+					0, 0, s_uClientWidth, s_uClientHeight, 
 					GetDesktopWindow(),
 					NULL, hinst, NULL
 					);
@@ -86,12 +86,12 @@ HWND	window::InitApp( HINSTANCE hinst, int nCmdShow )
 		DEBUG_BREAK();
 		return NULL;
 	}
-	int ww = client_width +
+	int ww = s_uClientWidth +
 			 ((wRect.right - wRect.left) - (cRect.right - cRect.left));
-	int wh = client_height +
+	int wh = s_uClientHeight +
 			 ((wRect.bottom - wRect.top) - (cRect.bottom - cRect.top));
 
-	if( SetWindowPos( h_wnd, HWND_TOP, window_pos_x, window_pos_y,
+	if( SetWindowPos( h_wnd, HWND_TOP, s_uWindowPosX, s_uWindowPosY,
 					  ww, wh, SWP_SHOWWINDOW ) == 0 )
 	{
 		DEBUG_BREAK();
@@ -110,7 +110,7 @@ HWND	window::InitApp( HINSTANCE hinst, int nCmdShow )
 
 int		window::FinApp( HWND h_wnd, HINSTANCE h_inst )
 {
-	if( !b_window_close )
+	if( !s_bWindowClose )
 	{
 		VERIFY( DestroyWindow( h_wnd ) != 0 );
 	}
@@ -150,7 +150,7 @@ namespace
 		}
 		else
 		{
-			b_window_close = TRUE;
+			s_bWindowClose = TRUE;
 
 			return TRUE;
 		}		
@@ -194,13 +194,13 @@ LRESULT CALLBACK	window::callback_msg_proc(
 				if( (int)w_param == VK_ESCAPE )
 				{
 					//確認ダイアログを出す
-					b_message_box_appearing = TRUE;
+					s_bMessageBoxAppearing = TRUE;
 					int	result	= MessageBoxEx(
 							h_wnd, _T( "中断しますか？" ), sc_sz_wnd_name,
 							MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2,
 							LANG_JAPANESE
 							);
-					b_message_box_appearing = FALSE;
+					s_bMessageBoxAppearing = FALSE;
 	
 					ASSERT( result != 0 );
 					if( result != IDNO/*choise cancel*/ )
@@ -219,7 +219,7 @@ LRESULT CALLBACK	window::callback_msg_proc(
 				if( w_param == WA_INACTIVE )
 					//非アクティブ化
 				{
-					b_window_active  = FALSE;
+					s_bWindowActive  = FALSE;
 				}
 				else
 					//アクティブ化
@@ -227,7 +227,7 @@ LRESULT CALLBACK	window::callback_msg_proc(
 					///インプットの復帰
 					//restart_device();
 
-					b_window_active  = TRUE;
+					s_bWindowActive  = TRUE;
 				}
 	
 				return 0;
@@ -246,52 +246,52 @@ LRESULT CALLBACK	window::callback_msg_proc(
 
 b32		window::IsWindowActive()
 {
-	return b_window_active;
+	return s_bWindowActive;
 }
 
 b32		window::IsMessageBoxAppearing()
 {
-	return b_message_box_appearing;
+	return s_bMessageBoxAppearing;
 }
 
 u32		window::GetClientWidth()
 {
-	return client_width;
+	return s_uClientWidth;
 }
 
 u32		window::GetClientHeight()
 {
-	return client_height;
+	return s_uClientHeight;
 }
 
 void	window::SetClientWidth( u32 width )
 {
-	client_width = width;
+	s_uClientWidth = width;
 }
 
 void	window::SetClientHeight( u32 height )
 {
-	client_height = height;
+	s_uClientHeight = height;
 }
 
 u32		window::GetWindowPosX()
 {
-	return window_pos_x;
+	return s_uWindowPosX;
 }
 
 u32		window::GetWindowPosY()
 {
-	return window_pos_y;
+	return s_uWindowPosY;
 }
 
 void	window::SetWindowPosX( u32 x )
 {
-	window_pos_x = x;
+	s_uWindowPosX = x;
 }
 
 void	window::SetWindowPosY( u32 y )
 {
-	window_pos_y = y;
+	s_uWindowPosY = y;
 }