-#ifndef __DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H
+#define DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H
/*
- * Copyright (c) 2018 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.
#include <limits>
// INTERNAL INCLUDES
+#include <dali/internal/common/matrix-utils.h>
+
+#include <dali/internal/update/common/double-buffered.h>
+#include <dali/internal/update/common/property-base.h>
#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/object/property.h>
#include <dali/public-api/object/property-input.h>
#include <dali/public-api/object/property-types.h>
-#include <dali/internal/common/message.h>
-#include <dali/internal/event/common/event-thread-services.h>
-#include <dali/internal/event/common/property-input-impl.h>
-#include <dali/internal/update/common/double-buffered.h>
-#include <dali/internal/update/common/property-base.h>
-#include <dali/internal/update/common/scene-graph-buffers.h>
+#include <dali/public-api/object/property.h>
namespace Dali
{
-
namespace Internal
{
-
namespace SceneGraph
{
-
/**
* Dirty flags record whether an animatable property has changed.
* In the frame following a change, the property is reset to a base value.
* However if the property was only "Set" (and not "Baked"), then typically the base value and previous value will not match.
* In this case the reset operation is equivalent to a "Bake", and the value is considered "dirty" for an additional frame.
*/
-static const unsigned int CLEAN_FLAG = 0x00; ///< Indicates that the value did not change in this, or the previous frame
-static const unsigned int BAKED_FLAG = 0x01; ///< Indicates that the value was Baked during the previous frame
-static const unsigned int SET_FLAG = 0x02; ///< Indicates that the value was Set during the previous frame
+static const uint32_t CLEAN_FLAG = 0x00; ///< Indicates that the value did not change in this, or the previous frame
+static const uint32_t BAKED_FLAG = 0x01; ///< Indicates that the value was Baked during the previous frame
+static const uint32_t SET_FLAG = 0x02; ///< Indicates that the value was Set during the previous frame
+static const uint32_t RESET_FLAG = 0x02; ///< Indicates that the value should be reset to the base value in the next two frames
-template <class T>
+template<class T>
class AnimatableProperty;
/**
class AnimatablePropertyBase : public PropertyBase
{
public:
-
/**
* Constructor, initialize the dirty flag
*/
AnimatablePropertyBase()
: PropertyBase(),
- mDirtyFlags( BAKED_FLAG )
- {}
+ mDirtyFlags(BAKED_FLAG)
+ {
+ }
/**
* Virtual destructor.
*/
- virtual ~AnimatablePropertyBase()
- {}
+ ~AnimatablePropertyBase() override = default;
protected: // for derived classes
-
/**
* Flag that the property has been Set during the current frame.
*/
- void OnSet()
+ virtual void OnSet()
{
mDirtyFlags = SET_FLAG;
}
/**
* Flag that the property has been Baked during the current frame.
*/
- void OnBake()
+ virtual void OnBake()
{
mDirtyFlags = BAKED_FLAG;
}
-public: // From PropertyBase
+public:
+ /**
+ * Mark the property as dirty so that it will be reset to the base value in the next two frames.
+ */
+ void MarkAsDirty()
+ {
+ mDirtyFlags = RESET_FLAG;
+ }
+public: // From PropertyBase
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::IsClean()
*/
- virtual bool IsClean() const
+ bool IsClean() const override
{
- return ( CLEAN_FLAG == mDirtyFlags );
+ return (CLEAN_FLAG == mDirtyFlags);
}
/**
* @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
*/
- virtual bool InputInitialized() const
+ bool InputInitialized() const override
{
return true; // Animatable properties are always valid
}
-protected: // so that ResetToBaseValue can set it directly
-
- unsigned int mDirtyFlags; ///< Flag whether value changed during previous 2 frames
-
+protected: // so that ResetToBaseValue can set it directly
+ uint32_t mDirtyFlags; ///< Flag whether value changed during previous 2 frames
};
-
/**
* An boolean animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<bool> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( bool initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(bool initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<bool>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::Internal::PropertyInputImpl::GetBoolean()
*/
- virtual const bool& GetBoolean( BufferIndex bufferIndex ) const
+ const bool& GetBoolean(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
void Set(BufferIndex bufferIndex, bool value)
{
// check if the value actually changed to avoid dirtying nodes unnecessarily
- if( mValue[bufferIndex] != value )
+ if(mValue[bufferIndex] != value)
{
mValue[bufferIndex] = value;
{
// check if the value actually changed to avoid dirtying nodes unnecessarily
// false + false does not change value, true + false does not either
- if( delta && !mValue[bufferIndex] )
+ if(delta && !mValue[bufferIndex])
{
- mValue[bufferIndex] += delta;
+ mValue[bufferIndex] = delta;
OnSet();
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- bool& Get(size_t bufferIndex)
+ bool& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const bool& Get(size_t bufferIndex) const
+ const bool& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- bool& operator[](size_t bufferIndex)
+ bool& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const bool& operator[](size_t bufferIndex) const
+ const bool& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
void Bake(BufferIndex bufferIndex, bool value)
{
// bake has to check the base value as current buffer value can be correct by constraint or something else
- if( mBaseValue != value )
+ if(mBaseValue != value)
{
mBaseValue = value;
// It's ok to bake both buffers as render is performed in same thread as update. Reading from event side
// has never been atomically safe.
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
OnBake();
}
*/
void BakeRelative(BufferIndex bufferIndex, bool delta)
{
- mValue[bufferIndex] += delta;
- mBaseValue = mValue[bufferIndex];
+ mValue[bufferIndex] = mValue[bufferIndex] || delta;
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<bool> mValue; ///< The double-buffered property value
- bool mBaseValue; ///< Reset to this base value at the beginning of each frame
-
+ DoubleBuffered<bool> mValue; ///< The double-buffered property value
+ bool mBaseValue; ///< Reset to this base value at the beginning of each frame
};
-
/**
* An integer animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<int> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( int initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(int initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<int>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::Internal::PropertyInputImpl::GetInteger()
*/
- virtual const int& GetInteger( BufferIndex bufferIndex ) const
+ const int& GetInteger(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- int& Get(size_t bufferIndex)
+ int& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const int& Get(size_t bufferIndex) const
+ const int& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- int& operator[](size_t bufferIndex)
+ int& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const int& operator[](size_t bufferIndex) const
+ const int& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
*/
void Bake(BufferIndex bufferIndex, int value)
{
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
- mBaseValue = mValue[bufferIndex];
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
void BakeRelative(BufferIndex bufferIndex, int delta)
{
mValue[bufferIndex] = mValue[bufferIndex] + delta;
- mBaseValue = mValue[bufferIndex];
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
*/
void SetInitialRelative(const int& delta)
{
- mValue[0] = mValue[0] + delta;
- mValue[1] = mValue[0];
+ mValue[0] = mValue[0] + delta;
+ mValue[1] = mValue[0];
mBaseValue = mValue[0];
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<int> mValue; ///< The double-buffered property value
- int mBaseValue; ///< Reset to this base value at the beginning of each frame
-
+ DoubleBuffered<int> mValue; ///< The double-buffered property value
+ int mBaseValue; ///< Reset to this base value at the beginning of each frame
};
/**
* An float animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<float> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( float initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(float initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<float>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::Internal::PropertyInputImpl::GetFloat()
*/
- virtual const float& GetFloat( BufferIndex bufferIndex ) const
+ const float& GetFloat(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- float& Get(size_t bufferIndex)
+ float& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const float& Get(size_t bufferIndex) const
+ const float& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- float& operator[](size_t bufferIndex)
+ float& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const float& operator[](size_t bufferIndex) const
+ const float& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
{
// It's ok to bake both buffers as render is performed in same thread as update. Reading from event side
// has never been atomically safe.
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
- mBaseValue = mValue[bufferIndex];
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
void BakeRelative(BufferIndex bufferIndex, float delta)
{
mValue[bufferIndex] = mValue[bufferIndex] + delta;
- mBaseValue = mValue[bufferIndex];
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
*/
void SetInitialRelative(const float& delta)
{
- mValue[0] = mValue[0] + delta;
- mValue[1] = mValue[0];
+ mValue[0] = mValue[0] + delta;
+ mValue[1] = mValue[0];
mBaseValue = mValue[0];
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<float> mValue; ///< The double-buffered property value
- float mBaseValue; ///< Reset to this base value at the beginning of each frame
+ DoubleBuffered<float> mValue; ///< The double-buffered property value
+ float mBaseValue; ///< Reset to this base value at the beginning of each frame
};
/**
* An Vector2 animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<Vector2> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( const Vector2& initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(const Vector2& initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Vector2>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::PropertyInput::GetVector2()
*/
- virtual const Vector2& GetVector2( BufferIndex bufferIndex ) const
+ const Vector2& GetVector2(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- Vector2& Get(size_t bufferIndex)
+ Vector2& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const Vector2& Get(size_t bufferIndex) const
+ const Vector2& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- Vector2& operator[](size_t bufferIndex)
+ Vector2& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const Vector2& operator[](size_t bufferIndex) const
+ const Vector2& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
{
// It's ok to bake both buffers as render is performed in same thread as update. Reading from event side
// has never been atomically safe.
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
- mBaseValue = value;
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
+ mBaseValue = value;
OnBake();
}
*/
void BakeX(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].x = value;
- mValue[1-bufferIndex].x = value;
- mBaseValue.x = value;
+ mValue[bufferIndex].x = value;
+ mValue[1 - bufferIndex].x = value;
+ mBaseValue.x = value;
OnBake();
}
*/
void BakeY(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].y = value;
- mValue[1-bufferIndex].y = value;
- mBaseValue.y = value;
+ mValue[bufferIndex].y = value;
+ mValue[1 - bufferIndex].y = value;
+ mBaseValue.y = value;
OnBake();
}
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<Vector2> mValue; ///< The double-buffered property value
- Vector2 mBaseValue; ///< Reset to this base value at the beginning of each frame
-
+ DoubleBuffered<Vector2> mValue; ///< The double-buffered property value
+ Vector2 mBaseValue; ///< Reset to this base value at the beginning of each frame
};
/**
* A Vector3 animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<Vector3> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
*/
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( const Vector3& initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(const Vector3& initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Vector3>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::PropertyInput::GetVector3()
*/
- virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
+ const Vector3& GetVector3(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- Vector3& Get(size_t bufferIndex)
+ Vector3& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const Vector3& Get(size_t bufferIndex) const
+ const Vector3& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- Vector3& operator[](size_t bufferIndex)
+ Vector3& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const Vector3& operator[](size_t bufferIndex) const
+ const Vector3& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
*/
void Bake(BufferIndex bufferIndex, const Vector3& value)
{
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
- mBaseValue = value;
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
+ mBaseValue = value;
OnBake();
}
*/
void BakeX(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].x = value;
- mValue[1-bufferIndex].x = value;
- mBaseValue.x = value;
+ mValue[bufferIndex].x = value;
+ mValue[1 - bufferIndex].x = value;
+ mBaseValue.x = value;
OnBake();
}
*/
void BakeY(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].y = value;
- mValue[1-bufferIndex].y = value;
- mBaseValue.y = value;
+ mValue[bufferIndex].y = value;
+ mValue[1 - bufferIndex].y = value;
+ mBaseValue.y = value;
OnBake();
}
*/
void BakeZ(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].z = value;
- mValue[1-bufferIndex].z = value;
- mBaseValue.z = value;
+ mValue[bufferIndex].z = value;
+ mValue[1 - bufferIndex].z = value;
+ mBaseValue.z = value;
OnBake();
}
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<Vector3> mValue; ///< The double-buffered property value
- Vector3 mBaseValue; ///< Reset to this base value at the beginning of each frame
-
+ DoubleBuffered<Vector3> mValue; ///< The double-buffered property value
+ Vector3 mBaseValue; ///< Reset to this base value at the beginning of each frame
};
/**
* A Vector4 animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<Vector4> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( const Vector4& initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(const Vector4& initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Vector4>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::PropertyInput::GetVector4()
*/
- virtual const Vector4& GetVector4( BufferIndex bufferIndex ) const
+ const Vector4& GetVector4(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- Vector4& Get(size_t bufferIndex)
+ Vector4& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const Vector4& Get(size_t bufferIndex) const
+ const Vector4& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- Vector4& operator[](size_t bufferIndex)
+ Vector4& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const Vector4& operator[](size_t bufferIndex) const
+ const Vector4& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
*/
void Bake(BufferIndex bufferIndex, const Vector4& value)
{
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
- mBaseValue = mValue[bufferIndex];
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
*/
void BakeX(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].x = value;
- mValue[1-bufferIndex].x = value;
- mBaseValue.x = mValue[bufferIndex].x;
+ mValue[bufferIndex].x = value;
+ mValue[1 - bufferIndex].x = value;
+ mBaseValue.x = mValue[bufferIndex].x;
OnBake();
}
*/
void BakeY(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].y = value;
- mValue[1-bufferIndex].y = value;
- mBaseValue.y = mValue[bufferIndex].y;
+ mValue[bufferIndex].y = value;
+ mValue[1 - bufferIndex].y = value;
+ mBaseValue.y = mValue[bufferIndex].y;
OnBake();
}
*/
void BakeZ(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].z = value;
- mValue[1-bufferIndex].z = value;
- mBaseValue.z = mValue[bufferIndex].z;
+ mValue[bufferIndex].z = value;
+ mValue[1 - bufferIndex].z = value;
+ mBaseValue.z = mValue[bufferIndex].z;
OnBake();
}
*/
void BakeW(BufferIndex bufferIndex, float value)
{
- mValue[bufferIndex].w = value;
- mValue[1-bufferIndex].w = value;
- mBaseValue.w = mValue[bufferIndex].w;
+ mValue[bufferIndex].w = value;
+ mValue[1 - bufferIndex].w = value;
+ mBaseValue.w = mValue[bufferIndex].w;
OnBake();
}
void BakeRelative(BufferIndex bufferIndex, const Vector4& delta)
{
mValue[bufferIndex] = mValue[bufferIndex] + delta;
- mBaseValue = mValue[bufferIndex];
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
void BakeXRelative(BufferIndex bufferIndex, float delta)
{
mValue[bufferIndex].x = mValue[bufferIndex].x + delta;
- mBaseValue.x = mValue[bufferIndex].x;
+ mBaseValue.x = mValue[bufferIndex].x;
OnBake();
}
void BakeYRelative(BufferIndex bufferIndex, float delta)
{
mValue[bufferIndex].y = mValue[bufferIndex].y + delta;
- mBaseValue.y = mValue[bufferIndex].y;
+ mBaseValue.y = mValue[bufferIndex].y;
OnBake();
}
void BakeZRelative(BufferIndex bufferIndex, float delta)
{
mValue[bufferIndex].z = mValue[bufferIndex].z + delta;
- mBaseValue.z = mValue[bufferIndex].z;
+ mBaseValue.z = mValue[bufferIndex].z;
OnBake();
}
void BakeWRelative(BufferIndex bufferIndex, float delta)
{
mValue[bufferIndex].w = mValue[bufferIndex].w + delta;
- mBaseValue.w = mValue[bufferIndex].w;
+ mBaseValue.w = mValue[bufferIndex].w;
OnBake();
}
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<Vector4> mValue; ///< The double-buffered property value
- Vector4 mBaseValue; ///< Reset to this base value at the beginning of each frame
-
+ DoubleBuffered<Vector4> mValue; ///< The double-buffered property value
+ Vector4 mBaseValue; ///< Reset to this base value at the beginning of each frame
};
/**
* An Quaternion animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<Quaternion> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
*/
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( const Quaternion& initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(const Quaternion& initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Quaternion>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::PropertyInput::GetQuaternion()
*/
- virtual const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const
+ const Quaternion& GetQuaternion(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- Quaternion& Get(size_t bufferIndex)
+ Quaternion& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const Quaternion& Get(size_t bufferIndex) const
+ const Quaternion& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- Quaternion& operator[](size_t bufferIndex)
+ Quaternion& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const Quaternion& operator[](size_t bufferIndex) const
+ const Quaternion& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
{
// It's ok to bake both buffers as render is performed in same thread as update. Reading from event side
// has never been atomically safe.
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
- mBaseValue = value;
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
+ mBaseValue = value;
OnBake();
}
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<Quaternion> mValue; ///< The double-buffered property value
- Quaternion mBaseValue; ///< Reset to this base value at the beginning of each frame
-
+ DoubleBuffered<Quaternion> mValue; ///< The double-buffered property value
+ Quaternion mBaseValue; ///< Reset to this base value at the beginning of each frame
};
/**
* A Matrix animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<Matrix> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( const Matrix& initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(const Matrix& initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Matrix>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::Internal::PropertyInputImpl::GetMatrix()
*/
- virtual const Matrix& GetMatrix( BufferIndex bufferIndex ) const
+ const Matrix& GetMatrix(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
OnSet();
}
-
/**
* Change the property value by a relative amount.
* @param[in] bufferIndex The buffer to write.
void SetRelative(BufferIndex bufferIndex, const Matrix& delta)
{
Matrix temp;
- Matrix::Multiply(temp, mValue[bufferIndex], delta);
+ MatrixUtils::Multiply(temp, mValue[bufferIndex], delta);
mValue[bufferIndex] = temp;
OnSet();
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- Matrix& Get(size_t bufferIndex)
+ Matrix& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const Matrix& Get(size_t bufferIndex) const
+ const Matrix& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- Matrix& operator[](size_t bufferIndex)
+ Matrix& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const Matrix& operator[](size_t bufferIndex) const
+ const Matrix& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
{
// It's ok to bake both buffers as render is performed in same thread as update. Reading from event side
// has never been atomically safe.
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
- mBaseValue = mValue[bufferIndex];
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
void BakeRelative(BufferIndex bufferIndex, const Matrix& delta)
{
Matrix temp;
- Matrix::Multiply(temp, mValue[bufferIndex], delta);
+ MatrixUtils::Multiply(temp, mValue[bufferIndex], delta);
mValue[bufferIndex] = temp;
- mBaseValue = temp;
+ mBaseValue = temp;
OnBake();
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<Matrix> mValue; ///< The double-buffered property value
- Matrix mBaseValue; ///< Reset to this base value at the beginning of each frame
-
+ DoubleBuffered<Matrix> mValue; ///< The double-buffered property value
+ Matrix mBaseValue; ///< Reset to this base value at the beginning of each frame
};
/**
* A Matrix3 animatable property of a scene-graph object.
*/
-template <>
+template<>
class AnimatableProperty<Matrix3> : public AnimatablePropertyBase
{
public:
-
/**
* Create an animatable property.
* @param [in] initialValue The initial value of the property.
*/
- AnimatableProperty( const Matrix3& initialValue )
- : mValue( initialValue ),
- mBaseValue( initialValue )
+ AnimatableProperty(const Matrix3& initialValue)
+ : mValue(initialValue),
+ mBaseValue(initialValue)
{
}
/**
* Virtual destructor.
*/
- virtual ~AnimatableProperty()
- {
- }
+ ~AnimatableProperty() override = default;
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Matrix3>();
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
*/
- virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+ void ResetToBaseValue(BufferIndex updateBufferIndex) override
{
- if (CLEAN_FLAG != mDirtyFlags)
+ if(CLEAN_FLAG != mDirtyFlags)
{
mValue[updateBufferIndex] = mBaseValue;
- mDirtyFlags = ( mDirtyFlags >> 1 );
+ mDirtyFlags = (mDirtyFlags >> 1);
}
}
/**
* @copydoc Dali::Internal::PropertyInputImpl::GetMatrix3()
*/
- virtual const Matrix3& GetMatrix3( BufferIndex bufferIndex ) const
+ const Matrix3& GetMatrix3(BufferIndex bufferIndex) const override
{
- return mValue[ bufferIndex ];
+ return mValue[bufferIndex];
}
/**
void SetRelative(BufferIndex bufferIndex, const Matrix3& delta)
{
Matrix3 temp;
- Matrix3::Multiply(temp, mValue[bufferIndex], delta);
+ MatrixUtils::Multiply(temp, mValue[bufferIndex], delta);
mValue[bufferIndex] = temp;
OnSet();
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- Matrix3& Get(size_t bufferIndex)
+ Matrix3& Get(BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- const Matrix3& Get(size_t bufferIndex) const
+ const Matrix3& Get(BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- Matrix3& operator[](size_t bufferIndex)
+ Matrix3& operator[](BufferIndex bufferIndex)
{
return mValue[bufferIndex];
}
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const Matrix3& operator[](size_t bufferIndex) const
+ const Matrix3& operator[](BufferIndex bufferIndex) const
{
return mValue[bufferIndex];
}
{
// It's ok to bake both buffers as render is performed in same thread as update. Reading from event side
// has never been atomically safe.
- mValue[bufferIndex] = value;
- mValue[1-bufferIndex] = value;
- mBaseValue = mValue[bufferIndex];
+ mValue[bufferIndex] = value;
+ mValue[1 - bufferIndex] = value;
+ mBaseValue = mValue[bufferIndex];
OnBake();
}
void BakeRelative(BufferIndex bufferIndex, const Matrix3& delta)
{
Matrix3 temp;
- Matrix3::Multiply(temp, mValue[bufferIndex], delta);
+ MatrixUtils::Multiply(temp, mValue[bufferIndex], delta);
mValue[bufferIndex] = temp;
- mBaseValue = temp;
+ mBaseValue = temp;
OnBake();
}
private:
-
// Undefined
AnimatableProperty(const AnimatableProperty& property);
AnimatableProperty& operator=(const AnimatableProperty& rhs);
private:
-
- DoubleBuffered<Matrix3> mValue; ///< The double-buffered property value
- Matrix3 mBaseValue; ///< Reset to this base value at the beginning of each frame
-
+ DoubleBuffered<Matrix3> mValue; ///< The double-buffered property value
+ Matrix3 mBaseValue; ///< Reset to this base value at the beginning of each frame
};
} // namespace SceneGraph
-// Messages for AnimatableProperty<T>
-
-template <class T>
-void BakeMessage( EventThreadServices& eventThreadServices,
- const SceneGraph::AnimatableProperty<T>& property,
- typename ParameterType< T >::PassingType newValue )
-{
- typedef MessageDoubleBuffered1< SceneGraph::AnimatableProperty<T>, T > LocalType;
-
- // Reserve some memory inside the message queue
- unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
-
- // Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &property,
- &SceneGraph::AnimatableProperty<T>::Bake,
- newValue );
-}
-
-template <class T>
-void BakeRelativeMessage( EventThreadServices& eventThreadServices,
- const SceneGraph::AnimatableProperty<T>& property,
- const T& delta )
-{
- typedef MessageDoubleBuffered1< SceneGraph::AnimatableProperty<T>, const T& > LocalType;
-
- // Reserve some memory inside the message queue
- unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
-
- // Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &property,
- &SceneGraph::AnimatableProperty<T>::BakeRelative,
- delta );
-}
-
-template <class T>
-void SetXComponentMessage( EventThreadServices& eventThreadServices,
- const SceneGraph::AnimatableProperty<T>& property,
- typename ParameterType< float >::PassingType newValue )
-{
- typedef MessageDoubleBuffered1< SceneGraph::AnimatableProperty<T>, float > LocalType;
-
- // Reserve some memory inside the message queue
- unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
-
- // Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &property,
- &SceneGraph::AnimatableProperty<T>::BakeX,
- newValue );
-}
-
-template <class T>
-void SetYComponentMessage( EventThreadServices& eventThreadServices,
- const SceneGraph::AnimatableProperty<T>& property,
- typename ParameterType< float >::PassingType newValue )
-{
- typedef MessageDoubleBuffered1< SceneGraph::AnimatableProperty<T>, float > LocalType;
-
- // Reserve some memory inside the message queue
- unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
-
- // Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &property,
- &SceneGraph::AnimatableProperty<T>::BakeY,
- newValue );
-}
-
-template <class T>
-void SetZComponentMessage( EventThreadServices& eventThreadServices,
- const SceneGraph::AnimatableProperty<T>& property,
- typename ParameterType< float >::PassingType newValue )
-{
- typedef MessageDoubleBuffered1< SceneGraph::AnimatableProperty<T>, float > LocalType;
-
- // Reserve some memory inside the message queue
- unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
-
- // Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &property,
- &SceneGraph::AnimatableProperty<T>::BakeZ,
- newValue );
-}
-
-template <class T>
-void SetWComponentMessage( EventThreadServices& eventThreadServices,
- const SceneGraph::AnimatableProperty<T>& property,
- typename ParameterType< float >::PassingType newValue )
-{
- typedef MessageDoubleBuffered1< SceneGraph::AnimatableProperty<T>, float > LocalType;
-
- // Reserve some memory inside the message queue
- unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
-
- // Construct message in the message queue memory; note that delete should not be called on the return value
- new (slot) LocalType( &property,
- &SceneGraph::AnimatableProperty<T>::BakeW,
- newValue );
-}
-
} // namespace Internal
} // namespace Dali
-#endif // __DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H
projects / platform / core / uifw / dali-core.git / blobdiff