* Began supporting python3
* Code clean-up git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1021 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
60ebaa84d1
commit
79bf5c6252
31 changed files with 572 additions and 644 deletions
|
@ -33,7 +33,9 @@
|
|||
#include "Blend.hpp"
|
||||
#include "Sound.hpp"
|
||||
#include "String.hpp"
|
||||
#include "SoundStream.hpp"
|
||||
#include "SoundStream.hpp"
|
||||
|
||||
#include "compat.hpp"
|
||||
|
||||
extern PyTypeObject PySfClockType;
|
||||
|
||||
|
@ -88,109 +90,129 @@ extern PyTypeObject PySfListenerType;
|
|||
static PyMethodDef module_methods[] = {
|
||||
{"Sleep", (PyCFunction)PySFML_Sleep, METH_O, "Sleep(Duration)\nMake the current thread sleep for a given time.\n Duration : Time to sleep, in seconds"},
|
||||
{NULL} /* Sentinel */
|
||||
};
|
||||
};
|
||||
|
||||
#ifdef IS_PY3K
|
||||
#define INITERROR return NULL
|
||||
static PyModuleDef module_def = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"noddy",
|
||||
"Example module that creates an extension type.",
|
||||
-1,
|
||||
module_methods, NULL, NULL, NULL, NULL
|
||||
};
|
||||
|
||||
PyObject *
|
||||
PyInit_sf(void)
|
||||
#else
|
||||
#define INITERROR return
|
||||
|
||||
#ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
|
||||
#define PyMODINIT_FUNC void
|
||||
#endif
|
||||
PyMODINIT_FUNC
|
||||
initsf(void)
|
||||
PyMODINIT_FUNC
|
||||
initsf(void)
|
||||
#endif
|
||||
{
|
||||
PyObject *m;
|
||||
|
||||
if (PyType_Ready(&PySfClockType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
if (PyType_Ready(&PySfWindowType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfWindowSettingsType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfStyleType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfRenderTargetType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfRenderWindowType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfVideoModeType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfViewType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfInputType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
if (PyType_Ready(&PySfEventType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfEventTextType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfEventKeyType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfEventMouseMoveType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfEventMouseButtonType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfEventMouseWheelType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfEventJoyMoveType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfEventJoyButtonType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfEventSizeType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfKeyType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfJoyType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfMouseType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
if (PyType_Ready(&PySfDrawableType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfBlendType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfSpriteType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfFontType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfGlyphType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfStringType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfPostFXType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
if (PyType_Ready(&PySfImageType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
if (PyType_Ready(&PySfShapeType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
if (PyType_Ready(&PySfColorType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
if (PyType_Ready(&PySfIntRectType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfFloatRectType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
if (PyType_Ready(&PySfMusicType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfSoundType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfSoundBufferType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfSoundBufferRecorderType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfSoundRecorderType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfSoundStreamType) < 0)
|
||||
return;
|
||||
INITERROR;
|
||||
if (PyType_Ready(&PySfListenerType) < 0)
|
||||
return;
|
||||
|
||||
m = Py_InitModule3("sf", module_methods, "Python binding for sfml (Simple Fast Media Library)");
|
||||
INITERROR;
|
||||
|
||||
#ifdef IS_PY3K
|
||||
m = PyModule_Create(&module_def);
|
||||
#else
|
||||
m = Py_InitModule3("sf", module_methods, "Python binding for sfml (Simple Fast Media Library)");
|
||||
#endif
|
||||
|
||||
if (m == NULL)
|
||||
return;
|
||||
INITERROR;
|
||||
|
||||
Py_INCREF(&PySfClockType);
|
||||
PyModule_AddObject(m, "Clock", (PyObject *)&PySfClockType);
|
||||
|
@ -274,6 +296,10 @@ initsf(void)
|
|||
PySfBlend_InitConst();
|
||||
PySfSound_InitConst();
|
||||
PySfSoundStream_InitConst();
|
||||
PySfString_InitConst();
|
||||
PySfString_InitConst();
|
||||
|
||||
#ifdef IS_PY3K
|
||||
return m;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue