mirror of
https://github.com/love2d/love.git
synced 2026-08-16 00:02: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:
@@ -51,7 +51,7 @@ bool Thread::start()
|
||||
return false;
|
||||
if (thread) // Clean old handle up
|
||||
SDL_WaitThread(thread, 0);
|
||||
thread = SDL_CreateThread(thread_runner, this);
|
||||
thread = SDL_CreateThread(thread_runner, NULL, this);
|
||||
running = (thread != 0);
|
||||
return running;
|
||||
}
|
||||
|
||||
@@ -39,12 +39,12 @@ Mutex::~Mutex()
|
||||
|
||||
void Mutex::lock()
|
||||
{
|
||||
SDL_mutexP(mutex);
|
||||
SDL_LockMutex(mutex);
|
||||
}
|
||||
|
||||
void Mutex::unlock()
|
||||
{
|
||||
SDL_mutexV(mutex);
|
||||
SDL_UnlockMutex(mutex);
|
||||
}
|
||||
|
||||
Conditional::Conditional()
|
||||
|
||||
Reference in New Issue
Block a user