mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2024-11-25 16:18:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed Mat4x4 method naming convention

Browse Source
This commit is contained in:
Noel Berry 2020-09-19 14:14:36 -07:00
parent f599df02cc
commit b31bcf86c0
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/blah/drawing/batch.cpp
View File

@ -226,7 +226,7 @@ void Batch::render(const FrameBufferRef& target)
else
size = Point(target->width(), target->height());
render(target, Mat4x4::CreateOrthographicOffCenter(0, (float)size.x, (float)size.y, 0, 0.01f, 1000.0f));
render(target, Mat4x4::create_ortho_offcenter(0, (float)size.x, (float)size.y, 0, 0.01f, 1000.0f));
}
void Batch::render(const FrameBufferRef& target, const Mat4x4& matrix)

38
public/blah/math/mat4x4.cpp
View File

@ -18,65 +18,65 @@ Mat4x4::Mat4x4(
m31(m31), m32(m32), m33(m33), m34(m34),
m41(m41), m42(m42), m43(m43), m44(m44) {}
const Mat4x4 Mat4x4::Identity = Mat4x4(
const Mat4x4 Mat4x4::identity = Mat4x4(
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
Mat4x4 Mat4x4::CreateOrthographic(float width, float height, float zNearPlane, float zFarPlane)
Mat4x4 Mat4x4::create_ortho(float width, float height, float z_near_plane, float z_far_plane)
{
Mat4x4 result = Identity;
Mat4x4 result = identity;
result.m11 = 2.0f / width;
result.m12 = result.m13 = result.m14 = 0.0f;
result.m22 = -2.0f / height;
result.m21 = result.m23 = result.m24 = 0.0f;
result.m33 = 1.0f / (zNearPlane - zFarPlane);
result.m33 = 1.0f / (z_near_plane - z_far_plane);
result.m31 = result.m32 = result.m34 = 0.0f;
result.m41 = result.m42 = 0.0f;
result.m43 = zNearPlane / (zNearPlane - zFarPlane);
result.m43 = z_near_plane / (z_near_plane - z_far_plane);
result.m44 = 1.0f;
return result;
}
Mat4x4 Mat4x4::CreateOrthographicOffCenter(float left, float right, float bottom, float top, float zNearPlane, float zFarPlane)
Mat4x4 Mat4x4::create_ortho_offcenter(float left, float right, float bottom, float top, float z_near_plane, float z_far_plane)
{
Mat4x4 result = Identity;
Mat4x4 result = identity;
result.m11 = 2.0f / (right - left);
result.m12 = result.m13 = result.m14 = 0.0f;
result.m22 = 2.0f / (top - bottom);
result.m21 = result.m23 = result.m24 = 0.0f;
result.m33 = 1.0f / (zNearPlane - zFarPlane);
result.m33 = 1.0f / (z_near_plane - z_far_plane);
result.m31 = result.m32 = result.m34 = 0.0f;
result.m41 = (left + right) / (left - right);
result.m42 = (top + bottom) / (bottom - top);
result.m43 = zNearPlane / (zNearPlane - zFarPlane);
result.m43 = z_near_plane / (z_near_plane - z_far_plane);
result.m44 = 1.0f;
return result;
}
Mat4x4 Mat4x4::CreateTranslation(float xPosition, float yPosition, float zPosition)
Mat4x4 Mat4x4::create_translation(float x, float y, float z)
{
Mat4x4 result = Identity;
Mat4x4 result = identity;
result.m41 = xPosition;
result.m42 = yPosition;
result.m43 = zPosition;
result.m41 = x;
result.m42 = y;
result.m43 = z;
return result;
}
Mat4x4 Mat4x4::CreateScale(float xScale, float yScale, float zScale)
Mat4x4 Mat4x4::create_scale(float x, float y, float z)
{
Mat4x4 result = Identity;
Mat4x4 result = identity;
result.m11 = xScale;
result.m22 = yScale;
result.m33 = zScale;
result.m11 = x;
result.m22 = y;
result.m33 = z;
return result;
}

10
public/blah/math/mat4x4.h
View File

@ -32,12 +32,12 @@ namespace Blah
float m41, float m42, float m43, float m44);
static const Mat4x4 Identity;
static const Mat4x4 identity;
static Mat4x4 CreateOrthographic(float width, float height, float zNearPlane, float zFarPlane);
static Mat4x4 CreateOrthographicOffCenter(float left, float right, float bottom, float top, float zNearPlane, float zFarPlane);
static Mat4x4 CreateTranslation(float xPosition, float yPosition, float zPosition);
static Mat4x4 CreateScale(float xScale, float yScale, float zScale);
static Mat4x4 create_ortho(float width, float height, float z_near_plane, float z_far_plane);
static Mat4x4 create_ortho_offcenter(float left, float right, float bottom, float top, float z_near_plane, float z_far_plane);
static Mat4x4 create_translation(float x, float y, float z);
static Mat4x4 create_scale(float x, float y, float z);
Mat4x4 operator* (const Mat4x4& rhs);
};