X-Git-Url: https://git.jsancho.org/?p=guile-irrlicht.git;a=blobdiff_plain;f=src%2Fdevice.cpp;h=55c752fec4b1866a097dfd86a2169601d91297c2;hp=ed551705389337c09e789d110d54ba0ac2f6ac1b;hb=41a6ad96e81a8d8153c54877c4c12f61100677a9;hpb=bf2cb00e2ef19e2eb33557f900405f836ebe65a3 diff --git a/src/device.cpp b/src/device.cpp index ed55170..55c752f 100644 --- a/src/device.cpp +++ b/src/device.cpp @@ -27,10 +27,8 @@ #include "gsubr.h" #include "wchar.h" - using namespace irr; - SCM irr_createDevice (SCM device_type, SCM window_size, @@ -51,7 +49,6 @@ irr_createDevice (SCM device_type, return scm_from_pointer ((void*)device, NULL); } - SCM IrrlichtDevice_getCursorControl (SCM device) { @@ -60,7 +57,6 @@ IrrlichtDevice_getCursorControl (SCM device) return scm_from_pointer ((void*)cursor_control, NULL); } - SCM IrrlichtDevice_getFileSystem (SCM device) { @@ -69,7 +65,6 @@ IrrlichtDevice_getFileSystem (SCM device) return scm_from_pointer ((void*)file_system, NULL); } - SCM IrrlichtDevice_getGUIEnvironment (SCM device) { @@ -78,7 +73,6 @@ IrrlichtDevice_getGUIEnvironment (SCM device) return scm_from_pointer ((void*)gui_env, NULL); } - SCM IrrlichtDevice_getSceneManager (SCM device) { @@ -87,7 +81,6 @@ IrrlichtDevice_getSceneManager (SCM device) return scm_from_pointer ((void*)manager, NULL); } - SCM IrrlichtDevice_getTimer (SCM device) { @@ -96,7 +89,6 @@ IrrlichtDevice_getTimer (SCM device) return scm_from_pointer ((void*)timer, NULL); } - SCM IrrlichtDevice_getVideoDriver (SCM device) { @@ -105,7 +97,6 @@ IrrlichtDevice_getVideoDriver (SCM device) return scm_from_pointer ((void*)driver, NULL); } - SCM IrrlichtDevice_isWindowActive (SCM device) { @@ -113,7 +104,6 @@ IrrlichtDevice_isWindowActive (SCM device) (((IrrlichtDevice*)scm_to_pointer (device))->isWindowActive ()); } - SCM IrrlichtDevice_run (SCM device) { @@ -121,7 +111,6 @@ IrrlichtDevice_run (SCM device) (((IrrlichtDevice*)scm_to_pointer (device))->run ()); } - template SCM IrrlichtDevice_setEventReceiver (SCM device, @@ -132,7 +121,6 @@ IrrlichtDevice_setEventReceiver (SCM device, return SCM_UNSPECIFIED; } - SCM IrrlichtDevice_setResizable (SCM device, SCM resize) @@ -142,7 +130,6 @@ IrrlichtDevice_setResizable (SCM device, return SCM_UNSPECIFIED; } - SCM IrrlichtDevice_setWindowCaption (SCM device, SCM text) @@ -152,7 +139,6 @@ IrrlichtDevice_setWindowCaption (SCM device, return SCM_UNSPECIFIED; } - SCM IrrlichtDevice_yield (SCM device) { @@ -160,26 +146,21 @@ IrrlichtDevice_yield (SCM device) return SCM_UNSPECIFIED; } - -extern "C" { - - void - init_device (void) - { - DEFINE_GSUBR ("createDevice", 7, 0, 0, irr_createDevice); - DEFINE_GSUBR ("IrrlichtDevice_getCursorControl", 1, 0, 0, IrrlichtDevice_getCursorControl); - DEFINE_GSUBR ("IrrlichtDevice_getFileSystem", 1, 0, 0, IrrlichtDevice_getFileSystem); - DEFINE_GSUBR ("IrrlichtDevice_getGUIEnvironment", 1, 0, 0, IrrlichtDevice_getGUIEnvironment); - DEFINE_GSUBR ("IrrlichtDevice_getSceneManager", 1, 0, 0, IrrlichtDevice_getSceneManager); - DEFINE_GSUBR ("IrrlichtDevice_getTimer", 1, 0, 0, IrrlichtDevice_getTimer); - DEFINE_GSUBR ("IrrlichtDevice_getVideoDriver", 1, 0, 0, IrrlichtDevice_getVideoDriver); - DEFINE_GSUBR ("IrrlichtDevice_isWindowActive", 1, 0, 0, IrrlichtDevice_isWindowActive); - DEFINE_GSUBR ("IrrlichtDevice_run", 1, 0, 0, IrrlichtDevice_run); - DEFINE_GSUBR ("IrrlichtDevice_setEventReceiver_IEventReceiver", 2, 0, 0, - IrrlichtDevice_setEventReceiver); - DEFINE_GSUBR ("IrrlichtDevice_setResizable", 2, 0, 0, IrrlichtDevice_setResizable); - DEFINE_GSUBR ("IrrlichtDevice_setWindowCaption", 2, 0, 0, IrrlichtDevice_setWindowCaption); - DEFINE_GSUBR ("IrrlichtDevice_yield", 1, 0, 0, IrrlichtDevice_yield); - } - +void +init_device (void) +{ + DEFINE_GSUBR ("createDevice", 7, 0, 0, irr_createDevice); + DEFINE_GSUBR ("IrrlichtDevice_getCursorControl", 1, 0, 0, IrrlichtDevice_getCursorControl); + DEFINE_GSUBR ("IrrlichtDevice_getFileSystem", 1, 0, 0, IrrlichtDevice_getFileSystem); + DEFINE_GSUBR ("IrrlichtDevice_getGUIEnvironment", 1, 0, 0, IrrlichtDevice_getGUIEnvironment); + DEFINE_GSUBR ("IrrlichtDevice_getSceneManager", 1, 0, 0, IrrlichtDevice_getSceneManager); + DEFINE_GSUBR ("IrrlichtDevice_getTimer", 1, 0, 0, IrrlichtDevice_getTimer); + DEFINE_GSUBR ("IrrlichtDevice_getVideoDriver", 1, 0, 0, IrrlichtDevice_getVideoDriver); + DEFINE_GSUBR ("IrrlichtDevice_isWindowActive", 1, 0, 0, IrrlichtDevice_isWindowActive); + DEFINE_GSUBR ("IrrlichtDevice_run", 1, 0, 0, IrrlichtDevice_run); + DEFINE_GSUBR ("IrrlichtDevice_setEventReceiver_IEventReceiver", 2, 0, 0, + IrrlichtDevice_setEventReceiver); + DEFINE_GSUBR ("IrrlichtDevice_setResizable", 2, 0, 0, IrrlichtDevice_setResizable); + DEFINE_GSUBR ("IrrlichtDevice_setWindowCaption", 2, 0, 0, IrrlichtDevice_setWindowCaption); + DEFINE_GSUBR ("IrrlichtDevice_yield", 1, 0, 0, IrrlichtDevice_yield); }