Removed AffectedByLighting APIs from MeshActor

Change-Id: I8e1fb53322a0574c5a85afed1f597b63d900fc55

diff --git a/automated-tests/src/dali/utc-Dali-Material.cpp b/automated-tests/src/dali/utc-Dali-Material.cpp
index bca658709a65b654fb554eff5209fb9a38fe955f..e07ecddbe34101e046e211af77940bd5d3e7d933 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Material.cpp
+++ b/automated-tests/src/dali/utc-Dali-Material.cpp
@@ -205,7 +205,6 @@ int UtcDaliMaterialStage01(void)
     {
       MeshActor meshActor = MeshActor::New(mesh);
       meshActor.SetSize(100, 100);
-      meshActor.SetAffectedByLighting(false);
       Stage::GetCurrent().Add(meshActor);
       application.SendNotification();
       application.Render();
@@ -285,7 +284,6 @@ int UtcDaliMaterialStage02(void)
     {
       MeshActor meshActor = MeshActor::New(mesh);
       meshActor.SetSize(100, 100);
-      meshActor.SetAffectedByLighting(false);
       Stage::GetCurrent().Add(meshActor);
       application.SendNotification();
       application.Render();

diff --git a/dali/internal/event/actor-attachments/mesh-attachment-impl.cpp b/dali/internal/event/actor-attachments/mesh-attachment-impl.cpp
index e07d65a21371e7b51a07facdf7d38fcf5840b1eb..a88316718abc8b0c1073622cf7659e6836371ca2 100644 (file)
--- a/dali/internal/event/actor-attachments/mesh-attachment-impl.cpp
+++ b/dali/internal/event/actor-attachments/mesh-attachment-impl.cpp
@@ -50,8 +50,7 @@ MeshAttachmentPtr MeshAttachment::New( Stage& stage, const SceneGraph::Node& par
 
 MeshAttachment::MeshAttachment( Stage& stage )
 : RenderableAttachment( stage ),
-  mSceneObject( NULL ),
-  mAffectedByLighting( true )
+  mSceneObject( NULL )
 {
 }
 

diff --git a/dali/internal/event/actor-attachments/mesh-attachment-impl.h b/dali/internal/event/actor-attachments/mesh-attachment-impl.h
index 135333a64b7fddda659ca18f1a39f52cec7b855e..319a3bd5d2871724817bfa2072f13b5b11f0493a 100644 (file)
--- a/dali/internal/event/actor-attachments/mesh-attachment-impl.h
+++ b/dali/internal/event/actor-attachments/mesh-attachment-impl.h
@@ -226,7 +226,6 @@ private:
   const SceneGraph::MeshAttachment* mSceneObject; ///< Not owned
 
   MeshAndCustomMaterial mMesh;
-  bool                  mAffectedByLighting;
   ConnectorList         mConnectors;
 };
 

diff --git a/dali/public-api/actors/mesh-actor.cpp b/dali/public-api/actors/mesh-actor.cpp
index 146b88c868e8c1afb6a0493b308571bd1896267e..00a1b3acbb54afd0239817be476461429aa89e5d 100644 (file)
--- a/dali/public-api/actors/mesh-actor.cpp
+++ b/dali/public-api/actors/mesh-actor.cpp
@@ -98,15 +98,6 @@ Material MeshActor::GetMaterial() const
   return GetImplementation(*this).GetMaterial();
 }
 
-void MeshActor::SetAffectedByLighting(bool affectedByLighting)
-{
-}
-
-bool MeshActor::IsAffectedByLighting()
-{
-  return false;
-}
-
 void MeshActor::BindBonesToMesh(Actor rootActor)
 {
   Internal::ActorPtr root(&GetImplementation(rootActor));

diff --git a/dali/public-api/actors/mesh-actor.h b/dali/public-api/actors/mesh-actor.h
index d9aecf166cb0fea334a54bb26d89792f3a48f6b2..cd88e5b103c58ef59352dc103861c39409b233ad 100644 (file)
--- a/dali/public-api/actors/mesh-actor.h
+++ b/dali/public-api/actors/mesh-actor.h
@@ -133,28 +133,6 @@ public:
    */
   Material GetMaterial() const;
 
-  /**
-   * @brief Set whether this mesh actor should be affected by lights in the scene.
-   *
-   * If it is set to false, then the mesh will be unaffected by
-   * lighting, and will be drawn with flat lighting, applying
-   * the material's diffuse & ambient colors and the actor's color to the
-   * material texture. If it is set to true, and there are no lights in the
-   * scene, the mesh will not be drawn.
-   *
-   * @note This property is not inherited.
-   * @note The default value is true.
-   * @param[in] affectedByLighting Whether the actor should be lit by the scene lighting.
-   */
-  void SetAffectedByLighting(bool affectedByLighting);
-
-  /**
-   * @brief Get the lighting status.
-   *
-   * @return true if the actor is affected by the scene lighting, or false if its evenly lit.
-   */
-  bool IsAffectedByLighting();
-
   /**
    * @brief Search the actor tree for all named bones in the mesh and connect them.
    *