X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fmesh%2Fmesh-visual.h;h=75b4a868364d6b3d8401a845ba3f6288220aeaae;hb=574ce69b5c6abe40f245aa2dc7e36e55ca873995;hp=43e604e5a94f8762ee60afd53b39b9224b259cb0;hpb=257a9991486e4e05335212b21ecc1f5a0aacbc63;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.h b/dali-toolkit/internal/visuals/mesh/mesh-visual.h index 43e604e..75b4a86 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.h +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.h @@ -21,9 +21,11 @@ // EXTERNAL INCLUDES #include #include +#include // INTERNAL INCLUDES -#include +#include +#include #include namespace Dali @@ -35,68 +37,79 @@ namespace Toolkit namespace Internal { +class MeshVisual; +typedef IntrusivePtr< MeshVisual > MeshVisualPtr; + /** - * The renderer which renders a 3D object to the control's quad + * The visual which renders a 3D object to the control's quad * - * The following Property::Map keys are required to create a MeshRender + * The following Property::Map keys are required to create a MeshVisual * * | %Property Name | Type | Representing | * |-----------------|-------------|-----------------------------------------------------------------------| * | objectUrl | STRING | A URL to the .obj file | * | materialUrl | STRING | A URL to the .mtl file | * | texturesPath | STRING | A URL of the path to the texture images | - * | shaderType | STRING | An enum of shader types | + * | shadingMode | STRING | An enum of shading modes | * | useMipmapping | BOOLEAN | If true, use mipmaps for textures. Default true. | * | useSoftNormals | BOOLEAN | If true, average normals at points for smooth textures. Default true. | * | lightPosition | VECTOR3 | The position (on stage) of the light | */ -class MeshVisual: public Visual +class MeshVisual: public Visual::Base { public: /** - * @brief Constructor. + * @brief Create a new mesh visual. * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * @return A smart-pointer to the newly allocated visual. */ - MeshVisual( VisualFactoryCache& factoryCache ); + static MeshVisualPtr New( VisualFactoryCache& factoryCache ); + +public: // from Visual /** - * @brief A reference counted object may only be deleted by calling Unreference(). + * @copydoc Visual::Base::CreatePropertyMap */ - virtual ~MeshVisual(); - -public: // from Visual + virtual void DoCreatePropertyMap( Property::Map& map ) const; /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::DoSetProperty */ - virtual void SetSize( const Vector2& size ); + virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ); /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::DoGetProperty */ - virtual void SetClipRect( const Rect& clipRect ); + virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index ); + +protected: /** - * @copydoc Visual::SetOffset + * @brief Constructor. + * + * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object */ - virtual void SetOffset( const Vector2& offset ); + MeshVisual( VisualFactoryCache& factoryCache ); /** - * @copydoc Visual::CreatePropertyMap + * @brief A reference counted object may only be deleted by calling Unreference(). */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + virtual ~MeshVisual(); -protected: + /** + * @copydoc Visual::Base::DoSetProperties + */ + virtual void DoSetProperties( const Property::Map& propertyMap ); /** - * @copydoc Visual::DoInitialize + * @copydoc Visual::Base::OnSetTransform */ - virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); + virtual void OnSetTransform(); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); @@ -116,22 +129,14 @@ public: private: - //Corresponds to the shader that will be used by the mesh renderer. - enum ShaderType - { - TEXTURELESS, - DIFFUSE_TEXTURE, - ALL_TEXTURES - }; - /** - * @brief Provide an empty geometry for the renderer to use. + * @brief Provide an empty geometry for the visual to use. * @details For use in error cases where the initialisation has failed for varying reasons. */ void SupplyEmptyGeometry(); /** - * @brief Initialize the renderer with the geometry and shader from the cache, if not available, create and save to the cache for sharing. + * @brief Initialize the visual with the geometry and shader from the cache, if not available, create and save to the cache for sharing. */ void InitializeRenderer(); @@ -146,19 +151,19 @@ private: void UpdateShaderUniforms(); /** - * @brief Use the object URL stored in the renderer to load and create the geometry of the object. + * @brief Use the object URL stored in the mesh visual to load and create the geometry of the object. * @return Boolean of success of operation. */ bool CreateGeometry(); /** - * @brief Use the object URL stored in the renderer to load the geometry of the object. + * @brief Use the object URL stored in the visual to load the geometry of the object. * @return Boolean of success of operation. */ bool LoadGeometry(); /** - * @brief Use the material URL stored in the renderer to load the material of the object. + * @brief Use the material URL stored in the mesh visual to load the material of the object. * @return Boolean of success of operation. */ bool LoadMaterial(); @@ -172,10 +177,10 @@ private: private: // Undefined - MeshVisual( const MeshVisual& meshRenderer ); + MeshVisual( const MeshVisual& meshVisual ); // Undefined - MeshVisual& operator=( const MeshVisual& meshRenderer ); + MeshVisual& operator=( const MeshVisual& meshVisual ); private: @@ -196,7 +201,7 @@ private: Vector3 mSceneSize; Vector3 mLightPosition; - ShaderType mShaderType; + Toolkit::MeshVisual::ShadingMode::Value mShadingMode; bool mUseTexture; bool mUseMipmapping;