ElementsNames -> ElementNames.

Source/Urho3D/AngelScript/CoreAPI.cpp

@@ -824,13 +824,13 @@ static CScriptArray* AttributeInfoGetEnumNames(AttributeInfo* ptr)
     return VectorToArray<String>(enumNames, "Array<String>");
 }
 
-static CScriptArray* AttributeInfoGetVariantStructureElementsNames(AttributeInfo* ptr)
+static CScriptArray* AttributeInfoGetVariantStructureElementNames(AttributeInfo* ptr)
 {
-    Vector<String> variantStructureElementsNames;
-    const char** variantStructureElementsNamesPtrs = ptr->variantStructureElementsNames_;
-    while (variantStructureElementsNamesPtrs && *variantStructureElementsNamesPtrs)
-        variantStructureElementsNames.Push(*variantStructureElementsNamesPtrs++);
-    return VectorToArray<String>(variantStructureElementsNames, "Array<String>");
+    Vector<String> variantStructureElementNames;
+    const char** variantStructureElementNamesPtrs = ptr->variantStructureElementNames_;
+    while (variantStructureElementNamesPtrs && *variantStructureElementNamesPtrs)
+        variantStructureElementNames.Push(*variantStructureElementNamesPtrs++);
+    return VectorToArray<String>(variantStructureElementNames, "Array<String>");
 }
 
 static void SendEvent(const String& eventType, VariantMap& eventData)
@@ -966,7 +966,7 @@ void RegisterObject(asIScriptEngine* engine)
     engine->RegisterObjectBehaviour("AttributeInfo", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(DestructAttributeInfo), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("AttributeInfo", "AttributeInfo& opAssign(const AttributeInfo&in)", asMETHODPR(AttributeInfo, operator =, (const AttributeInfo&), AttributeInfo&), asCALL_THISCALL);
     engine->RegisterObjectMethod("AttributeInfo", "Array<String>@ get_enumNames() const", asFUNCTION(AttributeInfoGetEnumNames), asCALL_CDECL_OBJLAST);
-    engine->RegisterObjectMethod("AttributeInfo", "Array<String>@ get_variantStructureElementsNames() const", asFUNCTION(AttributeInfoGetVariantStructureElementsNames), asCALL_CDECL_OBJLAST);
+    engine->RegisterObjectMethod("AttributeInfo", "Array<String>@ get_variantStructureElementNames() const", asFUNCTION(AttributeInfoGetVariantStructureElementNames), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectProperty("AttributeInfo", "VariantType type", offsetof(AttributeInfo, type_));
     engine->RegisterObjectProperty("AttributeInfo", "String name", offsetof(AttributeInfo, name_));
     engine->RegisterObjectProperty("AttributeInfo", "Variant defaultValue", offsetof(AttributeInfo, defaultValue_));

Source/Urho3D/AngelScript/SceneAPI.cpp

@@ -298,7 +298,7 @@ static CScriptArray* GetObjectAttributeInfos(const String& objectType)
             copy.name_ = i->name_;
             copy.offset_ = i->offset_;
             copy.enumNames_ = i->enumNames_;
-            copy.variantStructureElementsNames_ = i->variantStructureElementsNames_;
+            copy.variantStructureElementNames_ = i->variantStructureElementNames_;
             copy.accessor_ = i->accessor_;
             copy.defaultValue_ = i->defaultValue_;
             copy.mode_ = i->mode_;

Source/Urho3D/Core/Attribute.h

@@ -69,7 +69,7 @@ struct AttributeInfo
         type_(VAR_NONE),
         offset_(0),
         enumNames_(0),
-        variantStructureElementsNames_(0),
+        variantStructureElementNames_(0),
         mode_(AM_DEFAULT),
         ptr_(0)
     {
@@ -81,7 +81,7 @@ struct AttributeInfo
         name_(name),
         offset_((unsigned)offset),
         enumNames_(0),
-        variantStructureElementsNames_(0),
+        variantStructureElementNames_(0),
         defaultValue_(defaultValue),
         mode_(mode),
         ptr_(0)
@@ -94,7 +94,7 @@ struct AttributeInfo
         name_(name),
         offset_((unsigned)offset),
         enumNames_(enumNames),
-        variantStructureElementsNames_(0),
+        variantStructureElementNames_(0),
         defaultValue_(defaultValue),
         mode_(mode),
         ptr_(0)
@@ -107,7 +107,7 @@ struct AttributeInfo
         name_(name),
         offset_(0),
         enumNames_(0),
-        variantStructureElementsNames_(0),
+        variantStructureElementNames_(0),
         accessor_(accessor),
         defaultValue_(defaultValue),
         mode_(mode),
@@ -122,7 +122,7 @@ struct AttributeInfo
         name_(name),
         offset_(0),
         enumNames_(enumNames),
-        variantStructureElementsNames_(0),
+        variantStructureElementNames_(0),
         accessor_(accessor),
         defaultValue_(defaultValue),
         mode_(mode),
@@ -131,12 +131,12 @@ struct AttributeInfo
     }
 
     /// Construct variant structure (structure, which packed to VariantVector) attribute.
-    AttributeInfo(VariantType type, const char* name, AttributeAccessor* accessor, const Variant& defaultValue, const char** variantStructureElementsNames, unsigned mode) :
+    AttributeInfo(VariantType type, const char* name, AttributeAccessor* accessor, const Variant& defaultValue, const char** variantStructureElementNames, unsigned mode) :
         type_(type),
         name_(name),
         offset_(0),
         enumNames_(0),
-        variantStructureElementsNames_(variantStructureElementsNames),
+        variantStructureElementNames_(variantStructureElementNames),
         accessor_(accessor),
         defaultValue_(defaultValue),
         mode_(mode),
@@ -153,7 +153,7 @@ struct AttributeInfo
     /// Enum names.
     const char** enumNames_;
     /// Variant structure elements names.
-    const char** variantStructureElementsNames_;
+    const char** variantStructureElementNames_;
     /// Helper object for accessor mode.
     SharedPtr<AttributeAccessor> accessor_;
     /// Default value for network replication.

Source/Urho3D/Graphics/AnimatedModel.cpp

@@ -49,7 +49,7 @@ namespace Urho3D
 
 extern const char* GEOMETRY_CATEGORY;
 
-const char* animationStatesStructureElementsNames[] =
+const char* animationStatesStructureElementNames[] =
 {
     "Anim State Count",
     "***Animation",
@@ -121,7 +121,7 @@ void AnimatedModel::RegisterObject(Context* context)
         Variant::emptyVariantVector, AM_FILE | AM_NOEDIT);
     URHO3D_MIXED_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE("Animation States", GetAnimationStatesAttr, SetAnimationStatesAttr,
                                                             VariantVector, Variant::emptyVariantVector,
-                                                            animationStatesStructureElementsNames, AM_FILE);
+                                                            animationStatesStructureElementNames, AM_FILE);
     URHO3D_ACCESSOR_ATTRIBUTE("Morphs", GetMorphsAttr, SetMorphsAttr, PODVector<unsigned char>, Variant::emptyBuffer,
         AM_DEFAULT | AM_NOEDIT);
 }

