ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied riebl's patch to compile font tool under linux

Browse Source 
and remove all compiler warnings.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10942 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-03-06 22:28:47 +00:00
parent f59dab5914
commit e3c39b613a
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/font_tool/CVectorFontTool.h
View File

@ -106,8 +106,9 @@ struct STriangleList
} }
u32 ia=0xffffffff, ib=0xffffffff, ic=0xffffffff; u32 ia=0xffffffff, ib=0xffffffff, ic=0xffffffff;
const u32 max_u32 = 0xffffffff;
// no duplicate vertex positions allowed... // no duplicate vertex positions allowed...
for (u32 i=0; i < positions.size() && (ia==-1||ib==-1||ic==-1) ; ++i) for (u32 i=0; i < positions.size() && (ia==max_u32||ib==max_u32||ic==max_u32) ; ++i)
{ {
if (positions[i] == a) if (positions[i] == a)
ia = i; ia = i;

32
tools/font_tool/main.cpp
View File

@ -28,7 +28,9 @@
using namespace irr; using namespace irr;
using namespace gui; using namespace gui;
#pragma comment(lib, "Irrlicht.lib") #ifdef _MSC_VER
# pragma comment(lib, "Irrlicht.lib")
#endif
const s32 texturesizes[] = {128, 256, 512, 1024, 2048, 4096, 0}; const s32 texturesizes[] = {128, 256, 512, 1024, 2048, 4096, 0};
@ -55,7 +57,7 @@ const wchar_t *warntext = L"Legal Notice\n"
L"Some free fonts can be found here- www.openfontlibrary.org\n" L"Some free fonts can be found here- www.openfontlibrary.org\n"
L"http://savannah.nongnu.org/projects/freefont/"; L"http://savannah.nongnu.org/projects/freefont/";
wchar_t *helptext = L"This tool creates bitmap fonts for the Irrlicht Engine\n\n" const wchar_t *helptext = L"This tool creates bitmap fonts for the Irrlicht Engine\n\n"
L"First select a character encoding from the list, then choose the font, " L"First select a character encoding from the list, then choose the font, "
L"size, and whether you'd like bold, italic, antialiasing and an alpha channel. " L"size, and whether you'd like bold, italic, antialiasing and an alpha channel. "
@ -78,9 +80,9 @@ wchar_t *helptext = L"This tool creates bitmap fonts for the Irrlicht Engine\n\n
L"That's all, have fun :-)"; L"That's all, have fun :-)";
#ifdef _IRR_WINDOWS #ifdef _IRR_WINDOWS
wchar_t *completeText = L"Font created" const wchar_t *completeText = L"Font created"
#else #else
wchar_t *completeText = L"Font created\n\n" const wchar_t *completeText = L"Font created\n\n"
L"Please note that anti-aliasing under X11 is controlled by the system " L"Please note that anti-aliasing under X11 is controlled by the system "
L"configuration, so if your system is set to use anti-aliasing, then so " L"configuration, so if your system is set to use anti-aliasing, then so "
L"will any fonts you create with FontTool"; L"will any fonts you create with FontTool";
@ -107,12 +109,6 @@ enum MYGUI
MYGUI_HELPBUTTON MYGUI_HELPBUTTON
}; };
inline void PrintWStr(const wchar_t *s){
HANDLE h=GetStdHandle(STD_OUTPUT_HANDLE);
WriteConsoleW(h,s,wcslen(s),NULL,NULL);
int i=L'\n';
WriteConsoleW(h,&i,1,NULL,NULL);
}
// event reciever // event reciever
class MyEventReceiver : public IEventReceiver class MyEventReceiver : public IEventReceiver
@ -122,7 +118,6 @@ public:
MyEventReceiver(IrrlichtDevice* device, CFontTool*& fonttool, CVectorFontTool* &vectool) : MyEventReceiver(IrrlichtDevice* device, CFontTool*& fonttool, CVectorFontTool* &vectool) :
Device(device), FontTool(fonttool), VecTool(vectool) Device(device), FontTool(fonttool), VecTool(vectool)
{ {
device->setEventReceiver(this);
} }
virtual bool OnEvent(const SEvent &event) virtual bool OnEvent(const SEvent &event)
@ -164,7 +159,7 @@ public:
} }
else if(id==MYGUI_FONTNAME){ else if(id==MYGUI_FONTNAME){
IGUIComboBox* cbo = (IGUIComboBox*)event.GUIEvent.Caller; IGUIComboBox* cbo = (IGUIComboBox*)event.GUIEvent.Caller;
PrintWStr(FontTool->FontNames[cbo->getSelected()].c_str()); std::cout << FontTool->FontNames[cbo->getSelected()].c_str() << std::endl;
} }
break; break;
case EGET_CHECKBOX_CHANGED: case EGET_CHECKBOX_CHANGED:
@ -304,8 +299,9 @@ public:
core::stringc format = fmt->getItem(fmt->getSelected()); core::stringc format = fmt->getItem(fmt->getSelected());
// vector fonts disabled // vector fonts disabled
IGUICheckBox *chk = (IGUICheckBox*)env->getRootGUIElement()->getElementFromId(MYGUI_VECTOR,true); // IGUICheckBox *chk = (IGUICheckBox*)env->getRootGUIElement()->getElementFromId(MYGUI_VECTOR,true);
bool vec = false; // chk->isChecked(); // bool vec = chk->isChecked();
bool vec = false;
if (vec && VecTool) if (vec && VecTool)
VecTool->saveVectorFont(name.c_str(), format.c_str()); VecTool->saveVectorFont(name.c_str(), format.c_str());
@ -322,6 +318,9 @@ public:
} }
break; break;
default:
break;
} }
} }
@ -512,7 +511,8 @@ int main(int argc,char **argv)
CFontTool *fc = new CFontTool(device); CFontTool *fc = new CFontTool(device);
CVectorFontTool *vc = 0; CVectorFontTool *vc = 0;
IEventReceiver *events = new MyEventReceiver(device,fc,vc); MyEventReceiver events(device,fc,vc);
device->setEventReceiver(&events);
createGUI(device, fc); createGUI(device, fc);
@ -523,7 +523,7 @@ int main(int argc,char **argv)
while(device->run()) while(device->run())
{ {
Sleep(50); device->sleep(50);
if (device->isWindowActive()) if (device->isWindowActive())
{ {