Renderbackend: Rework Canvas 2D-Rendering

samples/02_Demo2D/Demo2D.cpp

@@ -109,6 +109,8 @@ class Demo2DApp : public App::AppBase {
 
         mCanvasRenderer->drawRect(100, 1000, 110, 124, true);
 
+        mCanvasRenderer->drawText(300, 100, "Test");
+
         return true;
     }
 

src/Editor/src/main.cpp

@@ -54,10 +54,11 @@ int main(int argc, char *argv[]) {
     std::cout << "Editor version 0.1\n";
 
     OsreEdApp osreApp(argc, argv);
-    if (!osreApp.initWindow(100, 100, 1024, 768, "OSRE-Ed", 
-            WindowMode::Windowed, 
-            WindowType::Child, 
+    if (!osreApp.initWindow(100, 100, 1024, 768, "OSRE-Ed",
+            WindowMode::Windowed,
+            WindowType::Child,
             RenderBackendType::OpenGLRenderBackend)) {
+        osre_error(Tag, "Cannot open the window.");
         return AppError;
     }
 

src/Engine/Animation/AnimatorBase.h

@@ -117,10 +117,11 @@ using VectorChannelArray = ::cppcore::TArray<VectorChannel>;
 template <class T>
 struct AnimatorBase {
     void operator () ( T &out, const T &a, const T &b, f32 d ) const {
-        out = a + ( b - a ) * d;
+        out = a + (b - a) * d;
     }
 };
 
+/// @brief 
 enum class TransformCommandType {
     Invalid = -1,
     RotateXCommandPositive = 0,
@@ -166,5 +167,5 @@ class OSRE_EXPORT AnimationControllerBase {
     AnimationControllerBase() = default;
 };
 
-}
-}
+} // namespace Animation
+} // namespace OSRE

src/Engine/App/AppBase.cpp

@@ -122,7 +122,7 @@ void AppBase::update() {
     if (mAppState == State::Created) {
         mAppState = State::Running;
     }
-    
+
     onUpdate();
 }
 

src/Engine/App/Component.cpp

@@ -97,8 +97,9 @@ bool RenderComponent::onRender(RenderBackendService *renderBackendSrv) {
     return true;
 }
 
