Sound APIs for Python
This commit is contained in:
parent
620def19f1
commit
87483cc8ad
|
@ -8,6 +8,9 @@ std::map<std::string, UIMenu*> McRFPy_API::menus;
|
||||||
std::map<std::string, Grid*> McRFPy_API::grids;
|
std::map<std::string, Grid*> McRFPy_API::grids;
|
||||||
std::map<std::string, PyObject*> McRFPy_API::callbacks;
|
std::map<std::string, PyObject*> McRFPy_API::callbacks;
|
||||||
std::list<Animation*> McRFPy_API::animations;
|
std::list<Animation*> McRFPy_API::animations;
|
||||||
|
std::vector<sf::SoundBuffer> McRFPy_API::soundbuffers;
|
||||||
|
sf::Music McRFPy_API::music;
|
||||||
|
sf::Sound McRFPy_API::sfx;
|
||||||
|
|
||||||
EntityManager McRFPy_API::entities;
|
EntityManager McRFPy_API::entities;
|
||||||
|
|
||||||
|
@ -60,6 +63,23 @@ static PyMethodDef mcrfpyMethods[] = {
|
||||||
"loop: if True, animation repeats; if False, animation is deleted\n"
|
"loop: if True, animation repeats; if False, animation is deleted\n"
|
||||||
"frames: if animating a sprite, list the frames. For other data types, the value will change in discrete steps at a rate of duration/len(frames).\n"},
|
"frames: if animating a sprite, list the frames. For other data types, the value will change in discrete steps at a rate of duration/len(frames).\n"},
|
||||||
|
|
||||||
|
/*
|
||||||
|
static PyObject* _createSoundBuffer(PyObject*, PyObject*);
|
||||||
|
static PyObject* _loadMusic(PyObject*, PyObject*);
|
||||||
|
static PyObject* _setMusicVolume(PyObject*, PyObject*);
|
||||||
|
static PyObject* _setSoundVolume(PyObject*, PyObject*);
|
||||||
|
static PyObject* _playSound(PyObject*, PyObject*);
|
||||||
|
static PyObject* _getMusicVolume(PyObject*, PyObject*);
|
||||||
|
static PyObject* _getSoundVolume(PyObject*, PyObject*);
|
||||||
|
*/
|
||||||
|
{"createSoundBuffer", McRFPy_API::_createSoundBuffer, METH_VARARGS, "(filename)"},
|
||||||
|
{"loadMusic", McRFPy_API::_loadMusic, METH_VARARGS, "(filename)"},
|
||||||
|
{"setMusicVolume", McRFPy_API::_setMusicVolume, METH_VARARGS, "(int)"},
|
||||||
|
{"setSoundVolume", McRFPy_API::_setSoundVolume, METH_VARARGS, "(int)"},
|
||||||
|
{"playSound", McRFPy_API::_playSound, METH_VARARGS, "(int)"},
|
||||||
|
{"getMusicVolume", McRFPy_API::_getMusicVolume, METH_VARARGS, ""},
|
||||||
|
{"getSoundVolume", McRFPy_API::_getSoundVolume, METH_VARARGS, ""},
|
||||||
|
|
||||||
{NULL, NULL, 0, NULL}
|
{NULL, NULL, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -770,3 +790,64 @@ PyObject* McRFPy_API::_createAnimation(PyObject *self, PyObject *args) {
|
||||||
Py_INCREF(Py_None);
|
Py_INCREF(Py_None);
|
||||||
return Py_None;
|
return Py_None;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PyObject* McRFPy_API::_createSoundBuffer(PyObject* self, PyObject* args) {
|
||||||
|
const char *fn_cstr;
|
||||||
|
if (!PyArg_ParseTuple(args, "s", &fn_cstr)) return NULL;
|
||||||
|
auto b = sf::SoundBuffer();
|
||||||
|
b.loadFromFile(fn_cstr);
|
||||||
|
McRFPy_API::soundbuffers.push_back(b);
|
||||||
|
Py_INCREF(Py_None);
|
||||||
|
return Py_None;
|
||||||
|
}
|
||||||
|
|
||||||
|
PyObject* McRFPy_API::_loadMusic(PyObject* self, PyObject* args) {
|
||||||
|
const char *fn_cstr;
|
||||||
|
PyObject* loop_obj;
|
||||||
|
if (!PyArg_ParseTuple(args, "s|O", &fn_cstr, &loop_obj)) return NULL;
|
||||||
|
McRFPy_API::music.stop();
|
||||||
|
// get params for sf::Music initialization
|
||||||
|
//sf::InputSoundFile file;
|
||||||
|
//file.openFromFile(fn_cstr);
|
||||||
|
McRFPy_API::music.openFromFile(fn_cstr);
|
||||||
|
McRFPy_API::music.setLoop(PyObject_IsTrue(loop_obj));
|
||||||
|
//McRFPy_API::music.initialize(file.getChannelCount(), file.getSampleRate());
|
||||||
|
McRFPy_API::music.play();
|
||||||
|
Py_INCREF(Py_None);
|
||||||
|
return Py_None;
|
||||||
|
}
|
||||||
|
|
||||||
|
PyObject* McRFPy_API::_setMusicVolume(PyObject* self, PyObject* args) {
|
||||||
|
int vol;
|
||||||
|
if (!PyArg_ParseTuple(args, "i", &vol)) return NULL;
|
||||||
|
McRFPy_API::music.setVolume(vol);
|
||||||
|
Py_INCREF(Py_None);
|
||||||
|
return Py_None;
|
||||||
|
}
|
||||||
|
|
||||||
|
PyObject* McRFPy_API::_setSoundVolume(PyObject* self, PyObject* args) {
|
||||||
|
float vol;
|
||||||
|
if (!PyArg_ParseTuple(args, "f", &vol)) return NULL;
|
||||||
|
McRFPy_API::sfx.setVolume(vol);
|
||||||
|
Py_INCREF(Py_None);
|
||||||
|
return Py_None;
|
||||||
|
}
|
||||||
|
|
||||||
|
PyObject* McRFPy_API::_playSound(PyObject* self, PyObject* args) {
|
||||||
|
float index;
|
||||||
|
if (!PyArg_ParseTuple(args, "f", &index)) return NULL;
|
||||||
|
if (index >= McRFPy_API::soundbuffers.size()) return NULL;
|
||||||
|
McRFPy_API::sfx.stop();
|
||||||
|
McRFPy_API::sfx.setBuffer(McRFPy_API::soundbuffers[index]);
|
||||||
|
McRFPy_API::sfx.play();
|
||||||
|
Py_INCREF(Py_None);
|
||||||
|
return Py_None;
|
||||||
|
}
|
||||||
|
|
||||||
|
PyObject* McRFPy_API::_getMusicVolume(PyObject* self, PyObject* args) {
|
||||||
|
return Py_BuildValue("f", McRFPy_API::music.getVolume());
|
||||||
|
}
|
||||||
|
|
||||||
|
PyObject* McRFPy_API::_getSoundVolume(PyObject* self, PyObject* args) {
|
||||||
|
return Py_BuildValue("f", McRFPy_API::sfx.getVolume());
|
||||||
|
}
|
||||||
|
|
|
@ -49,6 +49,9 @@ public:
|
||||||
static EntityManager entities; // this is also kinda good, entities not on the current grid can still act (like monsters following you through doors??)
|
static EntityManager entities; // this is also kinda good, entities not on the current grid can still act (like monsters following you through doors??)
|
||||||
static std::map<std::string, Grid*> grids;
|
static std::map<std::string, Grid*> grids;
|
||||||
static std::list<Animation*> animations;
|
static std::list<Animation*> animations;
|
||||||
|
static std::vector<sf::SoundBuffer> soundbuffers;
|
||||||
|
static sf::Music music;
|
||||||
|
static sf::Sound sfx;
|
||||||
|
|
||||||
static std::map<std::string, PyObject*> callbacks;
|
static std::map<std::string, PyObject*> callbacks;
|
||||||
|
|
||||||
|
@ -78,6 +81,14 @@ public:
|
||||||
|
|
||||||
static PyObject* _registerPyAction(PyObject*, PyObject*);
|
static PyObject* _registerPyAction(PyObject*, PyObject*);
|
||||||
|
|
||||||
|
static PyObject* _createSoundBuffer(PyObject*, PyObject*);
|
||||||
|
static PyObject* _loadMusic(PyObject*, PyObject*);
|
||||||
|
static PyObject* _setMusicVolume(PyObject*, PyObject*);
|
||||||
|
static PyObject* _setSoundVolume(PyObject*, PyObject*);
|
||||||
|
static PyObject* _playSound(PyObject*, PyObject*);
|
||||||
|
static PyObject* _getMusicVolume(PyObject*, PyObject*);
|
||||||
|
static PyObject* _getSoundVolume(PyObject*, PyObject*);
|
||||||
|
|
||||||
// Jank Functionality
|
// Jank Functionality
|
||||||
static UIMenu* createMenu(int posx, int posy, int sizex, int sizey);
|
static UIMenu* createMenu(int posx, int posy, int sizex, int sizey);
|
||||||
static void createCaption(std::string menukey, std::string text, int fontsize, sf::Color textcolor);
|
static void createCaption(std::string menukey, std::string text, int fontsize, sf::Color textcolor);
|
||||||
|
@ -89,7 +100,6 @@ public:
|
||||||
|
|
||||||
static void doAction(std::string);
|
static void doAction(std::string);
|
||||||
|
|
||||||
|
|
||||||
// McRFPy_API(GameEngine*);
|
// McRFPy_API(GameEngine*);
|
||||||
|
|
||||||
// API functionality - use from C++ directly
|
// API functionality - use from C++ directly
|
||||||
|
|
Loading…
Reference in New Issue