X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=docs%2Fcontent%2Fprogramming-guide%2Fimage-actor.h;fp=docs%2Fcontent%2Fprogramming-guide%2Fimage-mesh-actor.h;h=437e5a8db7f50edbedfe3c373acf7fbc0880eb99;hp=c5791014a65d71595989682896504aef9754b8ef;hb=7dbdc48ead036277d57a6a6ad61d6056c3b39a07;hpb=50047908e4f93aca3d2924dd6f42f5ebdabe9967
diff --git a/docs/content/programming-guide/image-mesh-actor.h b/docs/content/programming-guide/image-actor.h
similarity index 73%
rename from docs/content/programming-guide/image-mesh-actor.h
rename to docs/content/programming-guide/image-actor.h
index c579101..437e5a8 100644
--- a/docs/content/programming-guide/image-mesh-actor.h
+++ b/docs/content/programming-guide/image-actor.h
@@ -1,12 +1,11 @@
-/*! \page image-mesh-actor Image and Mesh actors
+/*! \page image-actor Image Actors
*
*
*
Overview
- * The Dali::ImageActor & Dali::MeshActor are inherited from Dali::Actor and provide means to display resources like Images and Geometries (Triangle meshes) on the stage.
+ * The Dali::ImageActor inherits from Dali::Actor and provide means to display resources like Images on the stage.
* All the Dali::Actor methods can be called on them.
*
* - ImageActor: An actor for displaying Images. It allows the developer to display a Dali::Image object on the stage.
- * - MeshActor: An actor for displaying one or more mesh geometries. It may have children, which may be plain actors or other mesh actors.
*
* Image Actor
*
@@ -93,41 +92,5 @@
* myImageActor.SetImage( newImage );
* @endcode
*
- * Fade in
- * It's possible to fade in the image gradually when first rendered.
- * @code
- * if (!myImageActor.GetFadeIn())
- * {
- * myImageActor.SetFadeIn(true);
- * }
- *
- * // default : 1 Second
- * myImageActor.SetFadeInDuration(seconds);
- * @endcode
- *
- *
- * Mesh Actor
- *
- * Construction
- * The mesh actor is created by passing a reference to Dali::Mesh object
- *
- * @code
- * Dali::Mesh mesh = Dali::Mesh::New();
- * Dali::MeshActor myMeshActor = Dali::MeshActor::New(mesh);
- * @endcode
-
- *
- * Modifying material
- * The developer can change the material of mesh actor using the material entity name.
- *
- * @code
- * Dali::Image image = Dali::Image::New(myTextureFile);
- * myCustomMaterial = Dali::Material::New("CustomMaterial");
- * myCustomMaterial.SetDiffuseTexture(image);
- * Dali::MeshActor::SetMaterial(myMeshActor, materialEntityNameInModel, 0, myCustomMaterial);
- *
- * @endcode
- *
- *
*/