Commit: 2ca2f98d0fe6ccaac01b4049feb614307660a265 - shomlib (git)

Commit MetaInfo

• Revision: 2ca2f98d0fe6ccaac01b4049feb614307660a265 (tree)
• Time: 2012-11-18 23:42:55
• Author: shom5xg <shom@.(no...>
• Commiter: shom5xg

Log Message

util
--メーター単位クラス追加
--utf8、SJIS変換関数追加
--タイマークラス追加

Change Summary

• modified: util/src/util/util.cpp
• modified: util/src/util/util.h

Incremental Difference

--- a/util/src/util/util.cpp
+++ b/util/src/util/util.cpp
@@ -113,26 +113,29 @@ u32	get_color_b( u32 color )
 	mm( namespace )
 ****************************************************************************/
 
-color_t::color_t()
+color_t::color_t( u32 in_color )
+:
+m_color( in_color )
 {
 }
 
 color_t::color_t( u32 in_r, u32 in_g, u32 in_b, u32 in_a )
+:
+m_color( set_color_rgba( in_r, in_g, in_b, in_a ) )
 {
-	m_color = set_color_rgba( in_r, in_g, in_b, in_a );
 }
 
 color_t::color_t( f32 in_r, f32 in_g, f32 in_b, f32 in_a )
+:
+m_color( set_color_rgba(
+	SCAST< u32 >( in_r * SCAST< f32 >( 0xff ) ),
+	SCAST< u32 >( in_g * SCAST< f32 >( 0xff ) ),
+	SCAST< u32 >( in_b * SCAST< f32 >( 0xff ) ),
+	SCAST< u32 >( in_a * SCAST< f32 >( 0xff ) )
+	) )
 {
-	color_t(
-		SCAST< u32 >( in_r * SCAST< f32 >( 0xff ) ),
-		SCAST< u32 >( in_g * SCAST< f32 >( 0xff ) ),
-		SCAST< u32 >( in_b * SCAST< f32 >( 0xff ) ),
-		SCAST< u32 >( in_a * SCAST< f32 >( 0xff ) )
-		);
 }
 
-
 void color_t::set( u32 in_r, u32 in_g, u32 in_b, u32 in_a )
 {
 	m_color = set_color_rgba( in_r, in_g, in_b, in_a );
@@ -242,3 +245,35 @@ f32 meter_to_dot( f32 meter )
 	return ( meter * 7.0f );
 }
 
+void	util_chara_code::ConvUtf8toSJis( ct char* ct in_pSrc, TCHAR* out_pDst, int* out_pSize )
+{
+   *out_pSize = 0;
+ 
+   //UTF-8からUTF-16へ変換
+   const int nSize = ::MultiByteToWideChar( CP_UTF8, 0, in_pSrc, -1, NULL, 0 );
+ 
+   LPWSTR buffUtf16 = reinterpret_cast< LPWSTR >( new BYTE[ nSize * 2 + 2 ] );
+   ::MultiByteToWideChar( CP_UTF8, 0, in_pSrc, -1, buffUtf16, nSize );
+ 
+   //UTF-16からShift-JISへ変換
+   *out_pSize = ::WideCharToMultiByte( CP_ACP, 0, buffUtf16, -1, NULL, 0, NULL, NULL );
+   if( !out_pDst ){
+       delete buffUtf16;
+   }
+ 
+   LPSTR buffSJis = new char[ *out_pSize * 2 ];
+   my_memzero( buffSJis, *out_pSize * 2 );
+   ::WideCharToMultiByte( CP_ACP, 0, buffUtf16, -1, buffSJis, *out_pSize, NULL, NULL );
+ 
+#ifdef UNICODE
+   MultiByteToWideChar( CP_OEMCP, MB_PRECOMPOSED, buffSJis, strlen( buffSJis ), out_pDst, 256 );
+#else
+   strcpy( out_pDst, buffSJis );
+#endif
+ 
+   delete buffUtf16;
+   delete buffSJis;
+}
+
+
+

--- a/util/src/util/util.h
+++ b/util/src/util/util.h
@@ -70,7 +70,7 @@ extern u32	get_color_b( u32 color );
 class color_t
 {
 public:
-	color_t();
+	color_t( u32 in_color );
 	color_t( u32 in_r, u32 in_g, u32 in_b, u32 in_a = 0xff );
 	color_t( f32 in_r, f32 in_g, f32 in_b, f32 in_a = 1.f );
 
@@ -109,6 +109,19 @@ extern u32 get_time();
 ///--	"convert unit"
 extern f32 dot_to_meter( f32 dot );
 extern f32 meter_to_dot( f32 meter );
+
+class meter_t
+{
+public:
+	meter_t();
+};
+///--
+
+///--	"char-code"
+namespace util_chara_code
+{
+	extern void ConvUtf8toSJis( ct char* ct in_pSrc, TCHAR* out_pDst, int* out_pSize );
+}
 ///--
 
 ///--	"enum definition"
@@ -129,3 +142,33 @@ enum BOOST_PP_CAT( e, ENUM_KIND )	\
 	BOOST_PP_CAT( e, ENUM_KIND )##_Invalid = U32_INVALID,	\
 };
 ///--
+
+///--	"timer"
+class CTimer
+{
+public:
+	CTimer() : m_uTime( U32_INVALID ), m_bPause( FALSE ) {}
+
+	void	Update( u32 in_uTimeProceed )
+	{
+		if( IsProceed() && !IsPause() )
+		{
+			m_uTime += in_uTimeProceed;
+		}
+	}
+
+	void	Start()		{ m_uTime = 0; }
+	void	Stop()		{ m_uTime = U32_INVALID; }
+	void	Reset()		{ if( IsProceed() ){ m_uTime = 0; } }
+	void	Pause()		{ m_bPause = TRUE; }
+	void	Resume()	{ m_bPause = FALSE; }
+
+	u32		GetTime()	const	{ return m_uTime; }
+	b32		IsProceed()	const	{ return ( m_uTime != U32_INVALID ); }
+	b32		IsPause()	const	{ return m_bPause; }
+
+private:
+	u32	m_uTime;
+	b32	m_bPause;
+};
+///--