LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'default' into 'minor'

Browse Source 
--HG--
branch : minor
This commit is contained in:
Bart van Strien
2011-01-17 11:08:58 +01:00
parent 6acacffb66 98406370eb
commit 677df8d4f0
267 changed files with 3612 additions and 3674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/Joystick.cpp
+18 -18
View File
@@ -1,21 +1,21 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
/**
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#include "Joystick.h"
src/modules/joystick/Joystick.h
+18 -18
View File
@@ -1,21 +1,21 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
/**
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#ifndef LOVE_JOYSTICK_JOYSTICK_H
src/modules/joystick/sdl/Joystick.cpp
+46 -48
View File
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -16,26 +16,26 @@
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#include "Joystick.h"
**/
#include "Joystick.h"
// STD
#include <cmath>
namespace love
{
namespace joystick
{
namespace sdl
{
Joystick::Joystick()
: joysticks(0)
{
#include <cmath>
namespace love
{
namespace joystick
{
namespace sdl
{
Joystick::Joystick()
: joysticks(0)
{
// Init the SDL joystick system.
if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
throw Exception(SDL_GetError());
throw Exception(SDL_GetError());
// Start joystick event watching.
SDL_JoystickEventState(SDL_ENABLE);
@@ -44,11 +44,11 @@ namespace sdl
this->joysticks = (SDL_Joystick **)calloc(numjoysticks, sizeof(SDL_Joystick*));
for(int i = 0;i<numjoysticks;i++)
this->open(i);
}
Joystick::~Joystick()
{
this->open(i);
}
Joystick::~Joystick()
{
// Closes any open joysticks.
for(int i = 0; i != getNumJoysticks(); i++)
{
@@ -58,25 +58,23 @@ namespace sdl
free(joysticks);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
}
const char * Joystick::getName() const
{
return "love.joystick.sdl";
}
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
}
const char * Joystick::getName() const
{
return "love.joystick.sdl";
}
bool Joystick::checkIndex(int index)
{
if(index < getNumJoysticks())
return true;
else
return false;
return index >= 0 && index < getNumJoysticks();
}
int Joystick::getNumJoysticks()
{
return SDL_NumJoysticks();
int num = SDL_NumJoysticks();
return num < 0 ? 0 : num;
}
const char * Joystick::getName(int index)
@@ -227,10 +225,10 @@ namespace sdl
SDL_JoystickClose(joysticks[index]);
joysticks[index] = 0;
}
}
EnumMap<Joystick::Hat, Uint8, Joystick::HAT_MAX_ENUM>::Entry Joystick::hatEntries[] =
{
}
EnumMap<Joystick::Hat, Uint8, Joystick::HAT_MAX_ENUM>::Entry Joystick::hatEntries[] =
{
{Joystick::HAT_CENTERED, SDL_HAT_CENTERED},
{Joystick::HAT_UP, SDL_HAT_UP},
{Joystick::HAT_RIGHT, SDL_HAT_RIGHT},
@@ -239,11 +237,11 @@ namespace sdl
{Joystick::HAT_RIGHTUP, SDL_HAT_RIGHTUP},
{Joystick::HAT_RIGHTDOWN, SDL_HAT_RIGHTDOWN},
{Joystick::HAT_LEFTUP, SDL_HAT_LEFTUP},
{Joystick::HAT_LEFTDOWN, SDL_HAT_LEFTDOWN},
};
EnumMap<Joystick::Hat, Uint8, Joystick::HAT_MAX_ENUM> Joystick::hats(Joystick::hatEntries, sizeof(Joystick::hatEntries));
} // sdl
} // joystick
} // love
{Joystick::HAT_LEFTDOWN, SDL_HAT_LEFTDOWN},
};
EnumMap<Joystick::Hat, Uint8, Joystick::HAT_MAX_ENUM> Joystick::hats(Joystick::hatEntries, sizeof(Joystick::hatEntries));
} // sdl
} // joystick
} // love
src/modules/joystick/sdl/Joystick.h
+35 -35
View File
@@ -1,21 +1,21 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
/**
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#ifndef LOVE_JOYSTICK_SDL_JOYSTICK_H
@@ -25,7 +25,7 @@
#include <joystick/Joystick.h>
#include <common/EnumMap.h>
// SDL
// SDL
#include <SDL.h>
namespace love
@@ -45,22 +45,22 @@ namespace sdl
// Implements Module.
const char * getName() const;
bool checkIndex(int index);
int getNumJoysticks();
const char * getName(int index);
bool open(int index);
bool isOpen(int index);
bool verifyJoystick(int index);
int getNumAxes(int index);
int getNumBalls(int index);
int getNumButtons(int index);
int getNumHats(int index);
float clampval(float x);
float getAxis(int index, int axis);
int getAxes(lua_State * L);
int getBall(lua_State * L);
bool isDown(int index, int button);
Hat getHat(int index, int hat);
bool checkIndex(int index);
int getNumJoysticks();
const char * getName(int index);
bool open(int index);
bool isOpen(int index);
bool verifyJoystick(int index);
int getNumAxes(int index);
int getNumBalls(int index);
int getNumButtons(int index);
int getNumHats(int index);
float clampval(float x);
float getAxis(int index, int axis);
int getAxes(lua_State * L);
int getBall(lua_State * L);
bool isDown(int index, int button);
Hat getHat(int index, int hat);
void close(int index);
private:
src/modules/joystick/sdl/wrap_Joystick.cpp
+8 -8
View File
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -168,13 +168,13 @@ namespace sdl
instance->retain();
WrappedModule w;
w.module = instance;
w.name = "joystick";
w.flags = MODULE_T;
w.functions = functions;
w.types = 0;
WrappedModule w;
w.module = instance;
w.name = "joystick";
w.flags = MODULE_T;
w.functions = functions;
w.types = 0;
return luax_register_module(L, w);
}
src/modules/joystick/sdl/wrap_Joystick.h
+1 -1
View File
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages