aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-10-06 08:07:35 +0800
committerchai <chaifix@163.com>2018-10-06 08:07:35 +0800
commit090b303a88b493eca0bde51b5a454043c893b0d8 (patch)
treecbc27aeac6d3e430556aa1ea8f80de2636104028 /src
parent789895b4b9f99668b8b772f271d07d1ce3115742 (diff)
*update
Diffstat (limited to 'src')
-rw-r--r--src/libjin/Graphics/Font.cpp1
-rw-r--r--src/libjin/Math/Matrix.cpp4
-rw-r--r--src/libjin/math/matrix.cpp4
3 files changed, 4 insertions, 5 deletions
diff --git a/src/libjin/Graphics/Font.cpp b/src/libjin/Graphics/Font.cpp
index a3a46dd..72be567 100644
--- a/src/libjin/Graphics/Font.cpp
+++ b/src/libjin/Graphics/Font.cpp
@@ -49,7 +49,6 @@ namespace graphics
/* little endian unicode */
static const char* unicodeLittleEndian(const char* p, unsigned* res)
{
-
}
/*static*/ Font* Font::createFont(FontData* fontData, unsigned int fontSzie)
diff --git a/src/libjin/Math/Matrix.cpp b/src/libjin/Math/Matrix.cpp
index a80f37a..a6e2491 100644
--- a/src/libjin/Math/Matrix.cpp
+++ b/src/libjin/Math/Matrix.cpp
@@ -26,10 +26,10 @@ namespace math
void Matrix::setOrtho(float l, float r, float b, float t, float n, float f)
{
- float w = r - l;
+ setIdentity();
+ float w = r - l;
float h = t - b;
float z = f - n;
- setIdentity();
e[0] = 2 / w;
e[5] = 2 / h;
e[10] = -2 / z;
diff --git a/src/libjin/math/matrix.cpp b/src/libjin/math/matrix.cpp
index a80f37a..a6e2491 100644
--- a/src/libjin/math/matrix.cpp
+++ b/src/libjin/math/matrix.cpp
@@ -26,10 +26,10 @@ namespace math
void Matrix::setOrtho(float l, float r, float b, float t, float n, float f)
{
- float w = r - l;
+ setIdentity();
+ float w = r - l;
float h = t - b;
float z = f - n;
- setIdentity();
e[0] = 2 / w;
e[5] = 2 / h;
e[10] = -2 / z;