From c63f961b9c1944a46c28005c489bb40d9c9bc941 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Tue, 16 Feb 2021 11:19:19 +0900 Subject: [PATCH] common: Clean up code - Combine if condition with the same return value. - Remove empty space - Remove tab --- src/lib/gl_engine/tvgGlGeometry.cpp | 8 ++++---- src/lib/gl_engine/tvgGlGeometry.h | 30 ++++++++++++++--------------- src/lib/tvgCanvasImpl.h | 10 +++------- src/lib/tvgPaint.h | 3 +-- src/lib/tvgPictureImpl.h | 4 ++-- src/loaders/svg/tvgXmlParser.cpp | 6 ++---- 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/src/lib/gl_engine/tvgGlGeometry.cpp b/src/lib/gl_engine/tvgGlGeometry.cpp index f1d038a2..fae53550 100644 --- a/src/lib/gl_engine/tvgGlGeometry.cpp +++ b/src/lib/gl_engine/tvgGlGeometry.cpp @@ -24,10 +24,10 @@ #include "tvgGlGpuBuffer.h" #include "tvgGlGeometry.h" -#define NORMALIZED_TOP_3D 1.0f -#define NORMALIZED_BOTTOM_3D -1.0f -#define NORMALIZED_LEFT_3D -1.0f -#define NORMALIZED_RIGHT_3D 1.0f +#define NORMALIZED_TOP_3D 1.0f +#define NORMALIZED_BOTTOM_3D -1.0f +#define NORMALIZED_LEFT_3D -1.0f +#define NORMALIZED_RIGHT_3D 1.0f uint32_t GlGeometry::getPrimitiveCount() { diff --git a/src/lib/gl_engine/tvgGlGeometry.h b/src/lib/gl_engine/tvgGlGeometry.h index a757c0ea..c4a63655 100644 --- a/src/lib/gl_engine/tvgGlGeometry.h +++ b/src/lib/gl_engine/tvgGlGeometry.h @@ -38,32 +38,32 @@ }; #define ROTATION_MATRIX(xPivot, yPivot) \ - auto radian = mTransform.angle / 180.0f * PI; \ + auto radian = mTransform.angle / 180.0f * PI; \ auto cosVal = cosf(radian); \ auto sinVal = sinf(radian); \ float rotate[4*4] = { \ - cosVal, -sinVal, 0.0f, 0.0f, \ - sinVal, cosVal, 0.0f, 0.0f,\ - 0.0f, 0.0f, 1.0f, 0.0f, \ + cosVal, -sinVal, 0.0f, 0.0f, \ + sinVal, cosVal, 0.0f, 0.0f, \ + 0.0f, 0.0f, 1.0f, 0.0f, \ (xPivot * (1.0f - cosVal)) - (yPivot * sinVal), (yPivot *(1.0f - cosVal)) + (xPivot * sinVal), 0.0f, 1.0f \ }; #define MULTIPLY_MATRIX(A, B, transform) \ for(auto i = 0; i < 4; ++i) \ - { \ + { \ for(auto j = 0; j < 4; ++j) \ - { \ - float sum = 0.0; \ - for (auto k = 0; k < 4; ++k) \ + { \ + float sum = 0.0; \ + for (auto k = 0; k < 4; ++k) \ sum += A[k*4+i] * B[j*4+k]; \ transform[j*4+i] = sum; \ - } \ + } \ } -#define GET_TRANSFORMATION(xPivot, yPivot, transform) \ - MVP_MATRIX(); \ - ROTATION_MATRIX(xPivot, yPivot); \ - MULTIPLY_MATRIX(mvp, rotate, transform); +#define GET_TRANSFORMATION(xPivot, yPivot, transform) \ + MVP_MATRIX(); \ + ROTATION_MATRIX(xPivot, yPivot); \ + MULTIPLY_MATRIX(mvp, rotate, transform); class GlPoint { @@ -225,7 +225,7 @@ struct GlTransform float angle = 0.0f; float scale = 1.0f; float w; - float h; + float h; float matrix[16]; }; @@ -261,7 +261,7 @@ private: unique_ptr mGpuBuffer; vector mPrimitives; - GlTransform mTransform; + GlTransform mTransform; }; #endif /* _TVG_GL_GEOMETRY_H_ */ diff --git a/src/lib/tvgCanvasImpl.h b/src/lib/tvgCanvasImpl.h index 6eb3319a..5f326555 100644 --- a/src/lib/tvgCanvasImpl.h +++ b/src/lib/tvgCanvasImpl.h @@ -54,10 +54,8 @@ struct Canvas::Impl Result clear(bool free) { - if (!renderer) return Result::InsufficientCondition; - //Clear render target before drawing - if (!renderer->clear()) return Result::InsufficientCondition; + if (!renderer || !renderer->clear()) return Result::InsufficientCondition; //free paints if (free) { @@ -77,7 +75,7 @@ struct Canvas::Impl if (!renderer) return Result::InsufficientCondition; Array clips; - auto flag = force ? RenderUpdateFlag::All : RenderUpdateFlag::None; + auto flag = force ? RenderUpdateFlag::All : RenderUpdateFlag::None; //Update single paint node if (paint) { @@ -93,9 +91,7 @@ struct Canvas::Impl Result draw() { - if (!renderer) return Result::InsufficientCondition; - - if (!renderer->preRender()) return Result::InsufficientCondition; + if (!renderer || !renderer->preRender()) return Result::InsufficientCondition; for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) { if (!(*paint)->pImpl->render(*renderer)) return Result::InsufficientCondition; diff --git a/src/lib/tvgPaint.h b/src/lib/tvgPaint.h index bc3e9789..85358e00 100644 --- a/src/lib/tvgPaint.h +++ b/src/lib/tvgPaint.h @@ -220,8 +220,7 @@ namespace tvg bool composite(Paint* target, CompositeMethod method) { - if (!target && method != CompositeMethod::None) return false; - if (target && method == CompositeMethod::None) return false; + if ((!target && method != CompositeMethod::None) || (target && method == CompositeMethod::None)) return false; cmpTarget = target; cmpMethod = method; return true; diff --git a/src/lib/tvgPictureImpl.h b/src/lib/tvgPictureImpl.h index 219dd763..d39809dd 100644 --- a/src/lib/tvgPictureImpl.h +++ b/src/lib/tvgPictureImpl.h @@ -46,11 +46,11 @@ struct Picture::Impl bool dispose(RenderMethod& renderer) { - bool ret = true; + bool ret = true; if (paint) { ret = paint->pImpl->dispose(renderer); delete(paint); - paint = nullptr; + paint = nullptr; } else if (pixels) { ret = renderer.dispose(rdata); diff --git a/src/loaders/svg/tvgXmlParser.cpp b/src/loaders/svg/tvgXmlParser.cpp index 93f952ee..bcccf7a5 100644 --- a/src/loaders/svg/tvgXmlParser.cpp +++ b/src/loaders/svg/tvgXmlParser.cpp @@ -141,8 +141,7 @@ bool simpleXmlParseAttributes(const char* buf, unsigned bufLength, simpleXMLAttr const char *itr = buf, *itrEnd = buf + bufLength; char* tmpBuf = (char*)alloca(bufLength + 1); - if (!buf) return false; - if (!func) return false; + if (!buf || !func) return false; while (itr < itrEnd) { const char* p = _simpleXmlSkipWhiteSpace(itr, itrEnd); @@ -200,8 +199,7 @@ bool simpleXmlParse(const char* buf, unsigned bufLength, bool strip, simpleXMLCb { const char *itr = buf, *itrEnd = buf + bufLength; - if (!buf) return false; - if (!func) return false; + if (!buf || !func) return false; #define CB(type, start, end) \ do { \