Canvas: fix review findins

kimkulling · Nov 13, 2024 · f91a4f9 · f91a4f9
1 parent 4f5557d
commit f91a4f9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 24 deletions.
diff --git a/contrib/cppcore b/contrib/cppcore
diff --git a/contrib/vcpkg b/contrib/vcpkg
diff --git a/src/Engine/App/AppBase.cpp b/src/Engine/App/AppBase.cpp
@@ -83,10 +83,7 @@ AppBase::AppBase(i32 argc, const c8 *argv[], const String &supportedArgs, const
         mStage(nullptr),
         mMouseEvListener(nullptr),
         mKeyboardEvListener(nullptr),
-        mIds(nullptr),
-        mCanvasRenderer(nullptr),
-        mStageMode(StageMode::Stage3D),
-        mShutdownRequested(false) {
+        mIds(nullptr) {
     mSettings->setString(Properties::Settings::RenderAPI, "opengl");
     mSettings->setBool(Properties::Settings::PollingMode, true);
 }
@@ -257,13 +254,12 @@ bool AppBase::onCreate() {
     mEnvironment = new Common::Environment;
 
     // create the asset registry
-    AssetRegistry *registry = AssetRegistry::create();
-    if (registry == nullptr) {
+    if (AssetRegistry::create() == nullptr) {
         osre_debug(Tag, "Cannot create asset registry.");
         return false;
     }
 
-    //Create the platform interface instance
+    // Create the platform interface instance
     mPlatformInterface = Platform::PlatformInterface::create(mSettings);
     if (mPlatformInterface == nullptr) {
         osre_error(Tag, "Pointer to platform interface is nullptr.");
@@ -275,13 +271,13 @@ bool AppBase::onCreate() {
         return false;
     }
 
-    //Register any available platform-specific log streams
+    // Register any available platform-specific log streams
     Common::AbstractLogStream *stream = Platform::PlatformPluginFactory::createPlatformLogStream();
     if (stream != nullptr) {
         Logger::getInstance()->registerLogStream(stream);
     }
 
-    //Create the render back-end
+    // Create the render back-end
     mRbService = new RenderBackendService();
     ServiceProvider::setService(ServiceType::RenderService, mRbService);
     mRbService->setSettings(mSettings, false);
@@ -300,7 +296,7 @@ bool AppBase::onCreate() {
 
     mPlatformInterface->getPlatformEventHandler()->setRenderBackendService(mRbService);
 
-    // enable render-back-end
+    // Enable render-back-end
     RenderBackend::CreateRendererEventData *data = new CreateRendererEventData(mPlatformInterface->getRootWindow());
     data->RequestedPipeline = mRbService->createDefault3DPipeline();
     mRbService->sendEvent(&RenderBackend::OnCreateRendererEvent, data);

diff --git a/src/Engine/App/AppBase.h b/src/Engine/App/AppBase.h
@@ -305,9 +305,9 @@ class OSRE_EXPORT AppBase {
     MouseEventListener *mMouseEvListener;
     KeyboardEventListener *mKeyboardEvListener;
     Common::Ids *mIds;
-    StageMode mStageMode;
-    bool mShutdownRequested;
-    RenderBackend::IRenderPath *mCanvasRenderer;
+    StageMode mStageMode = StageMode::Stage3D;
+    bool mShutdownRequested = false;
+    RenderBackend::IRenderPath *mCanvasRenderer = nullptr;
 };
 
 inline Stage *AppBase::getStage() const {

diff --git a/src/Engine/RenderBackend/2D/CanvasRenderer.cpp b/src/Engine/RenderBackend/2D/CanvasRenderer.cpp
@@ -67,8 +67,8 @@ inline void clip(const Rect2i &resolution, i32 x, i32 y, i32 &x_out, i32 &y_out)
 }
 
 static void createRectVertices(DrawCmd *drawCmd, const Color4 &penColor, const Rect2i &resolution, i32 x, i32 y, i32 w, i32 h, i32 layer) {
-    i32 x_clipped, y_clipped;
-    f32 x_model, y_model;
+    i32 x_clipped{0}, y_clipped{0};
+    f32 x_model{0.f}, y_model{0.f};
 
     drawCmd->PrimType = PrimitiveType::TriangleList;
     drawCmd->NumVertices = 6;
@@ -156,8 +156,7 @@ CanvasRenderer::CanvasRenderer(i32 numLayers, i32 x, i32 y, i32 w, i32 h) :
         mActiveLayer(0),
         mNumLayers(numLayers),
         mFont(nullptr),
-        mMesh(nullptr)
-        /* mFont2MeshMap()*/ {
+        mMesh(nullptr) {
     setResolution(x, y, w, h);
 }
 
@@ -298,7 +297,7 @@ void CanvasRenderer::drawline(i32 x1, i32 y1, i32 x2, i32 y2) {
 }
 
 void CanvasRenderer::drawline(const Point2Di &p1, const Point2Di &p2) {
-    drawline(p1.X, p1.Y, p2.X, p2.Y);
+    drawline(p1.x, p1.y, p2.x, p2.y);
 }
 
 void CanvasRenderer::drawTriangle(i32 x1, i32 y1, i32 x2, i32 y2, i32 x3, i32 y3, bool filled) {
@@ -351,7 +350,7 @@ void CanvasRenderer::drawTriangle(i32 x1, i32 y1, i32 x2, i32 y2, i32 x3, i32 y3
 }
 
 void CanvasRenderer::drawTriangle(const Point2Di &p1, const Point2Di &p2, const Point2Di &p3, bool filled) {
-    drawTriangle(p1.X, p1.Y, p2.X, p2.Y, p3.X, p3.Y, filled);
+    drawTriangle(p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, filled);
 }
 
 void CanvasRenderer::drawRect(i32 x, i32 y, i32 w, i32 h, bool filled) {

diff --git a/src/Engine/RenderBackend/RenderCommon.h b/src/Engine/RenderBackend/RenderCommon.h
@@ -1030,12 +1030,12 @@ GLSLVersion getGlslVersionFromeString(const c8 *versionString);
 
 /// @brief The 2D point structure for int32.
 struct Point2Di {
-    i32 X, Y; /// Coordinate components
+    i32 x, y; /// Coordinate components
 };
 
 /// @brief The 2D point structure for floats.
 struct Point2Df {
-    f32 X, Y; /// Coordinate components
+    f32 x, y; /// Coordinate components
 };
 
 /// @brief The font structure.
@@ -1072,7 +1072,7 @@ template<class T>
 inline void renumberIndices(const DrawCmd &dc, T offset) {
     if (offset > 0) {
         for (size_t j = 0; j < dc.NumIndices; ++j) {
-            dc.Indices[j] += static_cast<T>(offset);
+            dc.Indices[j] += static_cast<ui16>(offset);
         }
     }
 }