lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjusted PySFML to work with the current SFML2 branch.

Browse source 
Note that it's just compatible. A lot of the new functionality is still in the pipeline.

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1308 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
tankbo 2009-12-07 11:53:38 +00:00
parent fb7470cbc3
commit 839c80556d
29 changed files with 544 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

16
python/src/Font.cpp
View file

@ -75,16 +75,16 @@ PySfFont_LoadFromFile(PySfFont* self, PyObject *args, PyObject *kwds)
{
PyErr_Clear();
if (EncodingStr == NULL)
result = self->obj->LoadFromFile(Filename, Charsize, sf::Unicode::UTF8String((sf::Uint8 *)Charset));
result = self->obj->LoadFromFile(Filename, Charsize, Charset);
else
{
Encoding.assign(EncodingStr);
if (Encoding == "utf8" || Encoding == "")
result = self->obj->LoadFromFile(Filename, Charsize, sf::Unicode::UTF8String((sf::Uint8 *)Charset));
result = self->obj->LoadFromFile(Filename, Charsize, Charset);
else if (Encoding == "utf16")
result = self->obj->LoadFromFile(Filename, Charsize, sf::Unicode::UTF16String((sf::Uint16 *)(Charset+2)));
result = self->obj->LoadFromFile(Filename, Charsize, Charset+2);
else if (Encoding == "utf32")
result = self->obj->LoadFromFile(Filename, Charsize, sf::Unicode::UTF32String((sf::Uint32 *)(Charset+4)));
result = self->obj->LoadFromFile(Filename, Charsize, Charset+4);
else
{
PyErr_Format(PyExc_TypeError, "Font.LoadFromFile() Encoding %s not supported", EncodingStr);
@ -125,16 +125,16 @@ PySfFont_LoadFromMemory(PySfFont* self, PyObject *args, PyObject *kwds)
{
PyErr_Clear();
if (EncodingStr == NULL)
result = self->obj->LoadFromMemory(Data, Size, Charsize, sf::Unicode::UTF8String((sf::Uint8 *)Charset));
result = self->obj->LoadFromMemory(Data, Size, Charsize, Charset);
else
{
Encoding.assign(EncodingStr);
if (Encoding == "utf8")
result = self->obj->LoadFromMemory(Data, Size, Charsize, sf::Unicode::UTF8String((sf::Uint8 *)Charset));
result = self->obj->LoadFromMemory(Data, Size, Charsize, Charset);
else if (Encoding == "utf16")
result = self->obj->LoadFromMemory(Data, Size, Charsize, sf::Unicode::UTF16String((sf::Uint16 *)(Charset+2)));
result = self->obj->LoadFromMemory(Data, Size, Charsize, Charset+2);
else if (Encoding == "utf32")
result = self->obj->LoadFromMemory(Data, Size, Charsize, sf::Unicode::UTF32String((sf::Uint32 *)(Charset+4)));
result = self->obj->LoadFromMemory(Data, Size, Charsize, Charset+4);
else
{
PyErr_Format(PyExc_TypeError, "Font.LoadFromMemory() Encoding %s not supported", EncodingStr);