Removed AffectedByLighting APIs from MeshActor

Change-Id: Ie9e3fdcb4f4b18bec7bd9f28abf058b9430d83d9

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
index d9b868f..1306475 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -106,7 +106,6 @@ void BubbleEmitter::OnInitialize()
   {
     mMesh[i] = Mesh::New( meshData );
     mMeshActor[i] = MeshActor::New( mMesh[i] );
-    mMeshActor[i].SetAffectedByLighting( false );
     mMeshActor[i].SetParentOrigin(ParentOrigin::TOP_LEFT);
     mEffect[i] = BubbleEffect::New( mNumBubblePerShader );
     mEffect[i].SetEffectImage( mEffectImage );
@@ -119,7 +118,6 @@ void BubbleEmitter::OnInitialize()
   MeshData meshDataForNoise;
   ConstructBubbleMesh( meshDataForNoise, mNumBubblePerShader);
   mMeshActorForNoise = MeshActor::New( Mesh::New(meshDataForNoise) );
-  mMeshActorForNoise.SetAffectedByLighting( false );
   mMeshActorForNoise.SetParentOrigin(ParentOrigin::TOP_LEFT);
   mEffectForNoise = BubbleEffect::New( mNumBubblePerShader );
   mEffectForNoise.SetMovementArea( mMovementArea );

diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
index a4f1ffb..beb4b43 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
+++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
@@ -96,7 +96,6 @@ Actor CreateBouncingEffectActor( Property::Index& bouncePropertyIndex )
   }
 
   meshActor = Dali::MeshActor::New(mesh);
-  meshActor.SetAffectedByLighting(false);
 
   Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New( "", MESH_FRAGMENT_SHADER,
                                                              GEOMETRY_TYPE_UNTEXTURED_MESH,

diff --git a/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
index 77813e8..3a83206 100644 (file)
--- a/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
+++ b/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
@@ -584,7 +584,6 @@ void Decorator::CreateHighlight( Actor parent )
   {
     mHighlightMeshActor = MeshActor::New( mTextHighlight.CreateHighLightMesh() );
     mHighlightMeshActor.SetName( "HighlightMeshActor" );
-    mHighlightMeshActor.SetAffectedByLighting(false);
     parent.Add( mHighlightMeshActor );
   }
 }
@@ -1081,4 +1080,3 @@ MarkupProcessor::StyledTextArray Decorator::GetSelectedText()
 } // namespace Toolkit
 
 } // namespace Dali
-

diff --git a/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
index 84f8fc2..a5f2699 100644 (file)
--- a/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@ -4894,7 +4894,6 @@ void TextInput::CreateHighlight()
     mHighlightMeshActor.SetParentOrigin( ParentOrigin::TOP_LEFT );
     mHighlightMeshActor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     mHighlightMeshActor.SetPosition( 0.0f, 0.0f, DISPLAYED_HIGHLIGHT_Z_OFFSET );
-    mHighlightMeshActor.SetAffectedByLighting(false);
 
     Self().Add(mHighlightMeshActor);
   }

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 1697c9b..d6f09d8 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -788,7 +788,6 @@ void Control::SetBackgroundColor( const Vector4& color )
     // Create Mesh Actor
     MeshActor meshActor = MeshActor::New( CreateMesh() );
 
-    meshActor.SetAffectedByLighting( false );
     SetupBackgroundActor( meshActor, Actor::SCALE, color );
 
     // Set the background actor before adding so that we do not inform deriving classes

diff --git a/plugins/dali-script-v8/src/actors/actor-wrapper.cpp b/plugins/dali-script-v8/src/actors/actor-wrapper.cpp
index 9ed0edb..7d10f3a 100644 (file)
--- a/plugins/dali-script-v8/src/actors/actor-wrapper.cpp
+++ b/plugins/dali-script-v8/src/actors/actor-wrapper.cpp
@@ -356,9 +356,6 @@ const ActorFunctions ActorFunctionTable[]=
     // @todo a version of MeshActor::New( AnimatableMesh )
     // @todo SetMaterial
     // @todo GetMaterial
-    // SetAffectedByLighting  should be a property really
-    { "SetAffectedByLighting", MeshActorApi::SetAffectedByLighting, MESH_ACTOR_API },
-    { "IsAffectedByLighting",  MeshActorApi::IsAffectedByLighting,  MESH_ACTOR_API },
     // @todo BindBonesToMesh
 
     /**************************************

diff --git a/plugins/dali-script-v8/src/actors/mesh-actor-api.cpp b/plugins/dali-script-v8/src/actors/mesh-actor-api.cpp
index f744758..a22ccae 100644 (file)
--- a/plugins/dali-script-v8/src/actors/mesh-actor-api.cpp
+++ b/plugins/dali-script-v8/src/actors/mesh-actor-api.cpp
@@ -54,43 +54,6 @@ Actor MeshActorApi::New( const v8::FunctionCallbackInfo< v8::Value >& args )
 {
   return MeshActor::New();
 }
-/**
- *
- * @for MeshActor
- * @method SetAffectedByLighting
- * @param {Boolean} true = yes affected by lighting
- */
-void MeshActorApi::SetAffectedByLighting( const v8::FunctionCallbackInfo< v8::Value >& args )
-{
-  v8::Isolate* isolate = args.GetIsolate();
-  v8::HandleScope handleScope( isolate );
-  MeshActor actor =  GetMeshActor( isolate, args );
-
-  bool parameterFound( false );
-  bool afftedByLight = V8Utils::GetBooleanParameter(  PARAMETER_0, parameterFound, isolate, args );
-  if( !parameterFound )
-  {
-    DALI_SCRIPT_EXCEPTION( isolate, "bad parameter");
-    return;
-  }
-  actor.SetAffectedByLighting( afftedByLight  );
-}
-/**
- *
- * @for MeshActor
- * @method IsAffectedByLighting
- * @return {Boolean} true = yes affected by lighting
- */
-void MeshActorApi::IsAffectedByLighting( const v8::FunctionCallbackInfo< v8::Value >& args )
-{
-  v8::Isolate* isolate = args.GetIsolate();
-  v8::HandleScope handleScope( isolate );
-  MeshActor actor =  GetMeshActor( isolate, args );
-
-  args.GetReturnValue().Set(  v8::Boolean::New( isolate, actor.IsAffectedByLighting() ) );
-
-}
-
 
 } // namespace V8Plugin
 

diff --git a/plugins/dali-script-v8/src/actors/mesh-actor-api.h b/plugins/dali-script-v8/src/actors/mesh-actor-api.h
index cf0fc02..a2b1055 100644 (file)
--- a/plugins/dali-script-v8/src/actors/mesh-actor-api.h
+++ b/plugins/dali-script-v8/src/actors/mesh-actor-api.h
@@ -34,15 +34,6 @@ namespace MeshActorApi
    * constructor
    */
   Actor New( const v8::FunctionCallbackInfo< v8::Value >& args );
-
-  /**
-   * Mesh actor API
-   */
-  void SetAffectedByLighting( const v8::FunctionCallbackInfo< v8::Value >& args );
-  void IsAffectedByLighting( const v8::FunctionCallbackInfo< v8::Value >& args );
-
-
-
 }; // namespace MeshActorApi
 
 } // namespace V8Plugin