Refactored EventToUpdate into EventThreadServices

[platform/core/uifw/dali-core.git] / dali / internal / update / node-attachments / scene-graph-mesh-attachment.cpp

diff --git a/dali/internal/update/node-attachments/scene-graph-mesh-attachment.cpp b/dali/internal/update/node-attachments/scene-graph-mesh-attachment.cpp
index dcf471e..452c308 100644 (file)
--- a/dali/internal/update/node-attachments/scene-graph-mesh-attachment.cpp
+++ b/dali/internal/update/node-attachments/scene-graph-mesh-attachment.cpp
@@ -41,9 +41,6 @@
 #include <dali/internal/render/shaders/program.h>
 #include <dali/internal/render/shaders/shader.h>
 
 #include <dali/internal/render/shaders/program.h>
 #include <dali/internal/render/shaders/shader.h>
 

-
-using namespace std;
-

 namespace Dali
 {
 
 namespace Dali
 {
 


@@ -62,10 +59,7 @@ MeshAttachment* MeshAttachment::New()
 
 MeshAttachment::MeshAttachment()
 : RenderableAttachment( true ), // scale enabled
 
 MeshAttachment::MeshAttachment()
 : RenderableAttachment( true ), // scale enabled

-  mRenderer( NULL ),
-  mAffectedByLighting(true),
-  mLastLightingState(true),
-  mLightInitialized(false)
+  mRenderer( NULL )

 {
 }
 
 {
 }
 


@@ -84,7 +78,7 @@ void MeshAttachment::ConnectToSceneGraph2( BufferIndex updateBufferIndex )
   DALI_ASSERT_DEBUG( NULL != mSceneController );
 
   // Create main renderer, passing ownership to the render-thread
   DALI_ASSERT_DEBUG( NULL != mSceneController );
 
   // Create main renderer, passing ownership to the render-thread

-  mRenderer = MeshRenderer::New( *mParent, mSceneController->GetLightController() );
+  mRenderer = MeshRenderer::New( *mParent );

   mSceneController->GetRenderMessageDispatcher().AddRenderer( *mRenderer );
 }
 
   mSceneController->GetRenderMessageDispatcher().AddRenderer( *mRenderer );
 }
 


@@ -156,11 +150,6 @@ void MeshAttachment::SetMaterial( const SceneGraph::Material* material )
   mMesh.material = material;
 }
 
   mMesh.material = material;
 }
 

-void MeshAttachment::SetAffectedByLighting( bool affectedByLighting )
-{
-  mAffectedByLighting = affectedByLighting;
-}
-

 void MeshAttachment::SetBoneNode( Node* node, size_t boneIdx, size_t boneCount )
 {
   DALI_ASSERT_DEBUG(boneIdx < mMesh.boneNodes.size());
 void MeshAttachment::SetBoneNode( Node* node, size_t boneIdx, size_t boneCount )
 {
   DALI_ASSERT_DEBUG(boneIdx < mMesh.boneNodes.size());


@@ -231,21 +220,6 @@ bool MeshAttachment::DoPrepareResources( BufferIndex updateBufferIndex, Resource
 void MeshAttachment::DoPrepareRender( BufferIndex updateBufferIndex )
 {
   DALI_ASSERT_DEBUG(mSceneController);
 void MeshAttachment::DoPrepareRender( BufferIndex updateBufferIndex )
 {
   DALI_ASSERT_DEBUG(mSceneController);

-  RenderQueue& renderQueue = mSceneController->GetRenderQueue();
-
-  if( !mLightInitialized || ( mAffectedByLighting != mLastLightingState ) )
-  {
-    mLastLightingState = mAffectedByLighting;
-    mLightInitialized = true;
-
-    typedef MessageValue1< MeshRenderer, bool > DerivedType;
-
-    // Reserve some memory inside the render queue
-    unsigned int* slot = renderQueue.ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
-
-    // Construct message in the render queue memory; note that delete should not be called on the return value
-    new (slot) DerivedType( mRenderer, &MeshRenderer::SetAffectedByLighting, mAffectedByLighting );
-  }

 
   // Provide renderer with ModelIT matrix, mesh, material, and bone transforms for the next frame
   MeshRenderer::MeshInfo& meshInfo = mRenderer->GetMeshInfo( updateBufferIndex );
 
   // Provide renderer with ModelIT matrix, mesh, material, and bone transforms for the next frame
   MeshRenderer::MeshInfo& meshInfo = mRenderer->GetMeshInfo( updateBufferIndex );