projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Changed 'virtual' function override declarations to 'override' in automated...
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
manager
/
transform-manager-property.h
diff --git
a/dali/internal/update/manager/transform-manager-property.h
b/dali/internal/update/manager/transform-manager-property.h
index
f64d65e
..
fc1583b
100644
(file)
--- a/
dali/internal/update/manager/transform-manager-property.h
+++ b/
dali/internal/update/manager/transform-manager-property.h
@@
-2,7
+2,7
@@
#define TRANSFORM_MANAGER_PROPERTY_H_
/*
#define TRANSFORM_MANAGER_PROPERTY_H_
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-35,35
+35,35
@@
struct TransformManagerPropertyHandler : public AnimatablePropertyBase
* Constructor
*/
TransformManagerPropertyHandler()
* Constructor
*/
TransformManagerPropertyHandler()
- :mTxManager(
0
),
+ :mTxManager(
nullptr
),
mId( INVALID_TRANSFORM_ID )
{}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
mId( INVALID_TRANSFORM_ID )
{}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
-
virtual Dali::Property::Type GetType() const
= 0;
+
Dali::Property::Type GetType() const override
= 0;
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- virtual T& Get(
size_t bufferIndex
) = 0;
+ virtual T& Get(
BufferIndex bufferIndex
) = 0;
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
/**
* @copydoc Dali::SceneGraph::AnimatableProperty::Get()
*/
- virtual const T& Get(
size_t bufferIndex
) const = 0;
+ virtual const T& Get(
BufferIndex bufferIndex
) const = 0;
/**
* @copydoc Dali::PropertyInput::GetVector3()
*/
/**
* @copydoc Dali::PropertyInput::GetVector3()
*/
-
virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
{ return Vector3::ZERO; }
+
const Vector3& GetVector3( BufferIndex bufferIndex ) const override
{ return Vector3::ZERO; }
/**
* Retrieve a component of property
* @param[in] component The component of the property
*/
/**
* Retrieve a component of property
* @param[in] component The component of the property
*/
- virtual const float& GetFloatComponent(u
nsigned in
t component)=0;
+ virtual const float& GetFloatComponent(u
int32_
t component)=0;
/**
* Set the property value. This will only persist for the current frame; the property
/**
* Set the property value. This will only persist for the current frame; the property
@@
-78,7
+78,7
@@
struct TransformManagerPropertyHandler : public AnimatablePropertyBase
* @param[in] value The new value of the component
* @param[in] component The component of the property
*/
* @param[in] value The new value of the component
* @param[in] component The component of the property
*/
- virtual void SetFloatComponent( float value, u
nsigned in
t component){}
+ virtual void SetFloatComponent( float value, u
int32_
t component){}
/**
* @copydoc Dali::AnimatableProperty::Bake()
/**
* @copydoc Dali::AnimatableProperty::Bake()
@@
-90,7
+90,7
@@
struct TransformManagerPropertyHandler : public AnimatablePropertyBase
* @param[in] value The new value of the component
* @param[in] component The component of the property
*/
* @param[in] value The new value of the component
* @param[in] component The component of the property
*/
- virtual void BakeFloatComponent( float value, u
nsigned in
t component){}
+ virtual void BakeFloatComponent( float value, u
int32_
t component){}
/**
* @copydoc Dali::AnimatableProperty::BakeX()
/**
* @copydoc Dali::AnimatableProperty::BakeX()
@@
-120,12
+120,12
@@
struct TransformManagerPropertyHandler : public AnimatablePropertyBase
/**
* @copydoc Dali::AnimatableProperty::ResetToBaseValue()
*/
/**
* @copydoc Dali::AnimatableProperty::ResetToBaseValue()
*/
- v
irtual void ResetToBaseValue(BufferIndex updateBufferIndex)
{}
+ v
oid ResetToBaseValue(BufferIndex updateBufferIndex) override
{}
/**
* @copydoc Dali::AnimatableProperty::IsClean()
*/
/**
* @copydoc Dali::AnimatableProperty::IsClean()
*/
-
virtual bool IsClean() const
{ return false; }
+
bool IsClean() const override
{ return false; }
/**
* Initializes the property
/**
* Initializes the property
@@
-141,7
+141,7
@@
struct TransformManagerPropertyHandler : public AnimatablePropertyBase
/**
* @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
*/
/**
* @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
*/
- virtual bool IsTransformManagerProperty() const
+ bool IsTransformManagerProperty() const override
{
return true;
}
{
return true;
}
@@
-158,82
+158,82
@@
struct TransformManagerPropertyVector3 : public TransformManagerPropertyHandler<
mProperty( property )
{}
mProperty( property )
{}
- Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const
override
{
return Dali::PropertyTypes::Get<Vector3>();
}
{
return Dali::PropertyTypes::Get<Vector3>();
}
- Vector3& Get(
size_t bufferIndex)
+ Vector3& Get(
BufferIndex bufferIndex ) override
{
return mTxManager->GetVector3PropertyValue( mId, mProperty );
}
{
return mTxManager->GetVector3PropertyValue( mId, mProperty );
}
- const Vector3& Get(
size_t bufferIndex) const
+ const Vector3& Get(
BufferIndex bufferIndex ) const override
{
return mTxManager->GetVector3PropertyValue( mId, mProperty );
}
{
return mTxManager->GetVector3PropertyValue( mId, mProperty );
}
- virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
+ const Vector3& GetVector3( BufferIndex bufferIndex ) const override
{
return Get(bufferIndex);
}
{
return Get(bufferIndex);
}
- const float& GetFloatComponent( u
nsigned int component )
+ const float& GetFloatComponent( u
int32_t component ) override
{
return mTxManager->GetVector3PropertyComponentValue( mId, mProperty, component );
}
{
return mTxManager->GetVector3PropertyComponentValue( mId, mProperty, component );
}
- void Set(BufferIndex bufferIndex, const Vector3& value)
+ void Set(BufferIndex bufferIndex, const Vector3& value)
override
{
mTxManager->SetVector3PropertyValue( mId, mProperty, value );
}
{
mTxManager->SetVector3PropertyValue( mId, mProperty, value );
}
- void SetComponent(BufferIndex bufferIndex, float value, u
nsigned in
t component)
+ void SetComponent(BufferIndex bufferIndex, float value, u
int32_
t component)
{
mTxManager->SetVector3PropertyComponentValue( mId, mProperty, value, component);
}
{
mTxManager->SetVector3PropertyComponentValue( mId, mProperty, value, component);
}
- void BakeComponent(BufferIndex bufferIndex, float value, u
nsigned in
t component)
+ void BakeComponent(BufferIndex bufferIndex, float value, u
int32_
t component)
{
mTxManager->BakeVector3PropertyComponentValue( mId, mProperty, value, component);
}
{
mTxManager->BakeVector3PropertyComponentValue( mId, mProperty, value, component);
}
- void Bake(BufferIndex bufferIndex, const Vector3& value)
+ void Bake(BufferIndex bufferIndex, const Vector3& value)
override
{
mTxManager->BakeVector3PropertyValue(mId, mProperty, value );
}
{
mTxManager->BakeVector3PropertyValue(mId, mProperty, value );
}
- void BakeX(BufferIndex bufferIndex, float value)
+ void BakeX(BufferIndex bufferIndex, float value)
override
{
mTxManager->BakeXVector3PropertyValue(mId, mProperty, value );
}
{
mTxManager->BakeXVector3PropertyValue(mId, mProperty, value );
}
- void BakeY(BufferIndex bufferIndex, float value)
+ void BakeY(BufferIndex bufferIndex, float value)
override
{
mTxManager->BakeYVector3PropertyValue(mId, mProperty, value );
}
{
mTxManager->BakeYVector3PropertyValue(mId, mProperty, value );
}
- void BakeZ(BufferIndex bufferIndex, float value)
+ void BakeZ(BufferIndex bufferIndex, float value)
override
{
mTxManager->BakeZVector3PropertyValue(mId, mProperty, value );
}
{
mTxManager->BakeZVector3PropertyValue(mId, mProperty, value );
}
- void SetFloatComponent( float value, u
nsigned int component)
+ void SetFloatComponent( float value, u
int32_t component) override
{
mTxManager->SetVector3PropertyComponentValue( mId, mProperty, value, component);
}
{
mTxManager->SetVector3PropertyComponentValue( mId, mProperty, value, component);
}
- void BakeFloatComponent( float value, u
nsigned int component )
+ void BakeFloatComponent( float value, u
int32_t component ) override
{
mTxManager->BakeVector3PropertyComponentValue( mId, mProperty, value, component);
}
{
mTxManager->BakeVector3PropertyComponentValue( mId, mProperty, value, component);
}
- void BakeRelative(BufferIndex bufferIndex, const Vector3& value)
+ void BakeRelative(BufferIndex bufferIndex, const Vector3& value)
override
{
mTxManager->BakeRelativeVector3PropertyValue(mId, mProperty, value );
}
{
mTxManager->BakeRelativeVector3PropertyValue(mId, mProperty, value );
}
- void BakeRelativeMultiply(BufferIndex bufferIndex, const Vector3& value)
+ void BakeRelativeMultiply(BufferIndex bufferIndex, const Vector3& value)
override
{
mTxManager->BakeMultiplyVector3PropertyValue(mId, mProperty, value );
}
{
mTxManager->BakeMultiplyVector3PropertyValue(mId, mProperty, value );
}
@@
-249,42
+249,42
@@
public:
:TransformManagerPropertyHandler()
{}
:TransformManagerPropertyHandler()
{}
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Quaternion>();
}
{
return Dali::PropertyTypes::Get<Quaternion>();
}
- Quaternion& Get(
size_t bufferIndex)
+ Quaternion& Get(
BufferIndex bufferIndex ) override
{
return mTxManager->GetQuaternionPropertyValue( mId );
}
{
return mTxManager->GetQuaternionPropertyValue( mId );
}
- const Quaternion& Get(
size_t bufferIndex) const
+ const Quaternion& Get(
BufferIndex bufferIndex ) const override
{
return mTxManager->GetQuaternionPropertyValue( mId );
}
{
return mTxManager->GetQuaternionPropertyValue( mId );
}
- const float& GetFloatComponent( u
nsigned int component)
+ const float& GetFloatComponent( u
int32_t component) override
{
return mTxManager->GetQuaternionPropertyValue( mId ).mVector[component];
}
{
return mTxManager->GetQuaternionPropertyValue( mId ).mVector[component];
}
- void Set(BufferIndex bufferIndex, const Quaternion& value)
+ void Set(BufferIndex bufferIndex, const Quaternion& value)
override
{
return mTxManager->SetQuaternionPropertyValue( mId, value );
}
{
return mTxManager->SetQuaternionPropertyValue( mId, value );
}
- void Bake(BufferIndex bufferIndex, const Quaternion& value)
+ void Bake(BufferIndex bufferIndex, const Quaternion& value)
override
{
return mTxManager->BakeQuaternionPropertyValue( mId, value );
}
{
return mTxManager->BakeQuaternionPropertyValue( mId, value );
}
- void BakeRelative(BufferIndex bufferIndex, const Quaternion& value)
+ void BakeRelative(BufferIndex bufferIndex, const Quaternion& value)
override
{
return mTxManager->BakeRelativeQuaternionPropertyValue( mId, value );
}
{
return mTxManager->BakeRelativeQuaternionPropertyValue( mId, value );
}
- virtual const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const
+ const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const override
{
return Get(bufferIndex);
}
{
return Get(bufferIndex);
}
@@
-302,7
+302,7
@@
public:
* Create an TransformManagerVector3Input
*/
TransformManagerVector3Input( TransformManagerProperty property, const Vector3& initialValue )
* Create an TransformManagerVector3Input
*/
TransformManagerVector3Input( TransformManagerProperty property, const Vector3& initialValue )
- :mTxManager(
0
),
+ :mTxManager(
nullptr
),
mId(INVALID_TRANSFORM_ID),
mProperty(property),
mValue(initialValue)
mId(INVALID_TRANSFORM_ID),
mProperty(property),
mValue(initialValue)
@@
-311,14
+311,14
@@
public:
/**
* Virtual destructor.
*/
/**
* Virtual destructor.
*/
- virtual ~TransformManagerVector3Input()
+ ~TransformManagerVector3Input() override
{
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
{
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Vector3>();
}
{
return Dali::PropertyTypes::Get<Vector3>();
}
@@
-334,7
+334,7
@@
public:
/**
* @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
*/
/**
* @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
*/
- virtual bool InputInitialized() const
+ bool InputInitialized() const override
{
return true;
}
{
return true;
}
@@
-343,7
+343,7
@@
public:
* @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
* @note A constraint can only receive the inherited property from the previous frame.
*/
* @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
* @note A constraint can only receive the inherited property from the previous frame.
*/
- virtual bool InputChanged() const
+ bool InputChanged() const override
{
return true;
}
{
return true;
}
@@
-374,7
+374,7
@@
public:
/**
* @copydoc Dali::PropertyInput::GetVector3()
*/
/**
* @copydoc Dali::PropertyInput::GetVector3()
*/
- virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
+ const Vector3& GetVector3( BufferIndex bufferIndex ) const override
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-383,7
+383,7
@@
public:
/**
* @copydoc Dali::PropertyInput::GetConstraintInputVector3()
*/
/**
* @copydoc Dali::PropertyInput::GetConstraintInputVector3()
*/
- virtual const Vector3& GetConstraintInputVector3( BufferIndex bufferIndex ) const
+ const Vector3& GetConstraintInputVector3( BufferIndex bufferIndex ) const override
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-392,7
+392,7
@@
public:
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
- Vector3& Get(
size_t bufferIndex
)
+ Vector3& Get(
BufferIndex bufferIndex
)
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-401,7
+401,7
@@
public:
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
- const Vector3& Get(
size_t bufferIndex
) const
+ const Vector3& Get(
BufferIndex bufferIndex
) const
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-412,7
+412,7
@@
public:
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const Vector3& operator[](
size_t bufferIndex
) const
+ const Vector3& operator[](
BufferIndex bufferIndex
) const
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-432,7
+432,7
@@
public:
/**
* @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
*/
/**
* @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
*/
- virtual bool IsTransformManagerProperty() const
+ bool IsTransformManagerProperty() const override
{
return true;
}
{
return true;
}
@@
-464,7
+464,7
@@
public:
* Constructor
*/
TransformManagerQuaternionInput()
* Constructor
*/
TransformManagerQuaternionInput()
- :mTxManager(
0
),
+ :mTxManager(
nullptr
),
mId(INVALID_TRANSFORM_ID),
mValue(1.0f,0.0f,0.0f,0.0f)
{
mId(INVALID_TRANSFORM_ID),
mValue(1.0f,0.0f,0.0f,0.0f)
{
@@
-473,14
+473,14
@@
public:
/**
* Virtual destructor.
*/
/**
* Virtual destructor.
*/
- virtual ~TransformManagerQuaternionInput()
+ ~TransformManagerQuaternionInput() override
{
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
{
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Quaternion>();
}
{
return Dali::PropertyTypes::Get<Quaternion>();
}
@@
-496,7
+496,7
@@
public:
/**
* @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
*/
/**
* @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
*/
- virtual bool InputInitialized() const
+ bool InputInitialized() const override
{
return true;
}
{
return true;
}
@@
-505,7
+505,7
@@
public:
* @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
* @note A constraint can only receive the inherited property from the previous frame.
*/
* @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
* @note A constraint can only receive the inherited property from the previous frame.
*/
- virtual bool InputChanged() const
+ bool InputChanged() const override
{
return true;
}
{
return true;
}
@@
-527,7
+527,7
@@
public:
/**
* @copydoc Dali::PropertyInput::GetQuaternion()
*/
/**
* @copydoc Dali::PropertyInput::GetQuaternion()
*/
- virtual const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const
+ const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const override
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-536,7
+536,7
@@
public:
/**
* @copydoc Dali::PropertyInput::GetConstraintInputQuaternion()
*/
/**
* @copydoc Dali::PropertyInput::GetConstraintInputQuaternion()
*/
- virtual const Quaternion& GetConstraintInputQuaternion( BufferIndex bufferIndex ) const
+ const Quaternion& GetConstraintInputQuaternion( BufferIndex bufferIndex ) const override
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-545,7
+545,7
@@
public:
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
- Quaternion& Get(
size_t bufferIndex
)
+ Quaternion& Get(
BufferIndex bufferIndex
)
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-554,7
+554,7
@@
public:
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
- const Quaternion& Get(
size_t bufferIndex
) const
+ const Quaternion& Get(
BufferIndex bufferIndex
) const
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-565,7
+565,7
@@
public:
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
- const Quaternion& operator[](
size_t
bufferIndex) const
+ const Quaternion& operator[](
BufferIndex
bufferIndex) const
{
ComputeTransformComponent();
return mValue;
{
ComputeTransformComponent();
return mValue;
@@
-585,7
+585,7
@@
public:
/**
* @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
*/
/**
* @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
*/
- virtual bool IsTransformManagerProperty() const
+ bool IsTransformManagerProperty() const override
{
return true;
}
{
return true;
}
@@
-616,7
+616,7
@@
public:
* Constructor
*/
TransformManagerMatrixInput()
* Constructor
*/
TransformManagerMatrixInput()
- :mTxManager(
0
),
+ :mTxManager(
nullptr
),
mId(INVALID_TRANSFORM_ID)
{
}
mId(INVALID_TRANSFORM_ID)
{
}
@@
-624,14
+624,14
@@
public:
/**
* Virtual destructor.
*/
/**
* Virtual destructor.
*/
- virtual ~TransformManagerMatrixInput()
+ ~TransformManagerMatrixInput() override
{
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
{
}
/**
* @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
*/
- virtual Dali::Property::Type GetType() const
+ Dali::Property::Type GetType() const override
{
return Dali::PropertyTypes::Get<Matrix>();
}
{
return Dali::PropertyTypes::Get<Matrix>();
}
@@
-647,7
+647,7
@@
public:
/**
* @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
*/
/**
* @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
*/
- virtual bool InputInitialized() const
+ bool InputInitialized() const override
{
return true;
}
{
return true;
}
@@
-656,7
+656,7
@@
public:
* @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
* @note A constraint can only receive the inherited property from the previous frame.
*/
* @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
* @note A constraint can only receive the inherited property from the previous frame.
*/
- virtual bool InputChanged() const
+ bool InputChanged() const override
{
return true;
}
{
return true;
}
@@
-664,7
+664,7
@@
public:
/**
* @copydoc Dali::PropertyInput::GetMatrix()
*/
/**
* @copydoc Dali::PropertyInput::GetMatrix()
*/
- virtual const Matrix& GetMatrix( BufferIndex bufferIndex ) const
+ const Matrix& GetMatrix( BufferIndex bufferIndex ) const override
{
if( mTxManager )
{
{
if( mTxManager )
{
@@
-677,7
+677,7
@@
public:
/**
* @copydoc Dali::PropertyInput::GetConstraintInputMatrix()
*/
/**
* @copydoc Dali::PropertyInput::GetConstraintInputMatrix()
*/
- virtual const Matrix& GetConstraintInputMatrix( BufferIndex bufferIndex ) const
+ const Matrix& GetConstraintInputMatrix( BufferIndex bufferIndex ) const override
{
if( mTxManager )
{
{
if( mTxManager )
{
@@
-690,18
+690,18
@@
public:
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
- Matrix& Get(
size_t bufferIndex
)
+ Matrix& Get(
BufferIndex bufferIndex
)
{
{
- DALI_ASSERT_ALWAYS( mTxManager !=
0
);
+ DALI_ASSERT_ALWAYS( mTxManager !=
nullptr
);
return mTxManager->GetWorldMatrix(mId);
}
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
return mTxManager->GetWorldMatrix(mId);
}
/**
* @copydoc Dali::SceneGraph::PropertyInterface::Get()
*/
- const Matrix& Get(
size_t bufferIndex
) const
+ const Matrix& Get(
BufferIndex bufferIndex
) const
{
{
- return GetMatrix(
bufferIndex
);
+ return GetMatrix(
bufferIndex
);
}
/**
}
/**
@@
-709,9
+709,9
@@
public:
* @param[in] bufferIndex The buffer to read.
* @return The property value.
*/
* @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 GetMatrix(
bufferIndex
);
+ return GetMatrix(
bufferIndex
);
}
void Initialize( TransformManager* transformManager, TransformId id )
}
void Initialize( TransformManager* transformManager, TransformId id )
@@
-723,7
+723,7
@@
public:
/**
* @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
*/
/**
* @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
*/
- virtual bool IsTransformManagerProperty() const
+ bool IsTransformManagerProperty() const override
{
return true;
}
{
return true;
}