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
bc57a9b
..
6b210bd
100644
(file)
--- a/
dali-toolkit/internal/visuals/primitive/primitive-visual.h
+++ b/
dali-toolkit/internal/visuals/primitive/primitive-visual.h
@@
-44,8
+44,11
@@
* 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
// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
namespace Dali
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
namespace Dali
@@
-57,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
*
@@
-96,63
+102,56
@@
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::
SetClipRect
+ * @copydoc Visual::
Base::CreatePropertyMap
*/
*/
- virtual void SetClipRect( const Rect<int>& clipRect );
+ virtual void DoCreatePropertyMap( Property::Map& map ) const;
+
+protected:
/**
/**
- * @copydoc Visual::SetOffset
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
*/
-
virtual void SetOffset( const Vector2& offset
);
+
PrimitiveVisual( VisualFactoryCache& factoryCache
);
/**
/**
- * @
copydoc Visual::CreatePropertyMap
+ * @
brief A reference counted object may only be deleted by calling Unreference().
*/
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-protected:
+ virtual ~PrimitiveVisual();
/**
/**
- * @copydoc Visual::
DoInitialize
+ * @copydoc Visual::
Base::DoSetProperties
*/
*/
- virtual void Do
Initialize( Actor& actor,
const Property::Map& propertyMap );
+ virtual void Do
SetProperties(
const Property::Map& propertyMap );
/**
/**
- * @copydoc Visual::DoSetOnStage
+ * @copydoc Visual::
Base::
DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
*/
virtual void DoSetOnStage( Actor& actor );
-private:
+ /**
+ * @copydoc Visual::Base::OnSetTransform
+ */
+ virtual void OnSetTransform();
- enum PrimitiveType
- {
- SPHERE,
- CONE,
- CONICAL_FRUSTRUM,
- CYLINDER,
- CUBE,
- OCTAHEDRON,
- BEVELLED_CUBE
- };
+private:
//Simple struct to store the position and normal of a single vertex.
struct Vertex
//Simple struct to store the position and normal of a single vertex.
struct Vertex
@@
-321,8
+320,6
@@
private:
Shader mShader;
Geometry mGeometry;
Shader mShader;
Geometry mGeometry;
- std::string mShape; //Shape to render, as string.
- 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;
@@
-342,7
+339,7
@@
private:
int mSlices; ///< Number of slices to use when creating certain objects.
int mStacks; ///< Number of stacks to use when creating certain objects.
int mSlices; ///< Number of slices to use when creating certain objects.
int mStacks; ///< Number of stacks to use when creating certain objects.
-
Primitive
Type mPrimitiveType; //Shape to render, as enum.
+
Toolkit::PrimitiveVisual::Shape::
Type mPrimitiveType; //Shape to render, as enum.
};
} // namespace Internal
};
} // namespace Internal