diff options
author | 2010-11-09 17:00:54 -0800 | |
---|---|---|
committer | 2010-11-10 11:30:51 -0800 | |
commit | ed9f210568082dd6d1d8a0c92c693d574d87d545 (patch) | |
tree | d1b9a5c7862ac078064946a122dd89f05d88f38b /libs/rs/rsMatrix.cpp | |
parent | c65347f239e0adae4fe9fad5248b69a5a6d3bbe8 (diff) |
Code cleanup to make formatting consistent
across all the renderscript files.
Change-Id: Idf5fcc60877e44c8f074f7176e37f70b3b895a3c
Diffstat (limited to 'libs/rs/rsMatrix.cpp')
-rw-r--r-- | libs/rs/rsMatrix.cpp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/libs/rs/rsMatrix.cpp b/libs/rs/rsMatrix.cpp index 94eef136262e..ca41886631f4 100644 --- a/libs/rs/rsMatrix.cpp +++ b/libs/rs/rsMatrix.cpp @@ -23,10 +23,7 @@ using namespace android; using namespace android::renderscript; - - -void Matrix::loadIdentity() -{ +void Matrix::loadIdentity() { set(0, 0, 1); set(1, 0, 0); set(2, 0, 0); @@ -48,18 +45,15 @@ void Matrix::loadIdentity() set(3, 3, 1); } -void Matrix::load(const float *v) -{ +void Matrix::load(const float *v) { memcpy(m, v, sizeof(m)); } -void Matrix::load(const Matrix *v) -{ +void Matrix::load(const Matrix *v) { memcpy(m, v->m, sizeof(m)); } -void Matrix::loadRotate(float rot, float x, float y, float z) -{ +void Matrix::loadRotate(float rot, float x, float y, float z) { float c, s; m[3] = 0; m[7] = 0; @@ -97,24 +91,21 @@ void Matrix::loadRotate(float rot, float x, float y, float z) m[10] = z*z*nc + c; } -void Matrix::loadScale(float x, float y, float z) -{ +void Matrix::loadScale(float x, float y, float z) { loadIdentity(); m[0] = x; m[5] = y; m[10] = z; } -void Matrix::loadTranslate(float x, float y, float z) -{ +void Matrix::loadTranslate(float x, float y, float z) { loadIdentity(); m[12] = x; m[13] = y; m[14] = z; } -void Matrix::loadMultiply(const Matrix *lhs, const Matrix *rhs) -{ +void Matrix::loadMultiply(const Matrix *lhs, const Matrix *rhs) { for (int i=0 ; i<4 ; i++) { float ri0 = 0; float ri1 = 0; |