Usually something like __IRR_SOME_GUARD_INCLUDED__ replaced by IRR_SOME_GUARD_INCLUDED. Removing underscores at the end wasn't necessary, but more symmetric (probably the reason they got added there as well). While this touches every header it shouldn't affect users (I hope). Also a few whitespace changes to unify whitespace usage a bit. And a bunch of spelling fixes in comments. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6252 dfc29bdd-3216-0410-991c-e03cc46cb475
		
			
				
	
	
		
			79 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			79 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| #ifndef IRR_FONT_TOOL_INCLUDED
 | |
| #define IRR_FONT_TOOL_INCLUDED
 | |
| 
 | |
| 
 | |
| #include "irrlicht.h"
 | |
| 
 | |
| #if defined(_IRR_WINDOWS_)
 | |
| 	#ifdef _MBCS
 | |
| 		#undef _MBCS
 | |
| 	#endif
 | |
| 
 | |
| 	#define UNICODE
 | |
| 	#define _WIN32_WINNT 0x0500	
 | |
| 	#include "windows.h"
 | |
| #else
 | |
| 	#ifdef _IRR_COMPILE_WITH_X11_
 | |
| 	#include <X11/Xlib.h>
 | |
| 	#endif
 | |
| 	#include <X11/Xft/Xft.h>
 | |
| 	#include <set>
 | |
| #endif
 | |
| 
 | |
| 
 | |
| namespace irr {
 | |
| 	class CFontTool : public irr::IReferenceCounted
 | |
| 	{
 | |
| 	public:
 | |
| 		CFontTool(irr::IrrlichtDevice* device);
 | |
| 		~CFontTool();
 | |
| 
 | |
| 		virtual bool makeBitmapFont(u32 fontIndex, u32 charsetIndex, 
 | |
| 				s32 fontSize, u32 texturewidth, u32 textureHeight,
 | |
| 				bool bold, bool italic, bool aa, bool alpha);
 | |
| 
 | |
| 		virtual bool saveBitmapFont(const c8* filename, const c8* format);
 | |
| 
 | |
| 		virtual void selectCharSet(u32 currentCharSet);
 | |
| 
 | |
| 		struct SFontArea
 | |
| 		{
 | |
| 			SFontArea() : rectangle(), underhang(0), overhang(0), sourceimage(0) {}
 | |
| 			core::rect<s32> rectangle;
 | |
| 			s32		underhang;
 | |
| 			s32		overhang;
 | |
| 			u32		sourceimage;
 | |
| 		};
 | |
| 
 | |
| 	/*	struct SFontMap
 | |
| 		{
 | |
| 			SFontMap() :  areas(), start(0), count(0) {}
 | |
| 			core::array< SFontArea >	areas;
 | |
| 			s32				start;
 | |
| 			s32				count;
 | |
| 		};*/
 | |
| 
 | |
| 
 | |
| 
 | |
| 		core::array<core::stringw>	FontNames;
 | |
| 		core::array<core::stringw>	CharSets;
 | |
| 		//core::array<SFontMap>		Mappings;
 | |
| 		core::array<SFontArea>		Areas;
 | |
| 		core::map<wchar_t, u32>		CharMap;
 | |
| 
 | |
| 		core::array<video::ITexture*>	currentTextures;
 | |
| 		core::array<video::IImage*>	currentImages;
 | |
| 		const int			*FontSizes;
 | |
| 		IrrlichtDevice			*Device;
 | |
| 
 | |
| 		bool UseAlphaChannel;
 | |
| 
 | |
| 		// windows
 | |
| 		#ifdef _IRR_WINDOWS_
 | |
| 		HDC dc;
 | |
| 		#endif
 | |
| 
 | |
| 	};
 | |
| }
 | |
| #endif // IRR_FONT_TOOL_INCLUDED
 |