Merge pull request #1 from nieznanysprawiciel/Rendering

Rendering - new media

swCommonLib/Common/Buffers/BufferRaw.h

@@ -93,6 +93,8 @@ inline BufferRaw&	BufferRaw::operator=	( BufferRaw&& bufferRaw )
 
 	bufferRaw.m_data = nullptr;
 	bufferRaw.m_size = 0;
+
+	return *this;
 }
 
 // ================================ //

swGUI/.gitignore

@@ -58,6 +58,7 @@ Documentation/
 *.log
 *.scc
 *.html
+*.orig
 
 # Visual C++ cache files
 ipch/

swGUI/Core/Controls/Shapes/Ellipse.cpp

@@ -0,0 +1,68 @@
+/**
+@file Ellipse.cpp
+@author nieznanysprawiciel
+@copyright File is part of Sleeping Wombat Libraries.
+*/
+#include "swGUI/Core/stdafx.h"
+
+#include "Ellipse.h"
+#include "swGUI/Core/Media/Geometry/EllipseGeometry.h"
+
+
+namespace sw {
+namespace gui
+{
+
+
+// ================================ //
+//
+Ellipse::Ellipse()
+	:	m_strokeThickness( 1 )
+{
+    Shape::SetWidth( 100 );
+    Shape::SetHeight( 100 );
+
+	auto rectGeom = std::make_shared< EllipseGeometry >();
+	rectGeom->SetWidth( GetSize().x );
+	rectGeom->SetHeight( GetSize().y );
+	rectGeom->SetThickness( m_strokeThickness );
+
+	SetGeometry( rectGeom );
+}
+
+// ================================ //
+//
+void			Ellipse::SetWidth		( float width )
+{
+    Shape::SetWidth( width );
+
+	auto geom = std::static_pointer_cast< EllipseGeometry >( GetGeometry() );
+	geom->SetWidth( GetSize().x );
+}
+
+// ================================ //
+//
+void			Ellipse::SetHeight	( float height )
+{
+    Shape::SetHeight( height );
+
+	auto geom = std::static_pointer_cast< EllipseGeometry >( GetGeometry() );
+	geom->SetHeight( GetSize().y );
+}
+
+// ================================ //
+//
+void			Ellipse::SetThickness	( float thickness )
+{
+	m_strokeThickness = thickness;
+
+	auto geom = std::static_pointer_cast< EllipseGeometry >( GetGeometry() );
+	geom->SetThickness( m_strokeThickness );
+}
+
+
+
+}	// gui
+}	// sw
+
+

swGUI/Core/Controls/Shapes/Ellipse.h

@@ -0,0 +1,47 @@
+#pragma once
+/**
+@file Ellipse.h
+@author nieznanysprawiciel
+@copyright File is part of Sleeping Wombat Libraries.
+*/
+
+#include "Shape.h"
+
+
+
+
+namespace sw {
+namespace gui
+{
+
+/**@brief Draws ellipse shape.
+@ingroup Shapes
+@ingroup Controls*/
+class Ellipse : public Shape
+{
+	RTTR_ENABLE( Shape );
+	RTTR_REGISTRATION_FRIEND;
+private:
+
+	float				m_strokeThickness;
+
+protected:
+public:
+
+	explicit		Ellipse			();
+	virtual			~Ellipse		() = default;
+
+
+    virtual void        SetWidth			( float width ) override;
+    virtual void        SetHeight			( float height ) override;
+	void				SetThickness		( float thickness );
+
+};
+
+DEFINE_OPTR_TYPE( Ellipse );
+
+
+}	// gui
+}	// sw
+
+

swGUI/Core/Controls/Shapes/Rectangle.cpp

@@ -17,13 +17,14 @@ namespace gui
 // ================================ //
 //
 Rectangle::Rectangle()
-	:	m_width( 100 )
-	,	m_height( 100 )
-	,	m_strokeThickness( 1 )
+	:	m_strokeThickness( 1 )
 {
+    Shape::SetWidth( 100 );
+    Shape::SetHeight( 100 );
+
 	auto rectGeom = std::make_shared< RectangleGeometry >();
-	rectGeom->SetWidth( m_width );
-	rectGeom->SetHeight( m_height );
+	rectGeom->SetWidth( GetSize().x );
+	rectGeom->SetHeight( GetSize().y );
 	rectGeom->SetThickness( m_strokeThickness );
 
 	SetGeometry( rectGeom );
@@ -33,20 +34,22 @@ Rectangle::Rectangle()
 //
 void			Rectangle::SetWidth		( float width )
 {
-	m_width = width;
+    Shape::SetWidth( width );
 
 	auto geom = std::static_pointer_cast< RectangleGeometry >( GetGeometry() );
-	geom->SetWidth( m_width );
+	geom->SetWidth( GetSize().x );
+
+
 }
 
 // ================================ //
 //
 void			Rectangle::SetHeight	( float height )
 {
-	m_height = height;
+    Shape::SetHeight( height );
 
 	auto geom = std::static_pointer_cast< RectangleGeometry >( GetGeometry() );
-	geom->SetHeight( m_height );
+	geom->SetHeight( GetSize().y );
 }
 
 // ================================ //

swGUI/Core/Controls/Shapes/Rectangle.h

@@ -23,8 +23,6 @@ class Rectangle : public Shape
 	RTTR_REGISTRATION_FRIEND;
 private:
 
-	float				m_width;				///< Remove in future. This should be implemented in ArrangeCore.
-	float				m_height;				///< Remove in future. This should be implemented in ArrangeCore.
 	float				m_strokeThickness;
 
 protected:
@@ -34,9 +32,9 @@ class Rectangle : public Shape
 	virtual			~Rectangle		() = default;
 
 
-	void				SetWidth			( float width );
-	void				SetHeight			( float height );
-	void				SetThickness		( float thickness );
+	virtual void				SetWidth			( float width ) override;
+	virtual void				SetHeight			( float height ) override;
+	void				        SetThickness		( float thickness );
 
 };
 

