mirror of
https://github.com/love2d/love.git
synced 2026-08-15 15:51:12 +02:00
Merged SDL2 changes from bartbes/love-experiments/SDL2 into default.
- Added love.system module, including clipboard functions. - Added custom hardware cursors (love.mouse.newCursor, love.mouse.setCursor.) - Revamped love.joystick: -- added Joystick objects and moved love.joystick functions which operated on individual joysticks to methods on the Joystick objects. -- Added love.joystick.getJoystick and love.joystick.getJoystickCount. -- Added events for when joysticks are connected and disconnected. -- Added 'Gamepad' methods to Joystick objects: Joystick:isGamepad, Joystick:getGamepadAxis, and Joystick:isGamepadDown. They're a common abstraction for xbox controller-like joystick across operating systems. - Added monitor choosing support and "fullscreen desktop" mode to love.window. - Moved unicode text input events to their own callback function (love.textinput), removed the key repeat functions from love.keyboard and made the second argument of love.keypressed a boolean saying whether the keypress was a repeat. - liblove now works with love.window and love.graphics in OS X
This commit is contained in:
@@ -18,16 +18,20 @@
|
||||
* 3. This notice may not be removed or altered from any source distribution.
|
||||
**/
|
||||
|
||||
// LOVE
|
||||
#include "wrap_ThreadModule.h"
|
||||
#include "wrap_LuaThread.h"
|
||||
#include "wrap_Channel.h"
|
||||
#include <filesystem/File.h>
|
||||
#include <filesystem/FileData.h>
|
||||
#include "ThreadModule.h"
|
||||
|
||||
#include "filesystem/File.h"
|
||||
#include "filesystem/FileData.h"
|
||||
|
||||
namespace love
|
||||
{
|
||||
namespace thread
|
||||
{
|
||||
|
||||
static ThreadModule *instance = 0;
|
||||
|
||||
int w_newThread(lua_State *L)
|
||||
@@ -89,7 +93,7 @@ extern "C" int luaopen_love_thread(lua_State *L)
|
||||
{
|
||||
try
|
||||
{
|
||||
instance = new ThreadModule();
|
||||
instance = new love::thread::ThreadModule();
|
||||
}
|
||||
catch (Exception & e)
|
||||
{
|
||||
@@ -108,5 +112,6 @@ extern "C" int luaopen_love_thread(lua_State *L)
|
||||
|
||||
return luax_register_module(L, w);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // thread
|
||||
} // love
|
||||
|
||||
Reference in New Issue
Block a user