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 "Pass page up/down directions to layout controls for keyboard focus handling...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
primitive
/
primitive-visual.h
diff --git
a/dali-toolkit/internal/visuals/primitive/primitive-visual.h
b/dali-toolkit/internal/visuals/primitive/primitive-visual.h
index
01b5885
..
6b210bd
100644
(file)
--- a/
dali-toolkit/internal/visuals/primitive/primitive-visual.h
+++ b/
dali-toolkit/internal/visuals/primitive/primitive-visual.h
@@
-44,6
+44,8
@@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/intrusive-ptr.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
@@
-58,6
+60,9
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class PrimitiveVisual;
+typedef IntrusivePtr< PrimitiveVisual > PrimitiveVisualPtr;
+
/**
* The visual which renders a simple 3D shape to the control's quad
*
/**
* The visual which renders a simple 3D shape to the control's quad
*
@@
-97,55
+102,54
@@
class PrimitiveVisual: public Visual::Base
public:
/**
public:
/**
- * @brief C
onstructor
.
+ * @brief C
reate a new primitive visual
.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] properties A Property::Map containing settings for this visual
+ * @return A smart-pointer to the newly allocated visual.
*/
*/
- PrimitiveVisual( VisualFactoryCache& factoryCache );
-
- /**
- * @brief A reference counted object may only be deleted by calling Unreference().
- */
- virtual ~PrimitiveVisual();
+ static PrimitiveVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
public: // from Visual
/**
public: // from Visual
/**
- * @copydoc Visual::
Set
Size
+ * @copydoc Visual::
Base::GetNatural
Size
*/
*/
- virtual void
SetSize( const Vector2& s
ize );
+ virtual void
GetNaturalSize( Vector2& naturalS
ize );
/**
/**
- * @copydoc Visual::
GetNaturalSize
+ * @copydoc Visual::
Base::CreatePropertyMap
*/
*/
- virtual void GetNaturalSize( Vector2& naturalSize ) const;
+ virtual void DoCreatePropertyMap( Property::Map& map ) const;
+
+protected:
/**
/**
- * @copydoc Visual::SetClipRect
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
*/
-
virtual void SetClipRect( const Rect<int>& clipRect
);
+
PrimitiveVisual( VisualFactoryCache& factoryCache
);
/**
/**
- * @
copydoc Visual::SetOffset
+ * @
brief A reference counted object may only be deleted by calling Unreference().
*/
*/
- virtual
void SetOffset( const Vector2& offset
);
+ virtual
~PrimitiveVisual(
);
/**
/**
- * @copydoc Visual::
CreatePropertyMap
+ * @copydoc Visual::
Base::DoSetProperties
*/
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-protected:
+ virtual void DoSetProperties( const Property::Map& propertyMap );
/**
/**
- * @copydoc Visual::
DoInitializ
e
+ * @copydoc Visual::
Base::DoSetOnStag
e
*/
*/
- virtual void Do
Initialize( Actor& actor, const Property::Map& propertyMap
);
+ virtual void Do
SetOnStage( Actor& actor
);
/**
/**
- * @copydoc Visual::
DoSetOnStage
+ * @copydoc Visual::
Base::OnSetTransform
*/
*/
- virtual void
DoSetOnStage( Actor& actor
);
+ virtual void
OnSetTransform(
);
private:
private:
@@
-316,7
+320,6
@@
private:
Shader mShader;
Geometry mGeometry;
Shader mShader;
Geometry mGeometry;
- Vector4 mColor; //Color of shape.
Vector3 mObjectDimensions; //Dimensions of shape, scaled to be between 0.0 and 1.0.
Vector3 mSceneCenter;
Vector3 mObjectDimensions; //Dimensions of shape, scaled to be between 0.0 and 1.0.
Vector3 mSceneCenter;