AnimatableProperty Set/Bake now resets properly.

[platform/core/uifw/dali-core.git] / dali / internal / event / rendering / visual-renderer-impl.cpp

diff --git a/dali/internal/event/rendering/visual-renderer-impl.cpp b/dali/internal/event/rendering/visual-renderer-impl.cpp
index b7a758c..62a78ac 100644 (file)
--- a/dali/internal/event/rendering/visual-renderer-impl.cpp
+++ b/dali/internal/event/rendering/visual-renderer-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END
 #include <dali/internal/event/common/property-input-impl.h>
+#include <dali/internal/update/common/animatable-property-messages.h>
 #include <dali/internal/update/manager/update-manager.h>
 #include <dali/internal/update/rendering/scene-graph-renderer.h>
 #include <dali/public-api/object/type-registry.h>
@@ -66,20 +67,19 @@ TypeRegistration mType(typeid(Dali::VisualRenderer), typeid(Dali::Renderer), Cre
 VisualRendererPtr VisualRenderer::New()
 {
   // create scene object first so it's guaranteed to exist for the event side
-  auto sceneObject = SceneGraph::Renderer::New();
+  auto sceneObjectKey = SceneGraph::Renderer::NewKey();
 
-  sceneObject->SetVisualProperties(new AnimatableVisualProperties());
+  sceneObjectKey->SetVisualProperties(new SceneGraph::VisualRenderer::AnimatableVisualProperties());
 
-  OwnerPointer<SceneGraph::Renderer> transferOwnership(sceneObject);
   // pass the pointer to base for message passing
-  VisualRendererPtr rendererPtr(new VisualRenderer(sceneObject));
+  VisualRendererPtr rendererPtr(new VisualRenderer(sceneObjectKey.Get()));
 
   rendererPtr->AddUniformMappings(); // Ensure properties are mapped to uniforms
 
   // transfer scene object ownership to update manager
   EventThreadServices&       eventThreadServices = rendererPtr->GetEventThreadServices();
   SceneGraph::UpdateManager& updateManager       = eventThreadServices.GetUpdateManager();
-  AddRendererMessage(updateManager, transferOwnership);
+  AddRendererMessage(updateManager, sceneObjectKey);
 
   eventThreadServices.RegisterObject(rendererPtr.Get());
   return rendererPtr;
@@ -120,7 +120,7 @@ void VisualRenderer::SetDefaultProperty(Property::Index        index,
 
           if(visualProperties)
           {
-            BakeMessage<Vector2>(GetEventThreadServices(), visualProperties->mTransformOffset, mPropertyCache.mTransformOffset);
+            BakeMessage<Vector2>(GetEventThreadServices(), *mUpdateObject, visualProperties->mTransformOffset, mPropertyCache.mTransformOffset);
           }
         }
         break;
@@ -134,7 +134,7 @@ void VisualRenderer::SetDefaultProperty(Property::Index        index,
           auto                        visualProperties = sceneObject.GetVisualProperties();
           if(visualProperties)
           {
-            BakeMessage<Vector2>(GetEventThreadServices(), visualProperties->mTransformSize, mPropertyCache.mTransformSize);
+            BakeMessage<Vector2>(GetEventThreadServices(), *mUpdateObject, visualProperties->mTransformSize, mPropertyCache.mTransformSize);
           }
         }
         break;
@@ -147,7 +147,7 @@ void VisualRenderer::SetDefaultProperty(Property::Index        index,
           auto                        visualProperties = sceneObject.GetVisualProperties();
           if(visualProperties)
           {
-            BakeMessage<Vector2>(GetEventThreadServices(), visualProperties->mTransformOrigin, mPropertyCache.mTransformOrigin);
+            BakeMessage<Vector2>(GetEventThreadServices(), *mUpdateObject, visualProperties->mTransformOrigin, mPropertyCache.mTransformOrigin);
           }
         }
         break;
@@ -160,7 +160,7 @@ void VisualRenderer::SetDefaultProperty(Property::Index        index,
           auto                        visualProperties = sceneObject.GetVisualProperties();
           if(visualProperties)
           {
-            BakeMessage<Vector2>(GetEventThreadServices(), visualProperties->mTransformAnchorPoint, mPropertyCache.mTransformAnchorPoint);
+            BakeMessage<Vector2>(GetEventThreadServices(), *mUpdateObject, visualProperties->mTransformAnchorPoint, mPropertyCache.mTransformAnchorPoint);
           }
         }
         break;
@@ -173,7 +173,7 @@ void VisualRenderer::SetDefaultProperty(Property::Index        index,
           auto                        visualProperties = sceneObject.GetVisualProperties();
           if(visualProperties)
           {
-            BakeMessage<Vector4>(GetEventThreadServices(), visualProperties->mTransformOffsetSizeMode, mPropertyCache.mTransformOffsetSizeMode);
+            BakeMessage<Vector4>(GetEventThreadServices(), *mUpdateObject, visualProperties->mTransformOffsetSizeMode, mPropertyCache.mTransformOffsetSizeMode);
           }
         }
         break;
@@ -186,7 +186,7 @@ void VisualRenderer::SetDefaultProperty(Property::Index        index,
           auto                        visualProperties = sceneObject.GetVisualProperties();
           if(visualProperties)
           {
-            BakeMessage<Vector2>(GetEventThreadServices(), visualProperties->mExtraSize, mPropertyCache.mExtraSize);
+            BakeMessage<Vector2>(GetEventThreadServices(), *mUpdateObject, visualProperties->mExtraSize, mPropertyCache.mExtraSize);
           }
         }
         break;
@@ -199,7 +199,7 @@ void VisualRenderer::SetDefaultProperty(Property::Index        index,
           auto                        visualProperties = sceneObject.GetVisualProperties();
           if(visualProperties)
           {
-            BakeMessage<Vector3>(GetEventThreadServices(), visualProperties->mMixColor, mPropertyCache.mMixColor);
+            BakeMessage<Vector3>(GetEventThreadServices(), *mUpdateObject, visualProperties->mMixColor, mPropertyCache.mMixColor);
           }
         }
         break;
@@ -216,7 +216,7 @@ void VisualRenderer::SetDefaultProperty(Property::Index        index,
             if(visualProperties)
             {
               mPropertyCache.mPreMultipliedAlpha = preMultipliedAlpha;
-              BakeMessage<float>(GetEventThreadServices(), visualProperties->mPreMultipliedAlpha, preMultipliedAlpha);
+              BakeMessage<float>(GetEventThreadServices(), *mUpdateObject, visualProperties->mPreMultipliedAlpha, preMultipliedAlpha);
             }
           }
         }