mirror of
https://github.com/love2d/love-android.git
synced 2026-08-18 11:44:13 +02:00
Using latest android branch of LÖVE (6d14516b05c9) that now syncs with default (woooo!)
This commit is contained in:
fysx
+121
-47
@@ -32,17 +32,17 @@ namespace love
|
||||
// | e2 e6 e10 e14 |
|
||||
// | e3 e7 e11 e15 |
|
||||
|
||||
Matrix::Matrix()
|
||||
Matrix4::Matrix4()
|
||||
{
|
||||
setIdentity();
|
||||
}
|
||||
|
||||
Matrix::Matrix(float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky)
|
||||
Matrix4::Matrix4(float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky)
|
||||
{
|
||||
setTransformation(x, y, angle, sx, sy, ox, oy, kx, ky);
|
||||
}
|
||||
|
||||
Matrix::~Matrix()
|
||||
Matrix4::~Matrix4()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -55,9 +55,9 @@ Matrix::~Matrix()
|
||||
// | e2 e6 e10 e14 |
|
||||
// | e3 e7 e11 e15 |
|
||||
|
||||
Matrix Matrix::operator * (const Matrix &m) const
|
||||
Matrix4 Matrix4::operator * (const Matrix4 &m) const
|
||||
{
|
||||
Matrix t;
|
||||
Matrix4 t;
|
||||
|
||||
t.e[0] = (e[0]*m.e[0]) + (e[4]*m.e[1]) + (e[8]*m.e[2]) + (e[12]*m.e[3]);
|
||||
t.e[4] = (e[0]*m.e[4]) + (e[4]*m.e[5]) + (e[8]*m.e[6]) + (e[12]*m.e[7]);
|
||||
@@ -82,31 +82,31 @@ Matrix Matrix::operator * (const Matrix &m) const
|
||||
return t;
|
||||
}
|
||||
|
||||
void Matrix::operator *= (const Matrix &m)
|
||||
void Matrix4::operator *= (const Matrix4 &m)
|
||||
{
|
||||
Matrix t = (*this) * m;
|
||||
memcpy((void *)this->e, (void *)t.e, sizeof(float)*16);
|
||||
Matrix4 t = (*this) * m;
|
||||
memcpy(this->e, t.e, sizeof(float)*16);
|
||||
}
|
||||
|
||||
const float *Matrix::getElements() const
|
||||
const float *Matrix4::getElements() const
|
||||
{
|
||||
return e;
|
||||
}
|
||||
|
||||
void Matrix::setIdentity()
|
||||
void Matrix4::setIdentity()
|
||||
{
|
||||
memset(e, 0, sizeof(float)*16);
|
||||
e[0] = e[5] = e[10] = e[15] = 1;
|
||||
}
|
||||
|
||||
void Matrix::setTranslation(float x, float y)
|
||||
void Matrix4::setTranslation(float x, float y)
|
||||
{
|
||||
setIdentity();
|
||||
e[12] = x;
|
||||
e[13] = y;
|
||||
}
|
||||
|
||||
void Matrix::setRotation(float rad)
|
||||
void Matrix4::setRotation(float rad)
|
||||
{
|
||||
setIdentity();
|
||||
float c = cosf(rad), s = sinf(rad);
|
||||
@@ -116,21 +116,21 @@ void Matrix::setRotation(float rad)
|
||||
e[5] = c;
|
||||
}
|
||||
|
||||
void Matrix::setScale(float sx, float sy)
|
||||
void Matrix4::setScale(float sx, float sy)
|
||||
{
|
||||
setIdentity();
|
||||
e[0] = sx;
|
||||
e[5] = sy;
|
||||
}
|
||||
|
||||
void Matrix::setShear(float kx, float ky)
|
||||
void Matrix4::setShear(float kx, float ky)
|
||||
{
|
||||
setIdentity();
|
||||
e[1] = ky;
|
||||
e[4] = kx;
|
||||
}
|
||||
|
||||
void Matrix::setTransformation(float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky)
|
||||
void Matrix4::setTransformation(float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky)
|
||||
{
|
||||
memset(e, 0, sizeof(float)*16); // zero out matrix
|
||||
float c = cosf(angle), s = sinf(angle);
|
||||
@@ -149,59 +149,37 @@ void Matrix::setTransformation(float x, float y, float angle, float sx, float sy
|
||||
e[13] = y - ox * e[1] - oy * e[5];
|
||||
}
|
||||
|
||||
void Matrix::translate(float x, float y)
|
||||
void Matrix4::translate(float x, float y)
|
||||
{
|
||||
Matrix t;
|
||||
Matrix4 t;
|
||||
t.setTranslation(x, y);
|
||||
this->operator *=(t);
|
||||
}
|
||||
|
||||
void Matrix::rotate(float rad)
|
||||
void Matrix4::rotate(float rad)
|
||||
{
|
||||
Matrix t;
|
||||
Matrix4 t;
|
||||
t.setRotation(rad);
|
||||
this->operator *=(t);
|
||||
}
|
||||
|
||||
void Matrix::scale(float sx, float sy)
|
||||
void Matrix4::scale(float sx, float sy)
|
||||
{
|
||||
Matrix t;
|
||||
Matrix4 t;
|
||||
t.setScale(sx, sy);
|
||||
this->operator *=(t);
|
||||
}
|
||||
|
||||
void Matrix::shear(float kx, float ky)
|
||||
void Matrix4::shear(float kx, float ky)
|
||||
{
|
||||
Matrix t;
|
||||
Matrix4 t;
|
||||
t.setShear(kx,ky);
|
||||
this->operator *=(t);
|
||||
}
|
||||
|
||||
// | x |
|
||||
// | y |
|
||||
// | 0 |
|
||||
// | 1 |
|
||||
// | e0 e4 e8 e12 |
|
||||
// | e1 e5 e9 e13 |
|
||||
// | e2 e6 e10 e14 |
|
||||
// | e3 e7 e11 e15 |
|
||||
|
||||
void Matrix::transform(Vertex *dst, const Vertex *src, int size) const
|
||||
Matrix4 Matrix4::ortho(float left, float right, float bottom, float top)
|
||||
{
|
||||
for (int i = 0; i<size; i++)
|
||||
{
|
||||
// Store in temp variables in case src = dst
|
||||
float x = (e[0]*src[i].x) + (e[4]*src[i].y) + (0) + (e[12]);
|
||||
float y = (e[1]*src[i].x) + (e[5]*src[i].y) + (0) + (e[13]);
|
||||
|
||||
dst[i].x = x;
|
||||
dst[i].y = y;
|
||||
}
|
||||
}
|
||||
|
||||
Matrix Matrix::ortho(float left, float right, float bottom, float top)
|
||||
{
|
||||
Matrix m;
|
||||
Matrix4 m;
|
||||
|
||||
m.e[0] = 2.0f / (right - left);
|
||||
m.e[5] = 2.0f / (top - bottom);
|
||||
@@ -213,5 +191,101 @@ Matrix Matrix::ortho(float left, float right, float bottom, float top)
|
||||
return m;
|
||||
}
|
||||
|
||||
/**
|
||||
* | e0 e3 e6 |
|
||||
* | e1 e4 e7 |
|
||||
* | e2 e5 e8 |
|
||||
**/
|
||||
Matrix3::Matrix3()
|
||||
{
|
||||
setIdentity();
|
||||
}
|
||||
|
||||
Matrix3::Matrix3(const Matrix4 &mat4)
|
||||
{
|
||||
const float *mat4elems = mat4.getElements();
|
||||
|
||||
// Column 0.
|
||||
e[0] = mat4elems[0];
|
||||
e[1] = mat4elems[1];
|
||||
e[2] = mat4elems[2];
|
||||
|
||||
// Column 1.
|
||||
e[3] = mat4elems[4];
|
||||
e[4] = mat4elems[5];
|
||||
e[5] = mat4elems[6];
|
||||
|
||||
// Column 2.
|
||||
e[6] = mat4elems[8];
|
||||
e[7] = mat4elems[9];
|
||||
e[8] = mat4elems[10];
|
||||
}
|
||||
|
||||
Matrix3::~Matrix3()
|
||||
{
|
||||
}
|
||||
|
||||
void Matrix3::setIdentity()
|
||||
{
|
||||
memset(e, 0, sizeof(float) * 9);
|
||||
e[8] = e[4] = e[0] = 1.0f;
|
||||
}
|
||||
|
||||
Matrix3 Matrix3::operator * (const love::Matrix3 &m) const
|
||||
{
|
||||
Matrix3 t;
|
||||
|
||||
t.e[0] = (e[0]*m.e[0]) + (e[3]*m.e[1]) + (e[6]*m.e[2]);
|
||||
t.e[3] = (e[0]*m.e[3]) + (e[3]*m.e[4]) + (e[6]*m.e[5]);
|
||||
t.e[6] = (e[0]*m.e[6]) + (e[3]*m.e[7]) + (e[6]*m.e[8]);
|
||||
|
||||
t.e[1] = (e[1]*m.e[0]) + (e[4]*m.e[1]) + (e[7]*m.e[2]);
|
||||
t.e[4] = (e[1]*m.e[3]) + (e[4]*m.e[4]) + (e[7]*m.e[5]);
|
||||
t.e[7] = (e[1]*m.e[6]) + (e[4]*m.e[7]) + (e[7]*m.e[8]);
|
||||
|
||||
t.e[2] = (e[2]*m.e[0]) + (e[5]*m.e[1]) + (e[8]*m.e[2]);
|
||||
t.e[5] = (e[2]*m.e[3]) + (e[5]*m.e[4]) + (e[8]*m.e[5]);
|
||||
t.e[8] = (e[2]*m.e[6]) + (e[5]*m.e[7]) + (e[8]*m.e[8]);
|
||||
|
||||
return t;
|
||||
}
|
||||
|
||||
void Matrix3::operator *= (const Matrix3 &m)
|
||||
{
|
||||
Matrix3 t = (*this) * m;
|
||||
memcpy(e, t.e, sizeof(float) * 9);
|
||||
}
|
||||
|
||||
const float *Matrix3::getElements() const
|
||||
{
|
||||
return e;
|
||||
}
|
||||
|
||||
Matrix3 Matrix3::transposedInverse() const
|
||||
{
|
||||
// e0 e3 e6
|
||||
// e1 e4 e7
|
||||
// e2 e5 e8
|
||||
|
||||
float det = e[0] * (e[4]*e[8] - e[7]*e[5])
|
||||
- e[1] * (e[3]*e[8] - e[5]*e[6])
|
||||
+ e[2] * (e[3]*e[7] - e[4]*e[6]);
|
||||
|
||||
float invdet = 1.0f / det;
|
||||
|
||||
Matrix3 m;
|
||||
|
||||
m.e[0] = invdet * (e[4]*e[8] - e[7]*e[5]);
|
||||
m.e[3] = -invdet * (e[1]*e[8] - e[2]*e[7]);
|
||||
m.e[6] = invdet * (e[1]*e[5] - e[2]*e[4]);
|
||||
m.e[1] = -invdet * (e[3]*e[8] - e[5]*e[6]);
|
||||
m.e[4] = invdet * (e[0]*e[8] - e[2]*e[6]);
|
||||
m.e[7] = -invdet * (e[0]*e[5] - e[3]*e[2]);
|
||||
m.e[2] = invdet * (e[3]*e[7] - e[6]*e[4]);
|
||||
m.e[5] = -invdet * (e[0]*e[7] - e[6]*e[1]);
|
||||
m.e[8] = invdet * (e[0]*e[4] - e[3]*e[1]);
|
||||
|
||||
return m;
|
||||
}
|
||||
|
||||
} // love
|
||||
|
||||
Reference in New Issue
Block a user