Commit: 3dbf5a3c272eeca60274b6d276a8a4ae2b2b8d2d - shomlib (git)

Commit MetaInfo

• Revision: 3dbf5a3c272eeca60274b6d276a8a4ae2b2b8d2d (tree)
• Time: 2012-11-18 23:47:15
• Author: shom5xg <shom@.(no...>
• Commiter: shom5xg

Log Message

activate debug-dip

Change Summary

• modified: core/src/core/app.h
• modified: core/src/core/app_dx.cpp
• modified: core/src/core/debug/debug_dip/debug_dip.cpp
• modified: core/src/core/debug/debug_dip/debug_dip_def.h
• modified: core/src/core/pch_core.h

Incremental Difference

--- a/core/src/core/app.h
+++ b/core/src/core/app.h
@@ -4,9 +4,12 @@
     @author     shom
 ****************************************************************************/
 
+#pragma once
+
 namespace app
 {
 	enum{ g_kFps = 60 };
+	enum{ g_kSec = 1000 };
 
 	typedef void (*fnGameInit)( HWND h_wnd, HINSTANCE h_inst );
 	typedef void (*fnGameFin)();

--- a/core/src/core/app_dx.cpp
+++ b/core/src/core/app_dx.cpp
@@ -47,6 +47,10 @@ namespace
 
 void	app::AppInit( HINSTANCE in_h_inst, fnGameInit in_fnGameInit, int nCmdShow )
 {
+#ifdef _DEBUG
+	debug_dip::InitDip();
+#endif
+
 	h_wnd = window::InitApp( in_h_inst, nCmdShow );
 	h_inst = in_h_inst;
 
@@ -94,8 +98,16 @@ int		app::AppFin( fnGameFin in_fnGameFin )
 	///--
 
 	///--
-	return ( window::FinApp( h_wnd, h_inst ) );
+	const b32 bRet ( window::FinApp( h_wnd, h_inst ) );
+	///--
+
+	///--
+#ifdef _DEBUG
+	debug_dip::FinDip();
+#endif
 	///--
+
+	return bRet;
 }
 
 void	app::AppLoop( fnGameLoopExec in_fnExec, fnGameLoopDraw in_fnDraw )
@@ -129,9 +141,9 @@ void	app_private::game_loop_fin()
 	const u32 tm_exec_end = get_time();
 	const u32 tm_exec_elapsed = tm_exec_end - tm_start;
 
-	if( 1000 / app::g_kFps > tm_exec_elapsed )
+	if( app::g_kSec / app::g_kFps > tm_exec_elapsed )
 	{
-		proc_msg_and_wait( 1000 / app::g_kFps - tm_exec_elapsed - 1/*小数点切り下げ還元*/ );
+		proc_msg_and_wait( app::g_kSec / app::g_kFps - tm_exec_elapsed - 1/*小数点切り下げ還元*/ );
 	}
 	else
 	{
@@ -195,8 +207,11 @@ void	app_private::proc_msg_and_wait( const u32 tm_wait )
 void	app_private::game_loop_exec( app::fnGameLoopExec in_fnExec )
 {
 	using namespace window;
+	using namespace debug_dip;	
 
-	if( IsWindowActive() && !IsMessageBoxAppearing() )
+	if( ( IsDip( eDEBUG_DIP_PROC_ONLY_FOCUSING ) ? IsWindowActive() : TRUE ) &&
+		!IsMessageBoxAppearing()
+		)
 	{
 		if( (in_fnExec)() )
 		{
@@ -215,10 +230,6 @@ void	app_private::game_loop_draw( app::fnGameLoopDraw in_fnDraw )
 	{
 		(in_fnDraw)();
 
-#ifdef _DEBUG
-		fps_counter::fps_counter_draw();
-#endif
-
 		VERIFY( g_p_render->EndDraw() );
 	}
 	else

--- a/core/src/core/debug/debug_dip/debug_dip.cpp
+++ b/core/src/core/debug/debug_dip/debug_dip.cpp
@@ -72,7 +72,7 @@ void	debug_dip::InitDip()
 	#define DEBUG_DIP_ITEM( _category, _name, _msg )						\
 																			\
 	{																		\
-		const u32 ret =														\
+		cu32 ret =															\
 			GetPrivateProfileInt( _T( #_category ), _T( #_name ), 0, sz_path );	\
 																			\
 		SetDip( eDEBUG_DIP_##_name##, ( ret != 0 ) );						\
@@ -95,10 +95,10 @@ void	debug_dip::FinDip()
 														\
 	{													\
 		TCHAR sz_unit[256] = {0};						\
-		const b32 b_on = IsDip( eDEBUG_DIP_##_name## );	\
+		cb32 b_on ( IsDip( eDEBUG_DIP_##_name## ) );	\
 		wsprintf(										\
 			sz_unit,									\
-			_T( "%s = %d\n" ),							\
+			_T( "%s=%d\r\n" ),							\
 			_T( #_name ),								\
 			static_cast<UINT>( b_on )					\
 			);											\
@@ -114,11 +114,10 @@ void	debug_dip::FinDip()
 	for( u32 i=0; i<eNOF_CATEGORY; ++i )
 	{
 		TCHAR sz_temp[256] = {0};
-		_tcsncpy_s( sz_temp, str_text[i].c_str(), 255 );
-		sz_temp[ _tcscnlen( sz_temp, 256 ) - 1 ] = '\0';
-		//最後の改行文字を消しつつNULL文字を連続させる
+		wsprintf( sz_temp, _T( "%s\0\0" ), str_text[i].c_str() );
+		sz_temp[ _tcscnlen( sz_temp, 256 ) - 1 ] = _T( '\0' );
 
-		const b32 ret =
+		cb32 ret =
 			WritePrivateProfileSection(
 				g_szDebugDipCategoryTbl[i],
 				sz_temp, sz_path

--- a/core/src/core/debug/debug_dip/debug_dip_def.h
+++ b/core/src/core/debug/debug_dip/debug_dip_def.h
@@ -15,8 +15,8 @@ DEBUG_DIP_ITEM( PLAYER, NO_DAMAGE,	"
 DEBUG_DIP_ITEM( PLAYER, NO_HIT,		"攻撃を受けない" )
 
 ///system
-DEBUG_DIP_ITEM( SYSTEM, DRAW_FPS,				"FPS表示" )
-DEBUG_DIP_ITEM( SYSTEM, PROC_NOT_ONLY_FOCUSING,	"フォーカスが外れても中断しない" )
+DEBUG_DIP_ITEM( SYSTEM, DRAW_FPS,			"FPS表示" )
+DEBUG_DIP_ITEM( SYSTEM, PROC_ONLY_FOCUSING,	"フォーカスが外れたら中断する" )
 
 ///graphic
 DEBUG_DIP_ITEM( GRAPHIC, NOT_RENDER_MODEL,	"キャラモデルを描画しない" )

--- a/core/src/core/pch_core.h
+++ b/core/src/core/pch_core.h
@@ -30,6 +30,9 @@
 #include "util/mm/mm.h"
 #include "util/util.h"
 
+#include "core/debug/debug_dip/debug_dip.h"
+using namespace debug_dip;
+
 ///--	"grobal var"
 class crender;
 extern crender *g_p_render;