Source/Urho3D/Graphics/BillboardSet.cpp

@@ -57,7 +57,7 @@ const char* faceCameraModeNames[] =
     0
 };
 
-const char* billboardsStructureElementsNames[] =
+const char* billboardsStructureElementNames[] =
 {
     "Billboard Count",
     "***Position",
@@ -131,7 +131,7 @@ void BillboardSet::RegisterObject(Context* context)
     URHO3D_COPY_BASE_ATTRIBUTES(Drawable);
     URHO3D_MIXED_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE("Billboards", GetBillboardsAttr, SetBillboardsAttr,
                                                             VariantVector, Variant::emptyVariantVector,
-                                                            billboardsStructureElementsNames, AM_FILE);
+                                                            billboardsStructureElementNames, AM_FILE);
     URHO3D_ACCESSOR_ATTRIBUTE("Network Billboards", GetNetBillboardsAttr, SetNetBillboardsAttr, PODVector<unsigned char>,
         Variant::emptyBuffer, AM_NET | AM_NOEDIT);
 }

Source/Urho3D/Graphics/StaticModelGroup.cpp

@@ -40,7 +40,7 @@ namespace Urho3D
 
 extern const char* GEOMETRY_CATEGORY;
 
-const char* instanceNodesStructureElementsNames[] =
+const char* instanceNodesStructureElementNames[] =
 {
     "Instance Count",
     "***NodeID",
@@ -66,7 +66,7 @@ void StaticModelGroup::RegisterObject(Context* context)
 
     URHO3D_COPY_BASE_ATTRIBUTES(StaticModel);
     URHO3D_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE("Instance Nodes", GetNodeIDsAttr, SetNodeIDsAttr,
-                                                       VariantVector, Variant::emptyVariantVector, instanceNodesStructureElementsNames,
+                                                       VariantVector, Variant::emptyVariantVector, instanceNodesStructureElementNames,
                                                        AM_DEFAULT | AM_NODEIDVECTOR);
 }
 

Source/Urho3D/Navigation/CrowdManager.cpp

@@ -46,7 +46,7 @@ extern const char* NAVIGATION_CATEGORY;
 static const unsigned DEFAULT_MAX_AGENTS = 512;
 static const float DEFAULT_MAX_AGENT_RADIUS = 0.f;
 
-const char* filterTypesStructureElementsNames[] =
+const char* filterTypesStructureElementNames[] =
 {
     "Query Filter Type Count",
     "***Include Flags",
@@ -55,7 +55,7 @@ const char* filterTypesStructureElementsNames[] =
     0
 };
 
