LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02: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/common/Data.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
src/common/EnumMap.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_ENUM_MAP_H
src/common/Exception.cpp
+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
src/common/Exception.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
src/common/Matrix.cpp
+16 -7
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
@@ -118,12 +118,21 @@ namespace love
void Matrix::setTransformation(float x, float y, float angle, float sx, float sy, float ox, float oy)
{
// TODO: This works fine, but should consider speeding this up a little.
setIdentity();
translate(x, y);
rotate(angle);
scale(sx, sy);
translate(-ox, -oy);
memset(e, 0, sizeof(float)*16); // zero out matrix
float c = cos(angle), s = sin(angle);
// matrix multiplication carried out on paper:
// |1 x| |c -s | |sx | |1 -ox|
// | 1 y| |s c | | sy | | 1 -oy|
// | 1 | | 1 | | 1 | | 1 |
// | 1| | 1| | 1| | 1 |
// move rotate scale origin
e[10] = e[15] = 1.0f;
e[0] = sx * c;
e[1] = sx * s;
e[4] = -sy * s;
e[5] = sy * c;
e[12] = -ox * e[0] - oy * e[4] + x;
e[13] = -ox * e[1] - oy * e[5] + y;
}
void Matrix::translate(float x, float y)
src/common/Matrix.h
+9 -9
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,15 +16,15 @@
* 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_MATRIX_H
#define LOVE_MATRIX_H
// LOVE
#include "math.h"
namespace love
#define LOVE_MATRIX_H
// LOVE
#include "math.h"
namespace love
{
/**
* This class is the basis for all transformations in LOVE. Althought not
src/common/MemoryData.cpp
+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
src/common/MemoryData.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
src/common/Module.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_MODULE_H
src/common/Object.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.
**/
// LOVE
src/common/Object.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_OBJECT_H
src/common/Reference.cpp
+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
src/common/Reference.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_REFERENCE_H
src/common/StringMap.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
src/common/Vector.cpp
+2 -2
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,7 +16,7 @@
* 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 "Vector.h"
src/common/Vector.h
+11 -11
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,18 +16,18 @@
* 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_VECTOR_H
#define LOVE_VECTOR_H
#define LOVE_VECTOR_H
// STD
#include <cmath>
// LOVE
#include "Matrix.h"
namespace love
#include <cmath>
// LOVE
#include "Matrix.h"
namespace love
{
/**
* 2D Vector class.
src/common/b64.cpp
+39 -39
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
@@ -24,11 +24,11 @@ namespace love
{
static const char cd64[]="|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW$$$$$$XYZ[\\]^_`abcdefghijklmnopq";
void b64_decode_block(char in[4], char out[3])
{
out[0] = (char)(in[0] << 2 | in[1] >> 4);
out[1] = (char)(in[1] << 4 | in[2] >> 2);
out[2] = (char)(((in[2] << 6) & 0xc0) | in[3]);
void b64_decode_block(char in[4], char out[3])
{
out[0] = (char)(in[0] << 2 | in[1] >> 4);
out[1] = (char)(in[1] << 4 | in[2] >> 2);
out[2] = (char)(((in[2] << 6) & 0xc0) | in[3]);
}
char * b64_decode(const char * src, int slen, int & size)
@@ -38,39 +38,39 @@ namespace love
char * dst = new char[size];
char * d = dst;
char in[4], out[3], v;
int i, len, pos = 0;
while(pos <= slen)
{
for(len = 0, i = 0; i < 4 && pos <= slen; i++ )
{
v = 0;
while(pos <= slen && v == 0 )
{
v = src[pos++];
v = (char)((v < 43 || v > 122) ? 0 : cd64[v - 43]);
if(v)
v = (char)((v == '$') ? 0 : v - 61);
}
if(pos <= slen)
{
len++;
if(v)
in[i] = (char)(v - 1);
}
else
in[i] = 0;
}
if(len) {
b64_decode_block(in, out);
for(i = 0; i < len - 1; i++)
*(d++) = out[i];
}
}
char in[4], out[3], v;
int i, len, pos = 0;
while(pos <= slen)
{
for(len = 0, i = 0; i < 4 && pos <= slen; i++ )
{
v = 0;
while(pos <= slen && v == 0 )
{
v = src[pos++];
v = (char)((v < 43 || v > 122) ? 0 : cd64[v - 43]);
if(v)
v = (char)((v == '$') ? 0 : v - 61);
}
if(pos <= slen)
{
len++;
if(v)
in[i] = (char)(v - 1);
}
else
in[i] = 0;
}
if(len) {
b64_decode_block(in, out);
for(i = 0; i < len - 1; i++)
*(d++) = out[i];
}
}
return dst;
}
src/common/b64.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
src/common/config.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
src/common/math.h
+9 -9
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,9 +16,9 @@
* 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_MATH_H
**/
#ifndef LOVE_MATH_H
#define LOVE_MATH_H
/* Definitions of useful mathematical constants
@@ -58,11 +58,11 @@
namespace love
{
struct vertex
{
unsigned char r, g, b, a;
float x, y;
float s, t;
struct vertex
{
unsigned char r, g, b, a;
float x, y;
float s, t;
};
} // love
src/common/runtime.cpp
+2 -2
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
@@ -98,7 +98,7 @@ namespace love
bool luax_toboolean(lua_State * L, int idx)
{
return (lua_toboolean(L, idx) == 1 ? true : false);
return (lua_toboolean(L, idx) != 0);
}
void luax_pushboolean(lua_State * L, bool b)
src/common/runtime.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
src/common/types.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
src/common/utf8.cpp
+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
src/common/utf8.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
src/common/version.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
src/common/wrap_Data.cpp
+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
src/common/wrap_Data.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
src/libraries/luasocket/luasocket.cpp
+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
src/libraries/luasocket/luasocket.h
+2 -2
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,7 +16,7 @@
* 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_LUASOCKET_LUASOCKET_H
#define LOVE_LUASOCKET_LUASOCKET_H
src/love.cpp
+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
src/modules/audio/Audio.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
src/modules/audio/Source.cpp
+27 -27
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,40 +16,40 @@
* 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 "Source.h"
namespace love
{
namespace audio
{
Source::Source(Type type)
: type(type)
{
}
Source::~Source()
{
}
**/
#include "Source.h"
namespace love
{
namespace audio
{
Source::Source(Type type)
: type(type)
{
}
Source::~Source()
{
}
bool Source::getConstant(const char * in, Type & out)
{
return types.find(in, out);
}
bool Source::getConstant(Type in, const char *& out)
{
return types.find(in, out);
}
bool Source::getConstant(Type in, const char *& out)
{
return types.find(in, out);
}
StringMap<Source::Type, Source::TYPE_MAX_ENUM>::Entry Source::typeEntries[] =
{
{"static", Source::TYPE_STATIC},
{"stream", Source::TYPE_STREAM},
};
StringMap<Source::Type, Source::TYPE_MAX_ENUM> Source::types(Source::typeEntries, sizeof(Source::typeEntries));
} // audio
} // love
StringMap<Source::Type, Source::TYPE_MAX_ENUM> Source::types(Source::typeEntries, sizeof(Source::typeEntries));
} // audio
} // love
src/modules/audio/Source.h
+3 -3
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,8 +16,8 @@
* 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_AUDIO_SOURCE_H
#define LOVE_AUDIO_SOURCE_H
src/modules/audio/null/Audio.cpp
+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
src/modules/audio/null/Audio.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
src/modules/audio/null/Source.cpp
+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
src/modules/audio/null/Source.h
+4 -4
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,8 +16,8 @@
* 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_AUDIO_NULL_SOURCE_H
#define LOVE_AUDIO_NULL_SOURCE_H
@@ -62,7 +62,7 @@ namespace null
virtual void setVelocity(float * v);
virtual void getVelocity(float * v) const;
virtual void setDirection(float * v);
virtual void getDirection(float * v) const;
virtual void getDirection(float * v) const;
void setLooping(bool looping);
bool isLooping() const;
bool isStatic() const;
src/modules/audio/openal/Audio.cpp
+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
src/modules/audio/openal/Audio.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
src/modules/audio/openal/Pool.cpp
+22 -22
View File
@@ -1,32 +1,32 @@
/**
* 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 "Pool.h"
#include "Source.h"
#define MUTEX_ASSERT(fn, sval) \
if(fn != sval) \
{ \
#define MUTEX_ASSERT(fn, sval) \
if(fn != sval) \
{ \
std::cout << "Mutex lock/unlock failure. " << SDL_GetError() << std::endl; \
exit(-1); \
exit(-1); \
} \
#define LOCK(m) MUTEX_ASSERT(SDL_LockMutex(m), 0)
src/modules/audio/openal/Pool.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
src/modules/audio/openal/Source.cpp
+3 -2
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
@@ -82,7 +82,8 @@ namespace openal
void Source::stop()
{
pool->stop(this);
if (!isStopped())
pool->stop(this);
}
void Source::pause()
src/modules/audio/openal/Source.h
+20 -20
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
@@ -70,27 +70,27 @@ namespace openal
Source(Pool * pool, love::sound::Decoder * decoder);
virtual ~Source();
virtual love::audio::Source * copy();
virtual void play();
virtual void stop();
virtual void pause();
virtual void resume();
virtual void rewind();
virtual love::audio::Source * copy();
virtual void play();
virtual void stop();
virtual void pause();
virtual void resume();
virtual void rewind();
virtual bool isStopped() const;
virtual bool isPaused() const;
virtual bool isFinished() const;
virtual void update();
virtual void setPitch(float pitch);
virtual float getPitch() const;
virtual void setVolume(float volume);
virtual float getVolume() const;
virtual void setPosition(float * v);
virtual void getPosition(float * v) const;
virtual void setVelocity(float * v);
virtual void getVelocity(float * v) const;
virtual void setDirection(float * v);
virtual bool isPaused() const;
virtual bool isFinished() const;
virtual void update();
virtual void setPitch(float pitch);
virtual float getPitch() const;
virtual void setVolume(float volume);
virtual float getVolume() const;
virtual void setPosition(float * v);
virtual void getPosition(float * v) const;
virtual void setVelocity(float * v);
virtual void getVelocity(float * v) const;
virtual void setDirection(float * v);
virtual void getDirection(float * v) const;
void setLooping(bool looping);
void setLooping(bool looping);
bool isLooping() const;
bool isStatic() const;
src/modules/audio/wrap_Audio.cpp
+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
src/modules/audio/wrap_Audio.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
src/modules/audio/wrap_Source.cpp
+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
src/modules/audio/wrap_Source.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
src/modules/event/Event.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 "Event.h"
src/modules/event/Event.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_EVENT_EVENT_H
src/modules/event/sdl/Event.cpp
+2 -2
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
@@ -99,7 +99,7 @@ namespace sdl
case SDL_ACTIVEEVENT:
if (e.active.state & SDL_APPINPUTFOCUS) {
m.type = Event::TYPE_FOCUS;
m.focus.f = e.active.gain;
m.focus.f = (e.active.gain != 0);
return true;
} else break;
case SDL_QUIT:
src/modules/event/sdl/Event.h
+28 -28
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_EVENT_SDL_EVENT_H
@@ -26,7 +26,7 @@
#include <common/runtime.h>
#include <common/EnumMap.h>
// SDL
// SDL
#include <SDL.h>
namespace love
@@ -64,15 +64,15 @@ namespace sdl
* the screen and game state only needs updating when the user interacts with
* the window.
**/
bool wait(Message & message);
/**
* Push a message onto the event queue.
*
* @param message The message to push onto the queue.
* @return True on success, false if the queue was full.
**/
bool push(Message & message);
bool wait(Message & message);
/**
* Push a message onto the event queue.
*
* @param message The message to push onto the queue.
* @return True on success, false if the queue was full.
**/
bool push(Message & message);
private:
src/modules/event/sdl/wrap_Event.cpp
+2 -2
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
@@ -65,7 +65,7 @@ namespace sdl
msg.joystick.button = luaL_checkint(L, 3);
return true;
case Event::TYPE_FOCUS:
msg.focus.f = lua_toboolean(L, 2);
msg.focus.f = luax_toboolean(L, 2);
return true;
case Event::TYPE_QUIT:
return true;
src/modules/event/sdl/wrap_Event.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
src/modules/filesystem/File.cpp
+20 -20
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
@@ -26,27 +26,27 @@ namespace filesystem
{
File::~File()
{
}
bool File::getConstant(const char * in, Mode & out)
{
return modes.find(in, out);
}
bool File::getConstant(Mode in, const char *& out)
{
return modes.find(in, out);
}
StringMap<File::Mode, File::MODE_MAX_ENUM>::Entry File::modeEntries[] =
{
{"c", File::CLOSED},
}
bool File::getConstant(const char * in, Mode & out)
{
return modes.find(in, out);
}
bool File::getConstant(Mode in, const char *& out)
{
return modes.find(in, out);
}
StringMap<File::Mode, File::MODE_MAX_ENUM>::Entry File::modeEntries[] =
{
{"c", File::CLOSED},
{"r", File::READ},
{"w", File::WRITE},
{"a", File::APPEND},
};
StringMap<File::Mode, File::MODE_MAX_ENUM> File::modes(File::modeEntries, sizeof(File::modeEntries));
{"a", File::APPEND},
};
StringMap<File::Mode, File::MODE_MAX_ENUM> File::modes(File::modeEntries, sizeof(File::modeEntries));
} // filesystem
} // love
src/modules/filesystem/File.h
+7 -7
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
@@ -160,12 +160,12 @@ namespace filesystem
**/
virtual std::string getExtension() const = 0;
static bool getConstant(const char * in, Mode & out);
static bool getConstant(Mode in, const char *& out);
private:
static StringMap<Mode, MODE_MAX_ENUM>::Entry modeEntries[];
static bool getConstant(const char * in, Mode & out);
static bool getConstant(Mode in, const char *& out);
private:
static StringMap<Mode, MODE_MAX_ENUM>::Entry modeEntries[];
static StringMap<Mode, MODE_MAX_ENUM> modes;
}; // File
src/modules/filesystem/FileData.cpp
+15 -15
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
@@ -59,22 +59,22 @@ namespace filesystem
return extension;
}
bool FileData::getConstant(const char * in, Decoder & out)
{
return decoders.find(in, out);
}
bool FileData::getConstant(Decoder in, const char *& out)
{
return decoders.find(in, out);
bool FileData::getConstant(const char * in, Decoder & out)
{
return decoders.find(in, out);
}
StringMap<FileData::Decoder, FileData::DECODE_MAX_ENUM>::Entry FileData::decoderEntries[] =
{
{"file", FileData::FILE},
{"base64", FileData::BASE64},
};
bool FileData::getConstant(Decoder in, const char *& out)
{
return decoders.find(in, out);
}
StringMap<FileData::Decoder, FileData::DECODE_MAX_ENUM>::Entry FileData::decoderEntries[] =
{
{"file", FileData::FILE},
{"base64", FileData::BASE64},
};
StringMap<FileData::Decoder, FileData::DECODE_MAX_ENUM> FileData::decoders(FileData::decoderEntries, sizeof(FileData::decoderEntries));
} // filesystem
src/modules/filesystem/FileData.h
+3 -3
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
@@ -66,12 +66,12 @@ namespace filesystem
const std::string & getFilename() const;
const std::string & getExtension() const;
static bool getConstant(const char * in, Decoder & out);
static bool getConstant(const char * in, Decoder & out);
static bool getConstant(Decoder in, const char *& out);
private:
static StringMap<Decoder, DECODE_MAX_ENUM>::Entry decoderEntries[];
static StringMap<Decoder, DECODE_MAX_ENUM>::Entry decoderEntries[];
static StringMap<Decoder, DECODE_MAX_ENUM> decoders;
}; // FileData
src/modules/filesystem/physfs/File.cpp
+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
src/modules/filesystem/physfs/File.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
src/modules/filesystem/physfs/Filesystem.cpp
+15 -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
@@ -557,6 +557,20 @@ namespace physfs
}
}
int Filesystem::getLastModified(lua_State * L)
{
const char * filename = luaL_checkstring(L, 1);
PHYSFS_sint64 time = PHYSFS_getLastModTime(filename);
if (time == -1)
{
lua_pushnil(L);
lua_pushstring(L, "Could not determine file modification date.");
return 2;
}
lua_pushnumber(L, static_cast<lua_Number>(time));
return 1;
}
} // physfs
} // filesystem
} // love
src/modules/filesystem/physfs/Filesystem.h
+3 -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
@@ -278,6 +278,8 @@ namespace physfs
**/
int load(lua_State * L);
int getLastModified(lua_State * L);
}; // Filesystem
} // physfs
src/modules/filesystem/physfs/wrap_File.cpp
+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
src/modules/filesystem/physfs/wrap_File.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
src/modules/filesystem/physfs/wrap_FileData.cpp
+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
src/modules/filesystem/physfs/wrap_FileData.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
src/modules/filesystem/physfs/wrap_Filesystem.cpp
+7 -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
@@ -221,6 +221,11 @@ namespace physfs
return instance->load(L);
}
int w_getLastModified(lua_State * L)
{
return instance->getLastModified(L);
}
int loader(lua_State * L)
{
const char * filename = lua_tostring(L, -1);
@@ -297,6 +302,7 @@ namespace physfs
{ "enumerate", w_enumerate },
{ "lines", w_lines },
{ "load", w_load },
{ "getLastModified", w_getLastModified },
{ "newFileData", w_newFileData },
{ 0, 0 }
};
src/modules/filesystem/physfs/wrap_Filesystem.h
+2 -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
@@ -57,6 +57,7 @@ namespace physfs
int w_enumerate(lua_State * L);
int w_lines(lua_State * L);
int w_load(lua_State * L);
int w_getLastModified(lua_State * L);
int loader(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_filesystem(lua_State * L);
src/modules/font/Font.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
src/modules/font/FontData.cpp
+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
src/modules/font/FontData.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
src/modules/font/GlyphData.cpp
+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
src/modules/font/GlyphData.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
src/modules/font/ImageRasterizer.cpp
+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
src/modules/font/ImageRasterizer.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
src/modules/font/Rasterizer.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.
**/
// LOVE
src/modules/font/Rasterizer.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
src/modules/font/freetype/Font.cpp
+2 -2
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
@@ -50,7 +50,7 @@ namespace freetype
int length = glyphs.size();
unsigned short * g = new unsigned short[length];
for (int i = 0; i < length; i++) {
g[i] = glyphs[i];
g[i] = (unsigned char)glyphs[i];
}
Rasterizer * r = newRasterizer(data, g, length);
delete [] g;
src/modules/font/freetype/Font.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
src/modules/font/freetype/TrueTypeRasterizer.cpp
+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
src/modules/font/freetype/TrueTypeRasterizer.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
src/modules/font/freetype/wrap_Font.cpp
+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
src/modules/font/freetype/wrap_Font.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
src/modules/font/wrap_FontData.cpp
+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
src/modules/font/wrap_FontData.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
src/modules/font/wrap_GlyphData.cpp
+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
src/modules/font/wrap_GlyphData.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
src/modules/font/wrap_Rasterizer.cpp
+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
src/modules/font/wrap_Rasterizer.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
src/modules/graphics/Drawable.cpp
+16 -16
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,18 +16,18 @@
* 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 "Drawable.h"
namespace love
{
namespace graphics
{
Drawable::~Drawable()
{
}
} // graphics
} // love
**/
#include "Drawable.h"
namespace love
{
namespace graphics
{
Drawable::~Drawable()
{
}
} // graphics
} // love
src/modules/graphics/Drawable.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_GRAPHICS_DRAWABLE_H
src/modules/graphics/Graphics.cpp
+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
src/modules/graphics/Graphics.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_GRAPHICS_GRAPHICS_H
src/modules/graphics/Image.cpp
+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
src/modules/graphics/Image.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
src/modules/graphics/Volatile.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 "Volatile.h"
src/modules/graphics/Volatile.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_GRAPHICS_VOLATILE_H
src/modules/graphics/opengl/Font.cpp
+12 -16
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
@@ -31,8 +31,8 @@ namespace graphics
namespace opengl
{
Font::Font(love::font::FontData * data)
: height(data->getHeight()), lineHeight(1.25), mSpacing(1)
Font::Font(love::font::FontData * data, const Image::Filter& filter)
: height(data->getHeight()), lineHeight(1), mSpacing(1)
{
glyphs = new Glyph*[MAX_CHARS];
type = FONT_UNKNOWN;
@@ -41,7 +41,7 @@ namespace opengl
for(unsigned int i = 0; i < MAX_CHARS; i++)
{
gd = data->getGlyphData(i);
glyphs[i] = new Glyph(gd);
glyphs[i] = new Glyph(gd, filter);
glyphs[i]->load();
widths[i] = gd->getWidth();
spacing[i] = gd->getAdvance();
@@ -62,12 +62,7 @@ namespace opengl
float Font::getHeight() const
{
return height / lineHeight;
}
void Font::print(std::string text, float x, float y) const
{
print(text, x, y, 0.0f, 1.0f, 1.0f);
return static_cast<float>(height);
}
void Font::print(std::string text, float x, float y, float angle, float sx, float sy) const
@@ -81,16 +76,17 @@ namespace opengl
for (unsigned int i = 0; i < text.size(); i++) {
unsigned char g = (unsigned char)text[i];
if (g == '\n') { // wrap newline, but do not print it
glTranslatef(-dx, floor(getHeight() + 0.5f), 0);
glTranslatef(-dx, floor(getHeight() * getLineHeight() + 0.5f), 0);
dx = 0.0f;
continue;
}
if (!glyphs[g]) g = 32; // space
glPushMatrix();
if (type == FONT_TRUETYPE) glTranslatef(0, floor(getHeight() + 0.5f), 0);
// 1.25 is magic line height for true type fonts
if (type == FONT_TRUETYPE) glTranslatef(0, floor(getHeight() / 1.25f + 0.5f), 0);
glyphs[g]->draw(0, 0, 0, 1, 1, 0, 0);
glPopMatrix();
glTranslatef(spacing[g], 0, 0);
glTranslatef(static_cast<GLfloat>(spacing[g]), 0, 0);
dx += spacing[g];
}
glPopMatrix();
@@ -98,7 +94,7 @@ namespace opengl
void Font::print(char character, float x, float y) const
{
if (!glyphs[character]) character = ' ';
if (!glyphs[(int)character]) character = ' ';
glPushMatrix();
glTranslatef(x, floor(y+getHeight() + 0.5f), 0.0f);
glCallList(list+character);
@@ -112,7 +108,7 @@ namespace opengl
for(unsigned int i = 0; i < line.size(); i++)
{
temp += (spacing[(int)line[i]] * mSpacing);
temp += static_cast<int>((spacing[(int)line[i]] * mSpacing));
}
return temp;
@@ -148,7 +144,7 @@ namespace opengl
temp = getWidth(text);
linen++;
}
temp += (spacing[(int)line[i]] * mSpacing);
temp += static_cast<int>((spacing[(int)line[i]] * mSpacing));
text += line[i];
}
src/modules/graphics/opengl/Font.h
+4 -12
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
@@ -27,6 +27,7 @@
// LOVE
#include <common/Object.h>
#include <font/FontData.h>
#include <graphics/Image.h>
#include "Glyph.h"
namespace love
@@ -69,19 +70,10 @@ namespace opengl
*
* @param data The font data to construct from.
**/
Font(love::font::FontData * data);
Font(love::font::FontData * data, const Image::Filter& filter = Image::Filter());
virtual ~Font();
/**
* Prints the text at the designated position.
*
* @param text A string.
* @param x The x-coordinate.
* @param y The y-coordinate.
**/
void print(std::string text, float x, float y) const;
/**
* Prints the text at the designated position with rotation and scaling.
*
@@ -90,7 +82,7 @@ namespace opengl
* @param y The y-coordinate.
* @param angle The amount of rotation.
**/
void print(std::string text, float x, float y, float angle, float sx, float sy) const;
void print(std::string text, float x, float y, float angle = 0.0f, float sx = 1.0f, float sy = 1.0f) const;
/**
* Prints the character at the designated position.
src/modules/graphics/opengl/Framebuffer.cpp
+36 -4
View File
@@ -146,11 +146,14 @@ namespace opengl
{
strategy = NULL;
float w = static_cast<float>(width);
float h = static_cast<float>(height);
// world coordinates
vertices[0].x = 0; vertices[0].y = 0;
vertices[1].x = 0; vertices[1].y = height;
vertices[2].x = width; vertices[2].y = height;
vertices[3].x = width; vertices[3].y = 0;
vertices[1].x = 0; vertices[1].y = h;
vertices[2].x = w; vertices[2].y = h;
vertices[3].x = w; vertices[3].y = 0;
// texture coordinates
vertices[0].s = 0; vertices[0].t = 1;
@@ -282,15 +285,44 @@ namespace opengl
return img;
}
void Framebuffer::setFilter(Image::Filter f)
{
GLint gmin = (f.min == Image::FILTER_NEAREST) ? GL_NEAREST : GL_LINEAR;
GLint gmag = (f.mag == Image::FILTER_NEAREST) ? GL_NEAREST : GL_LINEAR;
glBindTexture(GL_TEXTURE_2D, img);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gmin);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gmag);
}
Image::Filter Framebuffer::getFilter() const
{
GLint gmin, gmag;
glBindTexture(GL_TEXTURE_2D, img);
glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, &gmin);
glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &gmag);
Image::Filter f;
f.min = (gmin == GL_NEAREST) ? Image::FILTER_NEAREST : Image::FILTER_LINEAR;
f.mag = (gmag == GL_NEAREST) ? Image::FILTER_NEAREST : Image::FILTER_LINEAR;
return f;
}
bool Framebuffer::loadVolatile()
{
status = strategy->createFBO(fbo, depthbuffer, img, width, height);
if (status == GL_FRAMEBUFFER_COMPLETE)
setFilter(settings.filter);
return (status == GL_FRAMEBUFFER_COMPLETE);
}
void Framebuffer::unloadVolatile()
{
settings.filter = getFilter();
strategy->deleteFBO(fbo, depthbuffer, img);
}

Some files were not shown because too many files have changed in this diff Show More