• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoawindowspythonrubyphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdombtronvb.netdirectxarduinopreviewerゲームエンジン

Commit MetaInfo

Révisionaa1249d848c33b5b403910eecec883883979e7ab (tree)
l'heure2012-11-19 00:02:51
Auteurshom5xg <shom@.(no...>
Commitershom5xg

Message de Log

forgot to commit

Change Summary

Modification

--- a/core/src/core/font/font_gdi.h
+++ b/core/src/core/font/font_gdi.h
@@ -1,43 +1,29 @@
11 /***************************************************************************/
2-/** @file FontGdi.h
2+/** @file Font_Gdi.h
33 @brief font rendering by gdi
44 @author shom
5- @internal
65 ****************************************************************************/
76
87 #pragma once
98
10-#include "d3dx9core.h"
11-#include "d3d9types.h"
9+#include "Font_Base.h"
1210
13-class crender;
11+#include "core/font/Font_Texture_Raw.h"
1412
15-class cfont_gdi
16-{
17-public:
18- cfont_gdi();
19-
20- void SetDefault();
2113
22- void SetSize( u32 height, u32 width = 0 );
23- void SetStyle(
24- b32 b_italic,
25- b32 b_weight,
26- b32 b_use_ansi/*,
27- b32 b_shadow*/
28- );
14+class CFont_Gdi_Raw;
2915
30- void Create( LPD3DXFONT* pp_out, crender* in_p_render );
16+class CFont_Gdi
17+:
18+public CFont_Base
19+{
20+public:
21+ CFont_Gdi();
3122
32- void Draw(
33- const LPD3DXFONT p_d3dx_font,
34- const LPCWSTR sz_msg,
35- RECT rect,
36- u32 color = COLOR_BLACK,
37- b32 b_shadow = FALSE,
38- const LPD3DXSPRITE p_sprite = NULL
39- );
23+ virtual void Draw( const TCHAR* in_szText, const font_def::FontContext_t& in_Context );
4024
4125 private:
42- D3DXFONT_DESC m_font_desc;
26+ SPTR_T( CFont_Gdi_Raw ) m_pRaw;
27+ LPD3DXFONT m_pD3dxFont;
28+ LPD3DXSPRITE m_pD3xdSprite;
4329 };