Implement OnConnect and other missing functionality.

Change-Id: Ia7faecfec3e699f300d8fb9a6507c29655ef64c7

diff --git a/dali/internal/event/common/property-buffer-impl.cpp b/dali/internal/event/common/property-buffer-impl.cpp
index 027de42..7c03946 100644 (file)
--- a/dali/internal/event/common/property-buffer-impl.cpp
+++ b/dali/internal/event/common/property-buffer-impl.cpp
@@ -161,23 +161,22 @@ int PropertyBuffer::GetPropertyComponentIndex( Property::Index index ) const
 
 bool PropertyBuffer::OnStage() const
 {
-  // TODO: MESH_REWORK
-  DALI_ASSERT_ALWAYS( false && "TODO: MESH_REWORK" );
-  return false;
+  return mOnStage;
 }
 
 void PropertyBuffer::Connect()
 {
-  // TODO: MESH_REWORK
+  mOnStage = true;
 }
 
 void PropertyBuffer::Disconnect()
 {
-  // TODO: MESH_REWORK
+  mOnStage = false;
 }
 
 PropertyBuffer::PropertyBuffer()
-: mSceneObject(NULL)
+: mSceneObject(NULL),
+  mOnStage( false )
 {
 }
 

diff --git a/dali/internal/event/common/property-buffer-impl.h b/dali/internal/event/common/property-buffer-impl.h
index 67e9822..ea53b72 100644 (file)
--- a/dali/internal/event/common/property-buffer-impl.h
+++ b/dali/internal/event/common/property-buffer-impl.h
@@ -178,6 +178,7 @@ private: // unimplemented methods
 
 private: // data
   SceneGraph::PropertyBuffer* mSceneObject;
+  bool mOnStage;
 };
 
 } // namespace Internal

diff --git a/dali/internal/event/effects/material-impl.cpp b/dali/internal/event/effects/material-impl.cpp
index 2671316..d9418d5 100644 (file)
--- a/dali/internal/event/effects/material-impl.cpp
+++ b/dali/internal/event/effects/material-impl.cpp
@@ -254,13 +254,13 @@ int Material::GetPropertyComponentIndex( Property::Index index ) const
 
 bool Material::OnStage() const
 {
-  // TODO: MESH_REWORK
-  //DALI_ASSERT_ALWAYS( false && "TODO: MESH_REWORK" );
-  return mSceneObject != NULL;
+  return mOnStage;
 }
 
 void Material::Connect()
 {
+  mOnStage = true;
+
   SamplerConnectorContainer::const_iterator end = mSamplerConnectors.end();
   for( SamplerConnectorContainer::iterator it = mSamplerConnectors.begin();
        it < end;
@@ -272,6 +272,8 @@ void Material::Connect()
 
 void Material::Disconnect()
 {
+  mOnStage = false;
+
   SamplerConnectorContainer::const_iterator end = mSamplerConnectors.end();
   for( SamplerConnectorContainer::iterator it = mSamplerConnectors.begin();
        it < end;
@@ -282,7 +284,8 @@ void Material::Disconnect()
 }
 
 Material::Material()
-: mSceneObject( NULL )
+: mSceneObject( NULL ),
+  mOnStage( false )
 {
 }
 

diff --git a/dali/internal/event/effects/material-impl.h b/dali/internal/event/effects/material-impl.h
index 41c06d0..43a3c18 100644 (file)
--- a/dali/internal/event/effects/material-impl.h
+++ b/dali/internal/event/effects/material-impl.h
@@ -254,6 +254,7 @@ private: //data
   SamplerConnectorContainer mSamplerConnectors; ///< Vector of connectors that hold the samplers used by this material
 
   SceneGraph::Material* mSceneObject;
+  bool mOnStage;
 };
 
 } // namespace Internal

diff --git a/dali/internal/event/effects/sampler-impl.cpp b/dali/internal/event/effects/sampler-impl.cpp
index 6bded71..55f6142 100644 (file)
--- a/dali/internal/event/effects/sampler-impl.cpp
+++ b/dali/internal/event/effects/sampler-impl.cpp
@@ -178,23 +178,26 @@ int Sampler::GetPropertyComponentIndex( Property::Index index ) const
 
 bool Sampler::OnStage() const
 {
-  // TODO: MESH_REWORK
-  DALI_ASSERT_ALWAYS( false && "TODO: MESH_REWORK" );
-  return false;
+  return mOnStage;
 }
 
 void Sampler::Connect()
 {
+  mOnStage = true;
+
   mImageConnector.OnStageConnect();
 }
 
 void Sampler::Disconnect()
 {
+  mOnStage = false;
+
   mImageConnector.OnStageDisconnect();
 }
 
 Sampler::Sampler()
-: mSceneObject( NULL )
+: mSceneObject( NULL ),
+  mOnStage( false )
 {
 }
 

diff --git a/dali/internal/event/effects/sampler-impl.h b/dali/internal/event/effects/sampler-impl.h
index f6d1789..f62dad3 100644 (file)
--- a/dali/internal/event/effects/sampler-impl.h
+++ b/dali/internal/event/effects/sampler-impl.h
@@ -189,6 +189,7 @@ private: // data
   //TODO: MESH_REWORK : change to ObjectConnector
   ImageConnector mImageConnector;
   SceneGraph::Sampler* mSceneObject;
+  bool mOnStage;
 };
 
 } // namespace Internal

