From 8f7dc0feb4ea8914cb85aef4b4538c136d1c252d Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 15 Dec 2022 10:50:11 +0000 Subject: [PATCH] Reducing Node struct size Removed ptr to transform manager data from templated transform manager properties - replaced with compile time offset to the data, so the ptr can be computed quickly. Added macros to make the template code simpler. Change-Id: I3b94bcf3cf886b7477fc540d377efd6df605c94d --- .../utc-Dali-Internal-TransformManagerProperty.cpp | 36 +++- .../update/manager/transform-manager-property.h | 229 ++++++++++++--------- dali/internal/update/nodes/node-helper.h | 73 +++++++ dali/internal/update/nodes/node.cpp | 34 +-- dali/internal/update/nodes/node.h | 57 ++--- 5 files changed, 275 insertions(+), 154 deletions(-) create mode 100644 dali/internal/update/nodes/node-helper.h diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-TransformManagerProperty.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-TransformManagerProperty.cpp index d00cea6..18daa36 100644 --- a/automated-tests/src/dali-internal/utc-Dali-Internal-TransformManagerProperty.cpp +++ b/automated-tests/src/dali-internal/utc-Dali-Internal-TransformManagerProperty.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -36,16 +36,42 @@ int UtcTransformManagerPropertyGetFloatComponentN(void) { TestApplication application; - Dali::Internal::SceneGraph::TransformManagerPropertyQuaternion property; + struct S + { + Dali::Internal::SceneGraph::TransformManagerData txMgrData; + Dali::Internal::SceneGraph::TransformManagerPropertyQuaternion property; + } s; try { - property.GetFloatComponent(0u); + // There is no float component getter in derived class, only in base class. + s.property.GetFloatComponent(0u); } - catch(...) + catch(Dali::DaliException& e) { - DALI_TEST_CHECK(true); + DALI_TEST_ASSERT(e, "0 && \"Invalid call\"", TEST_LOCATION); } END_TEST; } + +int UtcTransformManagerPropertyUninitializedMgrData(void) +{ + TestApplication application; + + struct S + { + const Vector3 input{1.0f, 2.0f, 3.0f}; + + Dali::Internal::SceneGraph::TransformManagerData txMgrData; + Dali::Internal::SceneGraph::TransformManagerVector3Input property{Dali::Internal::SceneGraph::TRANSFORM_PROPERTY_POSITION, input}; + } s; + + Vector3 output = s.property.GetVector3(0); + + tet_infoline("Test that if input property's transform manager data is not initialized, that getting a value returns the initial value of the property."); + + DALI_TEST_EQUALS(s.input, output, 0.001f, TEST_LOCATION); + + END_TEST; +} diff --git a/dali/internal/update/manager/transform-manager-property.h b/dali/internal/update/manager/transform-manager-property.h index 619abee..3c11242 100644 --- 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_ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -148,30 +148,32 @@ struct TransformManagerPropertyHandler : public AnimatablePropertyBase } /** - * Initializes the property - * @param[in] transformManager Pointer to the transform manager - * @param[in] Id of the transformation the property is associated with - */ - void Initialize(TransformManagerData* data) - { - DALI_ASSERT_ALWAYS(data != nullptr && data->Manager() != nullptr); - mTxManagerData = data; - } - - /** * @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty() */ bool IsTransformManagerProperty() const override { return true; } - - TransformManagerData* mTxManagerData{nullptr}; }; -template +template struct TransformManagerPropertyVector3 final : public TransformManagerPropertyHandler { + enum + { + TRANSFORM_MANAGER_DATA_OFFSET = TxMgrDataOffset + }; + TransformManagerData* GetTxManagerData() + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + const TransformManagerData* GetTxManagerData() const + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + TransformManagerPropertyVector3() = default; Dali::Property::Type GetType() const override @@ -181,12 +183,12 @@ struct TransformManagerPropertyVector3 final : public TransformManagerPropertyHa Vector3& Get(BufferIndex bufferIndex) override { - return mTxManagerData->Manager()->GetVector3PropertyValue(mTxManagerData->Id(), PropertyT); + return GetTxManagerData()->Manager()->GetVector3PropertyValue(GetTxManagerData()->Id(), PropertyT); } const Vector3& Get(BufferIndex bufferIndex) const override { - return mTxManagerData->Manager()->GetVector3PropertyValue(mTxManagerData->Id(), PropertyT); + return GetTxManagerData()->Manager()->GetVector3PropertyValue(GetTxManagerData()->Id(), PropertyT); } const Vector3& GetVector3(BufferIndex bufferIndex) const override @@ -196,68 +198,84 @@ struct TransformManagerPropertyVector3 final : public TransformManagerPropertyHa const float& GetFloatComponent(uint32_t component) const override { - return mTxManagerData->Manager()->GetVector3PropertyComponentValue(mTxManagerData->Id(), PropertyT, component); + return GetTxManagerData()->Manager()->GetVector3PropertyComponentValue(GetTxManagerData()->Id(), PropertyT, component); } void Set(BufferIndex bufferIndex, const Vector3& value) override { - mTxManagerData->Manager()->SetVector3PropertyValue(mTxManagerData->Id(), PropertyT, value); + GetTxManagerData()->Manager()->SetVector3PropertyValue(GetTxManagerData()->Id(), PropertyT, value); } void SetComponent(BufferIndex bufferIndex, float value, uint32_t component) { - mTxManagerData->Manager()->SetVector3PropertyComponentValue(mTxManagerData->Id(), PropertyT, value, component); + GetTxManagerData()->Manager()->SetVector3PropertyComponentValue(GetTxManagerData()->Id(), PropertyT, value, component); } void BakeComponent(BufferIndex bufferIndex, float value, uint32_t component) { - mTxManagerData->Manager()->BakeVector3PropertyComponentValue(mTxManagerData->Id(), PropertyT, value, component); + GetTxManagerData()->Manager()->BakeVector3PropertyComponentValue(GetTxManagerData()->Id(), PropertyT, value, component); } void Bake(BufferIndex bufferIndex, const Vector3& value) override { - mTxManagerData->Manager()->BakeVector3PropertyValue(mTxManagerData->Id(), PropertyT, value); + GetTxManagerData()->Manager()->BakeVector3PropertyValue(GetTxManagerData()->Id(), PropertyT, value); } void BakeX(BufferIndex bufferIndex, float value) override { - mTxManagerData->Manager()->BakeXVector3PropertyValue(mTxManagerData->Id(), PropertyT, value); + GetTxManagerData()->Manager()->BakeXVector3PropertyValue(GetTxManagerData()->Id(), PropertyT, value); } void BakeY(BufferIndex bufferIndex, float value) override { - mTxManagerData->Manager()->BakeYVector3PropertyValue(mTxManagerData->Id(), PropertyT, value); + GetTxManagerData()->Manager()->BakeYVector3PropertyValue(GetTxManagerData()->Id(), PropertyT, value); } void BakeZ(BufferIndex bufferIndex, float value) override { - mTxManagerData->Manager()->BakeZVector3PropertyValue(mTxManagerData->Id(), PropertyT, value); + GetTxManagerData()->Manager()->BakeZVector3PropertyValue(GetTxManagerData()->Id(), PropertyT, value); } void SetFloatComponent(float value, uint32_t component) override { - mTxManagerData->Manager()->SetVector3PropertyComponentValue(mTxManagerData->Id(), PropertyT, value, component); + GetTxManagerData()->Manager()->SetVector3PropertyComponentValue(GetTxManagerData()->Id(), PropertyT, value, component); } void BakeFloatComponent(float value, uint32_t component) override { - mTxManagerData->Manager()->BakeVector3PropertyComponentValue(mTxManagerData->Id(), PropertyT, value, component); + GetTxManagerData()->Manager()->BakeVector3PropertyComponentValue(GetTxManagerData()->Id(), PropertyT, value, component); } void BakeRelative(BufferIndex bufferIndex, const Vector3& value) override { - mTxManagerData->Manager()->BakeRelativeVector3PropertyValue(mTxManagerData->Id(), PropertyT, value); + GetTxManagerData()->Manager()->BakeRelativeVector3PropertyValue(GetTxManagerData()->Id(), PropertyT, value); } void BakeRelativeMultiply(BufferIndex bufferIndex, const Vector3& value) override { - mTxManagerData->Manager()->BakeMultiplyVector3PropertyValue(mTxManagerData->Id(), PropertyT, value); + GetTxManagerData()->Manager()->BakeMultiplyVector3PropertyValue(GetTxManagerData()->Id(), PropertyT, value); } }; +template class TransformManagerPropertyQuaternion final : public TransformManagerPropertyHandler { public: + enum + { + TRANSFORM_MANAGER_DATA_OFFSET = TxMgrDataOffset + }; + TransformManagerData* GetTxManagerData() + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + const TransformManagerData* GetTxManagerData() const + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + TransformManagerPropertyQuaternion() = default; Dali::Property::Type GetType() const override @@ -267,27 +285,27 @@ public: Quaternion& Get(BufferIndex bufferIndex) override { - return mTxManagerData->Manager()->GetQuaternionPropertyValue(mTxManagerData->Id()); + return GetTxManagerData()->Manager()->GetQuaternionPropertyValue(GetTxManagerData()->Id()); } const Quaternion& Get(BufferIndex bufferIndex) const override { - return mTxManagerData->Manager()->GetQuaternionPropertyValue(mTxManagerData->Id()); + return GetTxManagerData()->Manager()->GetQuaternionPropertyValue(GetTxManagerData()->Id()); } void Set(BufferIndex bufferIndex, const Quaternion& value) override { - return mTxManagerData->Manager()->SetQuaternionPropertyValue(mTxManagerData->Id(), value); + return GetTxManagerData()->Manager()->SetQuaternionPropertyValue(GetTxManagerData()->Id(), value); } void Bake(BufferIndex bufferIndex, const Quaternion& value) override { - return mTxManagerData->Manager()->BakeQuaternionPropertyValue(mTxManagerData->Id(), value); + return GetTxManagerData()->Manager()->BakeQuaternionPropertyValue(GetTxManagerData()->Id(), value); } void BakeRelative(BufferIndex bufferIndex, const Quaternion& value) override { - return mTxManagerData->Manager()->BakeRelativeQuaternionPropertyValue(mTxManagerData->Id(), value); + return GetTxManagerData()->Manager()->BakeRelativeQuaternionPropertyValue(GetTxManagerData()->Id(), value); } const Quaternion& GetQuaternion(BufferIndex bufferIndex) const override @@ -299,9 +317,25 @@ public: /** * A Vector3 property used as input. */ +template class TransformManagerVector3Input : public PropertyInputImpl { public: + enum + { + TRANSFORM_MANAGER_DATA_OFFSET = TxMgrDataOffset + }; + TransformManagerData* GetTxManagerData() + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + const TransformManagerData* GetTxManagerData() const + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + /** * Create an TransformManagerVector3Input */ @@ -355,10 +389,11 @@ public: */ void ComputeTransformComponent() const { - if(mTxManagerData) + auto transformManagerData = GetTxManagerData(); + auto id = transformManagerData->Id(); + if(id != INVALID_TRANSFORM_ID) { - const Matrix& worldMatrix = mTxManagerData->Manager()->GetWorldMatrix(mTxManagerData->Id()); - + const Matrix& worldMatrix = transformManagerData->Manager()->GetWorldMatrix(id); if(mProperty == TRANSFORM_PROPERTY_WORLD_POSITION) { mValue = worldMatrix.GetTranslation3(); @@ -420,17 +455,6 @@ public: } /** - * Initializes the property - * @param[in] transformManager Pointer to the transform manager - * @param[in] Id of the transformation the property is associated with - */ - void Initialize(TransformManagerData* data) - { - DALI_ASSERT_ALWAYS(data != nullptr && data->Manager() != nullptr); - mTxManagerData = data; - } - - /** * @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty() */ bool IsTransformManagerProperty() const override @@ -439,14 +463,10 @@ public: } private: - // Undefined - TransformManagerVector3Input(const TransformManagerVector3Input& property); - - // Undefined - TransformManagerVector3Input& operator=(const TransformManagerVector3Input& rhs); + TransformManagerVector3Input(const TransformManagerVector3Input& property) = delete; + TransformManagerVector3Input& operator=(const TransformManagerVector3Input& rhs) = delete; public: - TransformManagerData* mTxManagerData{nullptr}; TransformManagerProperty mProperty; mutable Vector3 mValue; }; @@ -454,9 +474,25 @@ public: /** * A Quaternion property used as input. */ +template class TransformManagerQuaternionInput final : public PropertyInputImpl { public: + enum + { + TRANSFORM_MANAGER_DATA_OFFSET = TxMgrDataOffset + }; + TransformManagerData* GetTxManagerData() + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + const TransformManagerData* GetTxManagerData() const + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + /** * Constructor */ @@ -501,9 +537,11 @@ public: */ void ComputeTransformComponent() const { - if(mTxManagerData) + auto transformManagerData = GetTxManagerData(); + auto id = transformManagerData->Id(); + if(id != INVALID_TRANSFORM_ID) { - const Matrix& worldMatrix = mTxManagerData->Manager()->GetWorldMatrix(mTxManagerData->Id()); + const Matrix& worldMatrix = transformManagerData->Manager()->GetWorldMatrix(id); Vector3 position, scale; worldMatrix.GetTransformComponents(position, mValue, scale); } @@ -557,17 +595,6 @@ public: } /** - * Initializes the property - * @param[in] transformManager Pointer to the transform manager - * @param[in] Id of the transformation the property is associated with - */ - void Initialize(TransformManagerData* data) - { - DALI_ASSERT_ALWAYS(data != nullptr && data->Manager() != nullptr); - mTxManagerData = data; - } - - /** * @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty() */ bool IsTransformManagerProperty() const override @@ -576,23 +603,35 @@ public: } private: - // Undefined - TransformManagerQuaternionInput(const TransformManagerQuaternionInput& property); - - // Undefined - TransformManagerQuaternionInput& operator=(const TransformManagerQuaternionInput& rhs); + TransformManagerQuaternionInput(const TransformManagerQuaternionInput& property) = delete; + TransformManagerQuaternionInput& operator=(const TransformManagerQuaternionInput& rhs) = delete; public: - TransformManagerData* mTxManagerData{nullptr}; - mutable Quaternion mValue; + mutable Quaternion mValue; }; /** * A Matrix property used as input. */ +template class TransformManagerMatrixInput final : public PropertyInputImpl { public: + enum + { + TRANSFORM_MANAGER_DATA_OFFSET = TxMgrDataOffset + }; + TransformManagerData* GetTxManagerData() + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + const TransformManagerData* GetTxManagerData() const + { + return reinterpret_cast( + reinterpret_cast(this) - TRANSFORM_MANAGER_DATA_OFFSET); + } + /** * Constructor */ @@ -636,11 +675,12 @@ public: */ const Matrix& GetMatrix(BufferIndex bufferIndex) const override { - if(mTxManagerData) + auto transformManagerData = GetTxManagerData(); + auto id = transformManagerData->Id(); + if(id != INVALID_TRANSFORM_ID) { - return mTxManagerData->Manager()->GetWorldMatrix(mTxManagerData->Id()); + return transformManagerData->Manager()->GetWorldMatrix(id); } - return Matrix::IDENTITY; } @@ -649,11 +689,12 @@ public: */ const Matrix& GetConstraintInputMatrix(BufferIndex bufferIndex) const override { - if(mTxManagerData) + auto transformManagerData = GetTxManagerData(); + auto id = transformManagerData->Id(); + if(id != INVALID_TRANSFORM_ID) { - return mTxManagerData->Manager()->GetWorldMatrix(mTxManagerData->Id()); + return transformManagerData->Manager()->GetWorldMatrix(id); } - return Matrix::IDENTITY; } @@ -662,8 +703,10 @@ public: */ Matrix& Get(BufferIndex bufferIndex) { - DALI_ASSERT_ALWAYS(mTxManagerData != nullptr); - return mTxManagerData->Manager()->GetWorldMatrix(mTxManagerData->Id()); + auto transformManagerData = GetTxManagerData(); + auto id = transformManagerData->Id(); + DALI_ASSERT_ALWAYS(id != INVALID_TRANSFORM_ID); + return transformManagerData->Manager()->GetWorldMatrix(id); } /** @@ -684,12 +727,6 @@ public: return GetMatrix(bufferIndex); } - void Initialize(TransformManagerData* data) - { - DALI_ASSERT_ALWAYS(data != nullptr && data->Manager() != nullptr); - mTxManagerData = data; - } - /** * @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty() */ @@ -699,18 +736,12 @@ public: } private: - // Undefined - TransformManagerMatrixInput(const TransformManagerMatrixInput& property); - - // Undefined - TransformManagerMatrixInput& operator=(const TransformManagerMatrixInput& rhs); - -public: - TransformManagerData* mTxManagerData{nullptr}; + TransformManagerMatrixInput(const TransformManagerMatrixInput& property) = delete; + TransformManagerMatrixInput& operator=(const TransformManagerMatrixInput& rhs) = delete; }; -} //namespace SceneGraph -} //namespace Internal -} //namespace Dali +} // namespace SceneGraph +} // namespace Internal +} // namespace Dali #endif // TRANSFORM_MANAGER_PROPERTY_H_ diff --git a/dali/internal/update/nodes/node-helper.h b/dali/internal/update/nodes/node-helper.h new file mode 100644 index 0000000..4997868 --- /dev/null +++ b/dali/internal/update/nodes/node-helper.h @@ -0,0 +1,73 @@ +#ifndef DALI_INTERNAL_SCENEGRAPH_NODE_HELPER_H +#define DALI_INTERNAL_SCENEGRAPH_NODE_HELPER_H + +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Defines the given value, and adds an enumeration that contains it's + * size. The enumeration can be used by the wrapper templated types + * below during structure definition. ("offsetof" requires the + * structure to be completely defined before use, so cannot be + * utilized here). + */ +#define BASE(_TYPE, _X) \ + _TYPE _X; \ + enum \ + { \ + OFFSET_##_X = sizeof(_TYPE) \ + }; + +/* + * Create a property template instance, passing in the previously + * stored element, which utilizes that element's OFFSET enumeration to + * compute the offset of the BASE element. + * + * It is expected that _TEMPLATE is a TransformManagerPropertyVector3 + * which takes a TransformManagerProperty enumeration and an offset + * to the BASE TransformManagerData. + * + * It is assumed that successive elements are aligned, and that no padding + * is inserted by the compiler. + */ +#define PROPERTY_WRAPPER(_BASE_ELEMENT, _TEMPLATE, _PROPERTY, _ELEMENT) \ + using _TEMPLATE##_PROPERTY = _TEMPLATE<_PROPERTY, OFFSET_##_BASE_ELEMENT>; \ + _TEMPLATE##_PROPERTY _ELEMENT; \ + enum \ + { \ + OFFSET_##_ELEMENT = sizeof(_TEMPLATE##_PROPERTY) + OFFSET_##_BASE_ELEMENT \ + }; + +/* + * Create a template instance, passing in the previously stored + * element, utilizing that element's OFFSET enumeration to compute the offset + * of the BASE element. + * + * It is expected that _TEMPLATE is a TransformManagerPropertyNNNN template + * which takes an offset to the BASE TransformManagerData. + * + * It is assumed that successive elements are aligned, and that no padding + * is inserted by the compiler. + */ +#define TEMPLATE_WRAPPER(_BASE_ELEMENT, _TEMPLATE, _ELEMENT) \ + using _TEMPLATE##_ELEMENT = _TEMPLATE; \ + _TEMPLATE##_ELEMENT _ELEMENT; \ + enum \ + { \ + OFFSET_##_ELEMENT = sizeof(_TEMPLATE##_ELEMENT) + OFFSET_##_BASE_ELEMENT \ + }; + +#endif // DALI_INTERNAL_SCENEGRAPH_NODE_HELPER_H diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp index f0f4943..4291f47 100644 --- a/dali/internal/update/nodes/node.cpp +++ b/dali/internal/update/nodes/node.cpp @@ -27,8 +27,8 @@ namespace { -//Memory pool used to allocate new nodes. Memory used by this pool will be released when process dies -// or DALI library is unloaded +// Memory pool used to allocate new nodes. Memory used by this pool will be released when process dies +// or DALI library is unloaded Dali::Internal::MemoryPoolObjectAllocator gNodeMemoryPool; #ifdef DEBUG_ENABLED // keep track of nodes alive, to ensure we have 0 when the process exits or DALi library is unloaded @@ -76,16 +76,16 @@ void Node::Delete(Node* node) } Node::Node() -: mOrientation(), // Initialized to identity by default - mVisible(true), - mCulled(false), - mColor(Color::WHITE), - mUpdateAreaHint(Vector4::ZERO), +: mOrientation(), // Initialized to identity by default mWorldPosition(TRANSFORM_PROPERTY_WORLD_POSITION, Vector3(0.0f, 0.0f, 0.0f)), // Zero initialized by default mWorldScale(TRANSFORM_PROPERTY_WORLD_SCALE, Vector3(1.0f, 1.0f, 1.0f)), mWorldOrientation(), // Initialized to identity by default mWorldMatrix(), + mVisible(true), + mCulled(false), + mColor(Color::WHITE), mWorldColor(Color::WHITE), + mUpdateAreaHint(Vector4::ZERO), mClippingSortModifier(0u), mId(++mNodeCounter), mParent(nullptr), @@ -134,28 +134,14 @@ uint32_t Node::GetId() const void Node::CreateTransform(SceneGraph::TransformManager* transformManager) { - //Create a new transform + // Create a new transform mTransformManagerData.mManager = transformManager; TransformId createdTransformId = transformManager->CreateTransform(); - //Initialize all the animatable properties - mPosition.Initialize(&mTransformManagerData); - mScale.Initialize(&mTransformManagerData); - mOrientation.Initialize(&mTransformManagerData); - mSize.Initialize(&mTransformManagerData); - mParentOrigin.Initialize(&mTransformManagerData); - mAnchorPoint.Initialize(&mTransformManagerData); - - //Initialize all the input properties - mWorldPosition.Initialize(&mTransformManagerData); - mWorldScale.Initialize(&mTransformManagerData); - mWorldOrientation.Initialize(&mTransformManagerData); - mWorldMatrix.Initialize(&mTransformManagerData); - - //Set whether the position should use the anchor point + // Set whether the position should use the anchor point transformManager->SetPositionUsesAnchorPoint(createdTransformId, mPositionUsesAnchorPoint); - //Set TransformId after initialize done. + // Set TransformId after initialize done. mTransformManagerData.mId = createdTransformId; } diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h index 3e28d7b..d9074d6 100644 --- a/dali/internal/update/nodes/node.h +++ b/dali/internal/update/nodes/node.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -921,10 +922,10 @@ private: // from NodeDataProvider private: // Delete copy and move - Node(const Node&) = delete; - Node(Node&&) = delete; + Node(const Node&) = delete; + Node(Node&&) = delete; Node& operator=(const Node& rhs) = delete; - Node& operator=(Node&& rhs) = delete; + Node& operator=(Node&& rhs) = delete; /** * Recursive helper to disconnect a Node and its children. @@ -934,34 +935,39 @@ private: void RecursiveDisconnectFromSceneGraph(BufferIndex updateBufferIndex); public: // Default properties - using TransformManagerParentsOrigin = TransformManagerPropertyVector3; - using TransformManagerAnchorPoint = TransformManagerPropertyVector3; - using TransformManagerSize = TransformManagerPropertyVector3; - using TransformManagerPosition = TransformManagerPropertyVector3; - using TransformManagerScale = TransformManagerPropertyVector3; - - TransformManagerData mTransformManagerData; - TransformManagerParentsOrigin mParentOrigin; ///< Local transform; the position is relative to this. Sets the Transform flag dirty when changed - TransformManagerAnchorPoint mAnchorPoint; ///< Local transform; local center of rotation. Sets the Transform flag dirty when changed - TransformManagerSize mSize; ///< Size is provided for layouting - TransformManagerPosition mPosition; ///< Local transform; distance between parent-origin & anchor-point - TransformManagerScale mScale; ///< Local transform; scale relative to parent node - TransformManagerPropertyQuaternion mOrientation; ///< Local transform; rotation relative to parent node + // Define a base offset for the following wrappers. The wrapper macros calculate offsets from the previous + // element such that each wrapper type generates a compile time offset to the transform manager data. + BASE(TransformManagerData, mTransformManagerData); + PROPERTY_WRAPPER(mTransformManagerData, TransformManagerPropertyVector3, TRANSFORM_PROPERTY_PARENT_ORIGIN, + mParentOrigin); // Local transform; the position is relative to this. Sets the Transform flag dirty when changed + + PROPERTY_WRAPPER(mParentOrigin, TransformManagerPropertyVector3, TRANSFORM_PROPERTY_ANCHOR_POINT, + mAnchorPoint); // Local transform; local center of rotation. Sets the Transform flag dirty when changed + + PROPERTY_WRAPPER(mAnchorPoint, TransformManagerPropertyVector3, TRANSFORM_PROPERTY_SIZE, + mSize); // Size is provided for layouting + + PROPERTY_WRAPPER(mSize, TransformManagerPropertyVector3, TRANSFORM_PROPERTY_POSITION, + mPosition); // Local transform; distance between parent-origin & anchor-point + PROPERTY_WRAPPER(mPosition, TransformManagerPropertyVector3, TRANSFORM_PROPERTY_SCALE, + mScale); // Local transform; scale relative to parent node + + TEMPLATE_WRAPPER(mScale, TransformManagerPropertyQuaternion, + mOrientation); // Local transform; rotation relative to parent node + + // Inherited properties; read-only from public API + TEMPLATE_WRAPPER(mOrientation, TransformManagerVector3Input, mWorldPosition); // Full inherited position + TEMPLATE_WRAPPER(mWorldPosition, TransformManagerVector3Input, mWorldScale); // Full inherited scale + TEMPLATE_WRAPPER(mWorldScale, TransformManagerQuaternionInput, mWorldOrientation); // Full inherited orientation + TEMPLATE_WRAPPER(mWorldOrientation, TransformManagerMatrixInput, mWorldMatrix); // Full inherited world matrix AnimatableProperty mVisible; ///< Visibility can be inherited from the Node hierachy AnimatableProperty mCulled; ///< True if the node is culled. This is not animatable. It is just double-buffered. AnimatableProperty mColor; ///< Color can be inherited from the Node hierarchy + InheritedColor mWorldColor; ///< Full inherited color AnimatableProperty mUpdateAreaHint; ///< Update area hint is provided for damaged area calculation. (x, y, width, height) ///< This is not animatable. It is just double-buffered. (Because all these bloody properties are). - // Inherited properties; read-only from public API - - TransformManagerVector3Input mWorldPosition; ///< Full inherited position - TransformManagerVector3Input mWorldScale; - TransformManagerQuaternionInput mWorldOrientation; ///< Full inherited orientation - TransformManagerMatrixInput mWorldMatrix; ///< Full inherited world matrix - InheritedColor mWorldColor; ///< Full inherited color - uint64_t mUniformsHash{0u}; ///< Hash of uniform map property values uint32_t mClippingSortModifier; ///< Contains bit-packed clipping information for quick access when sorting const uint32_t mId; ///< The Unique ID of the node. @@ -980,8 +986,7 @@ protected: uint32_t mClippingDepth; ///< The number of stencil clipping nodes deep this node is uint32_t mScissorDepth; ///< The number of scissor clipping nodes deep this node is - - uint32_t mDepthIndex; ///< Depth index of the node + uint32_t mDepthIndex; ///< Depth index of the node // flags, compressed to bitfield NodePropertyFlags mDirtyFlags; ///< Dirty flags for each of the Node properties -- 2.7.4