-LightComponent::LightComponent(Entity *owner) 
-        : Component(owner, ComponentType::LightComponentType), mLight(nullptr) {}
+LightComponent::LightComponent(Entity *owner) : Component(owner, ComponentType::LightComponentType), mLight(nullptr) {
+    // empty
+}
 
 void LightComponent::setLight(RenderBackend::Light *light) {
     mLight = light;

src/Engine/App/Component.h

@@ -49,7 +49,7 @@ enum class ComponentType {
     TransformComponentType,     ///< For all transformation types.
     LightComponentType,         ///< For light types.
     CameraComponentType,        ///< For camera components.
-    AnimationComponentType,     ///<
+    AnimationComponentType,     ///< For animation support.
     Count                       ///< The number of components.
 };
 
@@ -127,33 +127,35 @@ class OSRE_EXPORT RenderComponent : public Component {
     /// @brief The class constructor.
     /// @param owner    The owning entity.
     RenderComponent(Entity *owner);
-    
+
     /// @brief The class destructor.
     ~RenderComponent() override = default;
-    
+
     /// @brief  Returns the number of meshes
     /// @return The number of stored meshes.
     size_t getNumMeshes() const;
-    
+
     /// @brief  Returns the mesh at a given index.
     /// @param[in] idx   The requested index.
     /// @return The mesh os a nullptr if the index in invalid.
     RenderBackend::Mesh *getMeshAt(size_t idx) const;
-    
+
     /// @brief  Returns the mesh array.
-    /// @param[inout] array 
+    /// @param[inout] array The mesh array managed by the component.
     void getMeshArray(RenderBackend::MeshArray &array);
-    
-    /// @brief 
-    /// @param geo 
-    void addStaticMesh(RenderBackend::Mesh *geo);
-    
-    /// @brief 
-    /// @param array 
+
+    /// @brief Will add a new mesh.
+    /// @param mesh     Thew mesh to add.
+    void addStaticMesh(RenderBackend::Mesh *mesh);
+
+    /// @brief Will add an array of new meshes.
+    /// @param array    The array with enw meshes.
     void addStaticMeshArray(const RenderBackend::MeshArray &array);
 
 protected:
+    /// The update callback.
     bool onUpdate(Time dt) override;
+    /// The render callback.
     bool onRender(RenderBackend::RenderBackendService *rbSrv) override;
 
 private:
@@ -163,19 +165,19 @@ class OSRE_EXPORT RenderComponent : public Component {
 //-------------------------------------------------------------------------------------------------
 ///	@ingroup	Engine
 ///
-/// @brief
+/// @brief  This component class implements a light.
 //-------------------------------------------------------------------------------------------------
 class LightComponent final : public Component {
 public:
-    /// @brief 
-    /// @param owner 
+    /// @brief The class constructor.
+    /// @param owner    The owning entity.
     LightComponent(Entity *owner);
-    
-    /// @brief 
+
+    /// @brief The class destructor.
     ~LightComponent() override = default;
-    
-    /// @brief 
-    /// @param light 
+
+    /// @brief Will set a new light instance.
+    /// @param light    Thew new light.
     void setLight(RenderBackend::Light *light);
 
 protected:

src/Engine/App/MouseEventListener.h

@@ -59,7 +59,7 @@ class MouseEventListener : public Platform::OSEventListener {
     ///	@brief  Will return true, if the middle mouse-button was pressed,
     /// @return true if the middle mouse button was pressed.
     bool middleButttonPressed() const;
-    
+
     ///	@brief  Will return true, if the right mouse-button was pressed,
     /// @return true if the right mouse button was pressed.
     bool rightButttonPressed() const;

src/Engine/CMakeLists.txt

@@ -315,6 +315,9 @@ SET( renderbackend_src
     RenderBackend/Shader.cpp
 )
 
+SET( renderbackend_mesh_src
+    RenderBackend/Mesh/MeshUtilities.h
+)
 SET( renderbackend_2d_src
     RenderBackend/2D/RenderPass2D.h
     RenderBackend/2D/CanvasRenderer.h
@@ -400,6 +403,7 @@ SOURCE_GROUP( Profiling                   FILES ${profiling_src} )
 SOURCE_GROUP( Properties                  FILES ${properties_src} )
 SOURCE_GROUP( RenderBackend               FILES ${renderbackend_src} )
 SOURCE_GROUP( RenderBackend\\2D           FILES ${renderbackend_2d_src})
+SOURCE_GROUP( RenderBackend\\Mesh         FILES ${renderbackend_mesh_src} )
 SOURCE_GROUP( RenderBackend\\OGLRenderer  FILES ${renderbackend_oglrenderer_src} )
 SOURCE_GROUP( RenderBackend\\Vulkan       FILES ${renderbackend_vulkanrenderer_src} )
 SOURCE_GROUP( RenderBackend\\Shader       FILES ${renderbackend_shader_src})
@@ -441,6 +445,7 @@ ADD_LIBRARY( osre SHARED
         ${renderbackend_oglrenderer_src}
 	    ${renderbackend_volkanrenderer_src}
         ${renderbackend_2d_src}
+        ${renderbackend_mesh_src}
         ${renderbackend_shader_src}
     ${scene_src}
         ${scene_shader_src}

src/Engine/Common/Logger.cpp

@@ -119,7 +119,7 @@ void Logger::trace(const String &domain, const String &msg) {
         logMsg += msg;
         appendDomain(domain, logMsg);
 
-        print(logMsg);        
+        print(logMsg);
     }
 }
 

src/Engine/Common/Logger.h

@@ -113,7 +113,7 @@ class OSRE_EXPORT Logger final {
     ///	@param[in] sev   The new severity of the logger.
     ///	@see	Severity
     void setVerboseMode(VerboseMode sev);
-    
+
     ///	@brief	Returns	the current severity of the logger.
     ///	@return	The current severity.
     VerboseMode getVerboseMode() const;
@@ -136,7 +136,7 @@ class OSRE_EXPORT Logger final {
     ///	@brief	Logs a print message.
     ///	@param[in] message  The message to log.
     /// @param[in] mode     Logging mode
-    void print( const String &message, PrintMode mode = PrintMode::WithDateTime );
+    void print( const String &message, PrintMode mode = PrintMode::WhithoutDateTime );
 
     ///	@brief	Logs a warn message.
     /// @param[in] domain  The domain.

src/Engine/Common/glm_common.h

@@ -41,6 +41,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <glm/gtx/quaternion.hpp>
 #include <glm/common.hpp>
 
+#include <cppcore/Container/TArray.h>
+
+using Vec3Array = cppcore::TArray<glm::vec3>;
+using Vec2Array = cppcore::TArray<glm::vec2>;
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif // _MSC_VER

src/Engine/Platform/AbstractWindow.h

@@ -45,8 +45,8 @@ struct OSRE_EXPORT Resolution {
         Res1920x1080
     };
 
-    ui32 m_width; ///< The resolution in x.
-    ui32 m_height; ///< The resolution in y.
+    ui32 m_width;   ///< The resolution in x.
+    ui32 m_height;  ///< The resolution in y.
 
     explicit Resolution(ResRequest req);
     Resolution();
@@ -73,7 +73,7 @@ struct WindowsProperties {
     /// @param[out] rect  The window rect.
     void getDimension(Rect2ui &rect);
 
-    /// @brief WIll set the new rectangle geometry.
+    /// @brief Will set the new rectangle geometry.
     /// @param[in] rect   The new rectangle.
     void setRect(const Rect2ui &rect);
 };
@@ -129,8 +129,14 @@ class OSRE_EXPORT AbstractWindow {
     /// @brief  The class destructor, virtual.
     virtual ~AbstractWindow();
 
+    /// @brief  Will set the parent window. Use nullptr for beeing the root window.
+    /// @param  parent Pointer ot the paretn window.
     virtual void setParent(AbstractWindow *parent);
+
+    /// @brief Will return the parent window or nullptr, if this windows is the root window.
+    /// @return Pointer to the parent window, nullptr for none.
     virtual AbstractWindow *getParent() const;
+
     /// @brief  Will create the surface.
     /// @return true will be returned, when creation was successful.
     virtual bool create();

src/Engine/Platform/win32/Win32Window.cpp

@@ -51,7 +51,7 @@ void Win32Window::showWindow(ShowState showState) {
         int ws = SW_HIDE;
         if (showState == ShowState::Visible) {
             ws = SW_SHOW;
-        }    
+        }
         ::ShowWindow(mWnd, ws);
     }
 }
@@ -356,7 +356,7 @@ void Win32Window::onResize(ui32 x, ui32 y, ui32 w, ui32 h) {
 
     ::MoveWindow(mWnd, x, y, w, h, NULL);
     WindowsProperties *props = AbstractWindow::getProperties();
-    if (nullptr != props) {
+    if (props != nullptr) {
         props->mRect.x1 = x;
         props->mRect.y1 = y;
         props->mRect.width = w;