-const char* obstacleAvoidanceTypesStructureElementsNames[] =
+const char* obstacleAvoidanceTypesStructureElementNames[] =
 {
     "Obstacle Avoid. Type Count",
     "***Velocity Bias",
@@ -106,10 +106,10 @@ void CrowdManager::RegisterObject(Context* context)
     URHO3D_ATTRIBUTE("Navigation Mesh", unsigned, navigationMeshId_, 0, AM_DEFAULT | AM_COMPONENTID);
     URHO3D_MIXED_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE("Filter Types", GetQueryFilterTypesAttr, SetQueryFilterTypesAttr,
                                                              VariantVector, Variant::emptyVariantVector,
-                                                             filterTypesStructureElementsNames, AM_DEFAULT);
+                                                             filterTypesStructureElementNames, AM_DEFAULT);
     URHO3D_MIXED_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE("Obstacle Avoidance Types", GetObstacleAvoidanceTypesAttr, SetObstacleAvoidanceTypesAttr,
                                                              VariantVector, Variant::emptyVariantVector,
-                                                             obstacleAvoidanceTypesStructureElementsNames, AM_DEFAULT);
+                                                             obstacleAvoidanceTypesStructureElementNames, AM_DEFAULT);
 }
 
 void CrowdManager::ApplyAttributes()

Source/Urho3D/Scene/Serializable.h

@@ -366,8 +366,8 @@ public:
 /// Update the default value of an already registered attribute.
 #define URHO3D_UPDATE_ATTRIBUTE_DEFAULT_VALUE(name, defaultValue) context->UpdateAttributeDefaultValue<ClassName>(name, defaultValue)
 /// Define an attribute that uses get and set functions.
-#define URHO3D_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE(name, getFunction, setFunction, typeName, defaultValue, variantStructureElementsNames, mode) context->RegisterAttribute<ClassName>(Urho3D::AttributeInfo(Urho3D::GetVariantType<typeName >(), name, new Urho3D::AttributeAccessorImpl<ClassName, typeName, Urho3D::AttributeTrait<typeName > >(&ClassName::getFunction, &ClassName::setFunction), defaultValue, variantStructureElementsNames, mode))
+#define URHO3D_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE(name, getFunction, setFunction, typeName, defaultValue, variantStructureElementNames, mode) context->RegisterAttribute<ClassName>(Urho3D::AttributeInfo(Urho3D::GetVariantType<typeName >(), name, new Urho3D::AttributeAccessorImpl<ClassName, typeName, Urho3D::AttributeTrait<typeName > >(&ClassName::getFunction, &ClassName::setFunction), defaultValue, variantStructureElementNames, mode))
 /// Define an variant structure attribute that uses get and set functions, where the get function returns by value, but the set function uses a reference.
-#define URHO3D_MIXED_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE(name, getFunction, setFunction, typeName, defaultValue, variantStructureElementsNames, mode) context->RegisterAttribute<ClassName>(Urho3D::AttributeInfo(Urho3D::GetVariantType<typeName >(), name, new Urho3D::AttributeAccessorImpl<ClassName, typeName, Urho3D::MixedAttributeTrait<typeName > >(&ClassName::getFunction, &ClassName::setFunction), defaultValue, variantStructureElementsNames, mode))
+#define URHO3D_MIXED_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE(name, getFunction, setFunction, typeName, defaultValue, variantStructureElementNames, mode) context->RegisterAttribute<ClassName>(Urho3D::AttributeInfo(Urho3D::GetVariantType<typeName >(), name, new Urho3D::AttributeAccessorImpl<ClassName, typeName, Urho3D::MixedAttributeTrait<typeName > >(&ClassName::getFunction, &ClassName::setFunction), defaultValue, variantStructureElementNames, mode))
 
 }

Source/Urho3D/Scene/SplinePath.cpp

@@ -33,7 +33,7 @@ namespace Urho3D
 extern const char* interpolationModeNames[];
 extern const char* LOGIC_CATEGORY;
 
-const char* controlPointsStructureElementsNames[] =
+const char* controlPointsStructureElementNames[] =
 {
     "Control Point Count",
     "***NodeID",
@@ -64,7 +64,7 @@ void SplinePath::RegisterObject(Context* context)
     URHO3D_ATTRIBUTE("Elapsed Time", float, elapsedTime_, 0.f, AM_FILE | AM_NOEDIT);
     URHO3D_ACCESSOR_ATTRIBUTE("Controlled", GetControlledIdAttr, SetControlledIdAttr, unsigned, 0, AM_FILE | AM_NODEID);
     URHO3D_ACCESSOR_VARIANT_VECTOR_STRUCTURE_ATTRIBUTE("Control Points", GetControlPointIdsAttr, SetControlPointIdsAttr,
-                                                            VariantVector, Variant::emptyVariantVector, controlPointsStructureElementsNames,
+                                                            VariantVector, Variant::emptyVariantVector, controlPointsStructureElementNames,
                                                             AM_FILE | AM_NODEIDVECTOR);
 }