Commit: 50634c9b24b53797489d064f9e4b39011a47ee02 - shomlib (git)

Commit MetaInfo

• Revision: 50634c9b24b53797489d064f9e4b39011a47ee02 (tree)
• Time: 2012-11-18 23:38:25
• Author: shom5xg <shom@.(no...>
• Commiter: shom5xg

Log Message

FPSカウンタ
--フォント描画は請け負わないように変更

Change Summary

• modified: core/src/core/debug/fps_counter/fps_counter.cpp
• modified: core/src/core/debug/fps_counter/fps_counter.h

Incremental Difference

--- a/core/src/core/debug/fps_counter/fps_counter.cpp
+++ b/core/src/core/debug/fps_counter/fps_counter.cpp
@@ -13,21 +13,19 @@
 
 #ifdef _DEBUG
 
-#include "core/font/font.h"
-
-#include "core/app.h"	//g_kFps
+#include "core/font/Font_Def.h"
 
 
 ///--	グローバル変数，実体定義
 
 namespace
 {
-	u32	s_uTimeBefore	= timeGetTime();
-	u32	s_uCounter	= 0;
+	u32	s_uTimeBefore = timeGetTime();
+	u32	s_uCounter = 0;
 	
 	u32	s_uFps = 0;
 
-	font_def::font_context_t	s_FontCntext;
+	font_def::FontContext_t	s_FontCntext;
 }
 
 ///--
@@ -38,9 +36,10 @@ namespace
  */
 void	fps_counter::fps_counter_init()
 {
-	s_FontCntext.v2_pos = mm::get_v( 10.f, 10.f );
-	s_FontCntext.v2_size = mm::get_v2_all( 20.f );
-	s_FontCntext.color = COLOR_WHITE;
+	s_FontCntext.uPosX = 10;
+	s_FontCntext.uPosY = 10;
+	s_FontCntext.v2Size = mm::get_v2_all( 20.f );
+	s_FontCntext.uColor = COLOR_WHITE;
 }
 
 /**
@@ -78,17 +77,9 @@ void	fps_counter::fps_counter_update()
 /**
  * FPSテキスト描画
  */
-void	fps_counter::fps_counter_draw()
+u32		fps_counter::fps_counter_get()
 {
-#if 0
-	if( s_uFps < app::g_kFps )
-	{
-		char szMsg[256];
-		sprintf_s( szMsg, 256, "FPS:%d", s_uFps );
-	
-		in_pFont->Draw( szMsg, s_FontCntext );
-	}
-#endif
+	return s_uFps;
 }
 
 #endif

--- a/core/src/core/debug/fps_counter/fps_counter.h
+++ b/core/src/core/debug/fps_counter/fps_counter.h
@@ -15,7 +15,7 @@ namespace fps_counter
 {
 	extern void fps_counter_init();
 	extern void fps_counter_update();
-	extern void fps_counter_draw();
+	extern u32	fps_counter_get();
 }
 
 #endif