From 4937b5171332786ee42107836681175768fc01e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 31 Jul 2013 01:08:39 +0200 Subject: [PATCH] Trade: use instance() instead of instanceId() for consistency. Nowhere else is `Id` suffix. --- src/Trade/ObjectData2D.cpp | 4 ++-- src/Trade/ObjectData2D.h | 8 ++++---- src/Trade/ObjectData3D.cpp | 4 ++-- src/Trade/ObjectData3D.h | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Trade/ObjectData2D.cpp b/src/Trade/ObjectData2D.cpp index a9fb2e861..098e3655f 100644 --- a/src/Trade/ObjectData2D.cpp +++ b/src/Trade/ObjectData2D.cpp @@ -26,9 +26,9 @@ namespace Magnum { namespace Trade { -ObjectData2D::ObjectData2D(std::vector children, const Matrix3& transformation, ObjectData2D::InstanceType instanceType, UnsignedInt instanceId): _children(std::move(children)), _transformation(transformation), _instanceType(instanceType), _instanceId(instanceId) {} +ObjectData2D::ObjectData2D(std::vector children, const Matrix3& transformation, ObjectData2D::InstanceType instanceType, UnsignedInt instance): _children(std::move(children)), _transformation(transformation), _instanceType(instanceType), _instance(instance) {} -ObjectData2D::ObjectData2D(std::vector children, const Matrix3& transformation): _children(children), _transformation(transformation), _instanceType(InstanceType::Empty), _instanceId(-1) {} +ObjectData2D::ObjectData2D(std::vector children, const Matrix3& transformation): _children(children), _transformation(transformation), _instanceType(InstanceType::Empty), _instance(-1) {} ObjectData2D::ObjectData2D(ObjectData2D&&) = default; diff --git a/src/Trade/ObjectData2D.h b/src/Trade/ObjectData2D.h index 7bdae6f1c..e80f2a01a 100644 --- a/src/Trade/ObjectData2D.h +++ b/src/Trade/ObjectData2D.h @@ -56,9 +56,9 @@ class MAGNUM_EXPORT ObjectData2D { * @param children Child objects * @param transformation Transformation (relative to parent) * @param instanceType Instance type - * @param instanceId Instance ID + * @param instance Instance ID */ - explicit ObjectData2D(std::vector children, const Matrix3& transformation, InstanceType instanceType, UnsignedInt instanceId); + explicit ObjectData2D(std::vector children, const Matrix3& transformation, InstanceType instanceType, UnsignedInt instance); /** * @brief Constructor for empty instance @@ -102,13 +102,13 @@ class MAGNUM_EXPORT ObjectData2D { * @return ID of given camera / light / mesh etc., specified by * instanceType() */ - Int instanceId() const { return _instanceId; } + Int instance() const { return _instance; } private: std::vector _children; Matrix3 _transformation; InstanceType _instanceType; - Int _instanceId; + Int _instance; }; /** @debugoperator{Magnum::Trade::ObjectData2D} */ diff --git a/src/Trade/ObjectData3D.cpp b/src/Trade/ObjectData3D.cpp index f12fa9206..777c2b378 100644 --- a/src/Trade/ObjectData3D.cpp +++ b/src/Trade/ObjectData3D.cpp @@ -26,9 +26,9 @@ namespace Magnum { namespace Trade { -ObjectData3D::ObjectData3D(std::vector children, const Matrix4& transformation, ObjectData3D::InstanceType instanceType, UnsignedInt instanceId): _children(std::move(children)), _transformation(transformation), _instanceType(instanceType), _instanceId(instanceId) {} +ObjectData3D::ObjectData3D(std::vector children, const Matrix4& transformation, ObjectData3D::InstanceType instanceType, UnsignedInt instance): _children(std::move(children)), _transformation(transformation), _instanceType(instanceType), _instance(instance) {} -ObjectData3D::ObjectData3D(std::vector children, const Matrix4& transformation): _children(std::move(children)), _transformation(transformation), _instanceType(InstanceType::Empty), _instanceId(-1) {} +ObjectData3D::ObjectData3D(std::vector children, const Matrix4& transformation): _children(std::move(children)), _transformation(transformation), _instanceType(InstanceType::Empty), _instance(-1) {} ObjectData3D::ObjectData3D(ObjectData3D&&) = default; diff --git a/src/Trade/ObjectData3D.h b/src/Trade/ObjectData3D.h index 0f296fc14..fbe5c47cd 100644 --- a/src/Trade/ObjectData3D.h +++ b/src/Trade/ObjectData3D.h @@ -57,9 +57,9 @@ class MAGNUM_EXPORT ObjectData3D { * @param children Child objects * @param transformation Transformation (relative to parent) * @param instanceType Instance type - * @param instanceId Instance ID + * @param instance Instance ID */ - explicit ObjectData3D(std::vector children, const Matrix4& transformation, InstanceType instanceType, UnsignedInt instanceId); + explicit ObjectData3D(std::vector children, const Matrix4& transformation, InstanceType instanceType, UnsignedInt instance); /** * @brief Constructor for empty instance @@ -103,13 +103,13 @@ class MAGNUM_EXPORT ObjectData3D { * @return ID of given camera / light / mesh etc., specified by * instanceType() */ - Int instanceId() const { return _instanceId; } + Int instance() const { return _instance; } private: std::vector _children; Matrix4 _transformation; InstanceType _instanceType; - Int _instanceId; + Int _instance; }; /** @debugoperator{Magnum::Trade::ObjectData3D} */