diff --git a/dali/internal/event/effects/shader-impl.cpp b/dali/internal/event/effects/shader-impl.cpp
index 1e37980..e82b4e3 100644 (file)
--- a/dali/internal/event/effects/shader-impl.cpp
+++ b/dali/internal/event/effects/shader-impl.cpp
@@ -55,7 +55,6 @@ ShaderPtr Shader::New( const std::string& vertexShader,
                        Dali::Shader::ShaderHints hints )
 {
   //TODO: MESH_REWORK
-  //DALI_ASSERT_ALWAYS(false && "MESH REWORK");
   ShaderPtr shader( new Shader() );
   shader->Initialize( vertexShader, fragmentShader );
   return shader;
@@ -146,20 +145,22 @@ int Shader::GetPropertyComponentIndex( Property::Index index ) const
 
 bool Shader::OnStage() const
 {
-  // TODO: MESH_REWORK
-  DALI_ASSERT_ALWAYS( false && "TODO: MESH_REWORK" );
-  return false;
+  return mOnStage;
 }
 
 void Shader::Connect()
 {
+  mOnStage = true;
 }
 
 void Shader::Disconnect()
 {
+  mOnStage = false;
 }
 
 Shader::Shader()
+: mSceneObject( NULL ),
+  mOnStage( false )
 {
 }
 

diff --git a/dali/internal/event/effects/shader-impl.h b/dali/internal/event/effects/shader-impl.h
index 4533499..3f49ac2 100644 (file)
--- a/dali/internal/event/effects/shader-impl.h
+++ b/dali/internal/event/effects/shader-impl.h
@@ -167,6 +167,7 @@ private: // unimplemented methods
 private:
   SceneGraph::Shader* mSceneObject;
   ResourceTicketPtr mTicket;
+  bool mOnStage;
 };
 
 } // namespace Internal

diff --git a/dali/internal/event/geometry/geometry-impl.cpp b/dali/internal/event/geometry/geometry-impl.cpp
index c57eb2e..efc93ef 100644 (file)
--- a/dali/internal/event/geometry/geometry-impl.cpp
+++ b/dali/internal/event/geometry/geometry-impl.cpp
@@ -186,13 +186,13 @@ int Geometry::GetPropertyComponentIndex( Property::Index index ) const
 
 bool Geometry::OnStage() const
 {
-  // TODO: MESH_REWORK
-  DALI_ASSERT_ALWAYS( false && "TODO: MESH_REWORK" );
-  return false;
+  return mOnStage;
 }
 
 void Geometry::Connect()
 {
+  mOnStage = true;
+
   PropertyBufferConnectorContainer::const_iterator end = mVertexBufferConnectors.end();
   for( PropertyBufferConnectorContainer::iterator it = mVertexBufferConnectors.begin();
        it < end;
@@ -205,6 +205,8 @@ void Geometry::Connect()
 
 void Geometry::Disconnect()
 {
+  mOnStage = false;
+
   PropertyBufferConnectorContainer::const_iterator end = mVertexBufferConnectors.end();
   for( PropertyBufferConnectorContainer::iterator it = mVertexBufferConnectors.begin();
        it < end;
@@ -216,7 +218,8 @@ void Geometry::Disconnect()
 }
 
 Geometry::Geometry()
-: mSceneObject( NULL )
+: mSceneObject( NULL ),
+  mOnStage( false )
 {
 }
 

diff --git a/dali/internal/event/geometry/geometry-impl.h b/dali/internal/event/geometry/geometry-impl.h
index f3980e9..5f667d8 100644 (file)
--- a/dali/internal/event/geometry/geometry-impl.h
+++ b/dali/internal/event/geometry/geometry-impl.h
@@ -212,6 +212,7 @@ private: // data
   PropertyBufferConnectorContainer mVertexBufferConnectors; ///< Vector of connectors that hold the property buffers used by this geometry
   PropertyBufferConnector mIndexBufferConnector;            ///< Connector that holds the index buffer used by this geometry
   SceneGraph::Geometry* mSceneObject;
+  bool mOnStage;
 };
 
 } // namespace Internal