projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Changed default font family of 7.0 IoT UX" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
wireframe
/
wireframe-visual.h
diff --git
a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
index
9edeca8
..
e1ba79c
100644
(file)
--- 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
/*
#define DALI_TOOLKIT_INTERNAL_WIREFRAME_VISUAL_H
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
*
* 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 Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
class WireframeVisual;
class WireframeVisual;
-typedef IntrusivePtr<
WireframeVisual
> WireframeVisualPtr;
+typedef IntrusivePtr<
WireframeVisual
> WireframeVisualPtr;
/**
* @brief Renders a wireframe outline to the control's quad.
*/
/**
* @brief Renders a wireframe outline to the control's quad.
*/
-class WireframeVisual: public Visual::Base
+class WireframeVisual
: public Visual::Base
{
public:
{
public:
-
/**
* @brief Create a new wireframe visual.
*
/**
* @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.
*/
* @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.
/**
* @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.
*/
* @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.
/**
* @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.
*/
* @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:
protected:
-
/**
* @brief Constructor.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @param[in] actualVisual The encapsulated actual visual.
*/
/**
* @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().
/**
* @brief A reference counted object may only be deleted by calling Unreference().
@@
-92,41
+86,52
@@
protected:
virtual ~WireframeVisual();
protected: // from Visual::Base
virtual ~WireframeVisual();
protected: // from Visual::Base
+ /**
+ * @copydoc Visual::Base::OnInitialize
+ */
+ void OnInitialize() override;
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
-
virtual float GetHeightForWidth( float width )
;
+
float GetHeightForWidth(float width) override
;
/**
* @copydoc Visual::Base::GetNaturalSize()
*/
/**
* @copydoc Visual::Base::GetNaturalSize()
*/
- v
irtual void GetNaturalSize( Vector2& naturalSize )
;
+ v
oid GetNaturalSize(Vector2& naturalSize) override
;
/**
* @copydoc Visual::Base::CreatePropertyMap()
*/
/**
* @copydoc Visual::Base::CreatePropertyMap()
*/
- v
irtual void DoCreatePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreatePropertyMap(Property::Map& map) const override
;
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
- v
irtual void DoCreateInstancePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreateInstancePropertyMap(Property::Map& map) const override
;
/**
* @copydoc Visual::Base::DoSetProperties()
*/
/**
* @copydoc Visual::Base::DoSetProperties()
*/
- v
irtual void DoSetProperties( const Property::Map& propertyMap )
;
+ v
oid DoSetProperties(const Property::Map& propertyMap) override
;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetOnScene(Actor& actor) override
;
/**
* @copydoc Visual::Base::OnSetTransform
*/
/**
* @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.
+ */
+ Base& GetVisualObject() override;
private:
/**
private:
/**
@@
-135,21
+140,14
@@
private:
*/
Geometry CreateQuadWireframeGeometry();
*/
Geometry CreateQuadWireframeGeometry();
- /**
- * @brief Initialise the renderer from the cache, if not available, create and save to the cache for sharing.
- */
- void InitializeRenderer();
-
// Undefined
// Undefined
- WireframeVisual(
const WireframeVisual& visual);
+ WireframeVisual(const WireframeVisual& visual);
// Undefined
// Undefined
- WireframeVisual& operator=(
const WireframeVisual& visual
);
+ WireframeVisual& operator=(
const WireframeVisual& visual
);
private:
private:
-
Visual::BasePtr mActualVisual;
Visual::BasePtr mActualVisual;
-
};
} // namespace Internal
};
} // namespace Internal