swGUI/Core/Controls/Visual.cpp

@@ -17,6 +17,20 @@ Visual::Visual()
 	:	m_offset( Position( 0.0f, 0.0f ) )
 {}
 
+// ================================ //
+//
+void            Visual::SetWidth        ( float width )
+{
+    m_size.x = width;
+}
+
+// ================================ //
+//
+void            Visual::SetHeight       ( float height )
+{
+    m_size.y = height;
+}
+
 
 }	// gui
 }	// sw

swGUI/Core/Controls/Visual.h

@@ -34,6 +34,7 @@ class Visual : public DependencyObject
 private:
 
 	Position		m_offset;		///< Control position relative to parent.
+    Size2D          m_size;         ///< Size of control (bounding box).
 
 protected:
 
@@ -61,10 +62,13 @@ class Visual : public DependencyObject
 
 
 	Position						GetVisualOffset		() const { return m_offset; }
+    Size2D                          GetSize             () const { return m_size; }
 
 public:
 	// Temporary
 	void							SetOffset			( Position pos ) { m_offset = pos; }
+    virtual void				    SetWidth			( float width );
+    virtual void				    SetHeight			( float height );
 };
 
 

swGUI/Core/Media/Brushes/AngleGradientBrush.cpp

@@ -0,0 +1,58 @@
+/**
+@file AngleGradientBrush.cpp
+@author nieznanysprawiciel
+@copyright File is part of Sleeping Wombat Libraries.
+*/
+
+
+#include "swGUI/Core/stdafx.h"
+#include "AngleGradientBrush.h"
+
+
+
+namespace sw {
+namespace gui
+{
+
+// ================================ //
+//
+AngleGradientBrush::AngleGradientBrush()
+    : GradientBrush( AngleGradientBrush::ConstantsSize() )
+{
+    m_constants.GradientCenter = Position( 0.5f, 0.5f );
+}
+
+
+// ================================ //
+//
+BufferRange			AngleGradientBrush::BufferData			()
+{
+    return PrepareBuffer( m_constants.GetView() );
+}
+
+// ================================ //
+//
+filesystem::Path	AngleGradientBrush::ShaderFunctionFile	()
+{
+    return "$(CoreGUI-Shader-Dir)/Brush/AngleGradientBrush.psh";
+}
+
+// ================================ //
+//
+void				AngleGradientBrush::SetGradientCenter	( Point center )
+{
+    m_constants.GradientCenter = center;
+
+    InvalidateConstants();
+}
+
+// ================================ //
+//
+Size				AngleGradientBrush::ConstantsSize		() const
+{
+    return sizeof( m_constants );
+}
+
+
+}	// gui
+}	// sw

swGUI/Core/Media/Brushes/AngleGradientBrush.h

@@ -0,0 +1,61 @@
+#pragma once
+/**
+@file AngleGradientBrush.h
+@author nieznanysprawiciel
+@copyright File is part of Sleeping Wombat Libraries.
+*/
+
+
+
+#include "GradientBrush.h"
+
+#include "swCommonLib/Common/Buffers/StackBuffer.h"
+#include "swCommonLib/System/Path.h"
+#include "swGUI/Core/System/CommonTypes/CommonTypes.h"
+
+
+
+namespace sw {
+namespace gui
+{
+
+
+/**@brief Draws angle gradient on @ref Geometry.
+@ingroup Brushes*/
+class AngleGradientBrush : public GradientBrush
+{
+    RTTR_ENABLE( GradientBrush );
+    RTTR_REGISTRATION_FRIEND;
+public:
+
+    struct Constants
+    {
+        Point		GradientCenter;
+    };
+
+private:
+protected:
+
+    StackBuffer< Constants >		m_constants;
+
+public:
+    explicit		AngleGradientBrush			();
+    virtual			~AngleGradientBrush		    () = default;
+
+
+    virtual	BufferRange		    BufferData			() override;
+    virtual filesystem::Path	ShaderFunctionFile	() override;
+
+    void					    SetGradientCenter	( Point center );
+
+protected:
+
+    virtual Size				ConstantsSize		() const override;
+};
+
+DEFINE_PTR_TYPE( AngleGradientBrush );
+
+
+}	// gui
+}	// sw
+