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 "Merge branch 'devel/master(1.2.18)' into tizen" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
mesh
/
mesh-visual.h
diff --git
a/dali-toolkit/internal/visuals/mesh/mesh-visual.h
b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
index
d1852e9
..
8a9010c
100644
(file)
--- a/
dali-toolkit/internal/visuals/mesh/mesh-visual.h
+++ b/
dali-toolkit/internal/visuals/mesh/mesh-visual.h
@@
-21,6
+21,7
@@
// EXTERNAL INCLUDES
#include <fstream>
#include <string.h>
// EXTERNAL INCLUDES
#include <fstream>
#include <string.h>
+#include <dali/public-api/common/intrusive-ptr.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/mesh-visual-properties.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/mesh-visual-properties.h>
@@
-36,6
+37,9
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class MeshVisual;
+typedef IntrusivePtr< MeshVisual > MeshVisualPtr;
+
/**
* The visual which renders a 3D object to the control's quad
*
/**
* The visual which renders a 3D object to the control's quad
*
@@
-56,45
+60,43
@@
class MeshVisual: public Visual::Base
public:
/**
public:
/**
- * @brief C
onstructor
.
+ * @brief C
reate a new mesh visual
.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @return A smart-pointer to the newly allocated visual.
*/
*/
- MeshVisual( VisualFactoryCache& factoryCache );
-
- /**
- * @brief A reference counted object may only be deleted by calling Unreference().
- */
- virtual ~MeshVisual();
+ static MeshVisualPtr New( VisualFactoryCache& factoryCache );
public: // from Visual
/**
public: // from Visual
/**
- * @copydoc Visual::Base::
SetSize
+ * @copydoc Visual::Base::
CreatePropertyMap
*/
*/
- virtual void SetSize( const Vector2& size );
+ virtual void DoCreatePropertyMap( Property::Map& map ) const;
+
+protected:
/**
/**
- * @copydoc Visual::Base::SetClipRect
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
*/
-
virtual void SetClipRect( const Rect<int>& clipRect
);
+
MeshVisual( VisualFactoryCache& factoryCache
);
/**
/**
- * @
copydoc Visual::Base::SetOffset
+ * @
brief A reference counted object may only be deleted by calling Unreference().
*/
*/
- virtual
void SetOffset( const Vector2& offset
);
+ virtual
~MeshVisual(
);
/**
/**
- * @copydoc Visual::Base::
CreatePropertyMap
+ * @copydoc Visual::Base::
DoSetProperties
*/
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-protected:
+ virtual void DoSetProperties( const Property::Map& propertyMap );
/**
/**
- * @copydoc Visual::Base::
DoInitialize
+ * @copydoc Visual::Base::
OnSetTransform
*/
*/
- virtual void
DoInitialize( Actor& actor, const Property::Map& propertyMap
);
+ virtual void
OnSetTransform(
);
/**
* @copydoc Visual::Base::DoSetOnStage
/**
* @copydoc Visual::Base::DoSetOnStage