X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fwireframe%2Fwireframe-visual.h;h=e1ba79c1ad350eca64cbe68a31f8b8ef9e0b3a15;hb=HEAD;hp=d63cfa8cf2055abe24f833d2fe1bb59050474d71;hpb=8641983679bb074a9951c2df9fff7ac6cbf5f5f2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h index d63cfa8..e1ba79c 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_WIREFRAME_VISUAL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,23 +26,19 @@ namespace Dali { - namespace Toolkit { - namespace Internal { - class WireframeVisual; -typedef IntrusivePtr< WireframeVisual > WireframeVisualPtr; +typedef IntrusivePtr WireframeVisualPtr; /** * @brief Renders a wireframe outline to the control's quad. */ -class WireframeVisual: public Visual::Base +class WireframeVisual : public Visual::Base { public: - /** * @brief Create a new wireframe visual. * @@ -50,7 +46,7 @@ public: * @param[in] properties A Property::Map containing settings for this visual * @return A smart-pointer to the newly allocated visual. */ - static WireframeVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties ); + static WireframeVisualPtr New(VisualFactoryCache& factoryCache, const Property::Map& properties); /** * @brief Create a new wireframe visual with an encapsulated actual visual. @@ -61,7 +57,7 @@ public: * @param[in] actualVisual The encapsulated actual visual. * @return A smart-pointer to the newly allocated visual. */ - static WireframeVisualPtr New( VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual ); + static WireframeVisualPtr New(VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual); /** * @brief Create a new wireframe visual with an encapsulated actual visual. @@ -73,18 +69,16 @@ public: * @param[in] properties A Property::Map containing settings for this visual * @return A smart-pointer to the newly allocated visual. */ - static WireframeVisualPtr New( VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual, const Property::Map& properties ); - + static WireframeVisualPtr New(VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual, const Property::Map& properties); protected: - /** * @brief Constructor. * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object * @param[in] actualVisual The encapsulated actual visual. */ - WireframeVisual( VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual ); + WireframeVisual(VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual); /** * @brief A reference counted object may only be deleted by calling Unreference(). @@ -92,48 +86,52 @@ protected: virtual ~WireframeVisual(); protected: // from Visual::Base + /** + * @copydoc Visual::Base::OnInitialize + */ + void OnInitialize() override; /** * @copydoc Visual::Base::GetHeightForWidth() */ - virtual float GetHeightForWidth( float width ); + float GetHeightForWidth(float width) override; /** * @copydoc Visual::Base::GetNaturalSize() */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize(Vector2& naturalSize) override; /** * @copydoc Visual::Base::CreatePropertyMap() */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap(Property::Map& map) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap(Property::Map& map) const override; /** * @copydoc Visual::Base::DoSetProperties() */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties(const Property::Map& propertyMap) override; /** - * @copydoc Visual::Base::DoSetOnStage + * @copydoc Visual::Base::DoSetOnScene */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnScene(Actor& actor) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; /** * @copydoc Visual::Base::GetVisualObject * * Overriding as this visual can sometimes act as a proxy to the actual visual, i.e. when using debug rendering. */ - virtual Base& GetVisualObject() override; + Base& GetVisualObject() override; private: /** @@ -142,21 +140,14 @@ private: */ Geometry CreateQuadWireframeGeometry(); - /** - * @brief Initialise the renderer from the cache, if not available, create and save to the cache for sharing. - */ - void InitializeRenderer(); - // Undefined - WireframeVisual( const WireframeVisual& visual); + WireframeVisual(const WireframeVisual& visual); // Undefined - WireframeVisual& operator=( const WireframeVisual& visual ); + WireframeVisual& operator=(const WireframeVisual& visual); private: - Visual::BasePtr mActualVisual; - }; } // namespace Internal