Removed the mechanism of binary-serializing resource name hashes instead of resource names. This is to allow correct resource loading from binary scene files on platforms that cannot iterate the resources in the application installation (eg. Android). This also affects networking, downside is increased network payload size when resource attributes are transferred. All binary scenes saved with old Urho versions are also invalidated.

Bin/Data/Scripts/Editor/AttributeEditor.as

@@ -465,7 +465,7 @@ void LoadAttributeEditor(UIElement@ parent, const Variant&in value, const Attrib
     }
     else if (type == VAR_RESOURCEREF)
     {
-        SetEditable(SetValue(parent.children[1].children[0], cache.GetResourceName(value.GetResourceRef().id), sameValue), editable && sameValue);
+        SetEditable(SetValue(parent.children[1].children[0], value.GetResourceRef().name, sameValue), editable && sameValue);
         SetEditable(parent.children[1].children[1], editable && sameValue);  // If editable then can pick
         for (uint i = 2; i < parent.children[1].numChildren; ++i)
             SetEditable(parent.children[1].children[i], sameValue); // If same value then can open/edit/test
@@ -480,22 +480,22 @@ void LoadAttributeEditor(UIElement@ parent, const Variant&in value, const Attrib
             if (parent is null)
                 break;
 
-            StringHash firstID = refList.ids[subIndex];
-            bool idSameValue = true;
+            String firstName = refList.names[subIndex];
+            bool nameSameValue = true;
             if (!sameValue)
             {
-                // Reevaluate each ID in the list
+                // Reevaluate each name in the list
                 for (uint i = 0; i < values.length; ++i)
                 {
                     ResourceRefList refList = values[i].GetResourceRefList();
-                    if (subIndex >= refList.length || refList.ids[subIndex] != firstID)
+                    if (subIndex >= refList.length || refList.names[subIndex] != firstName)
                     {
-                        idSameValue = false;
+                        nameSameValue = false;
                         break;
                     }
                 }
             }
-            SetEditable(SetValue(parent.children[1].children[0], cache.GetResourceName(firstID), idSameValue), editable && idSameValue);
+            SetEditable(SetValue(parent.children[1].children[0], firstName, nameSameValue), editable && nameSameValue);
         }
     }
     else if (type == VAR_VARIANTVECTOR)
@@ -619,7 +619,7 @@ void StoreAttributeEditor(UIElement@ parent, Array<Serializable@>@ serializables
             Variant[] values(1);
             GetEditorValue(parent, VAR_RESOURCEREF, null, coordinate, values);
             ResourceRef ref = values[0].GetResourceRef();
-            refList.ids[subIndex] = ref.id;
+            refList.names[subIndex] = ref.name;
             serializables[i].attributes[index] = Variant(refList);
         }
     }
@@ -710,7 +710,7 @@ void GetEditorValue(UIElement@ parent, VariantType type, Array<String>@ enumName
     {
         LineEdit@ attrEdit = parent.children[0];
         ResourceRef ref;
-        ref.id = StringHash(attrEdit.text.Trimmed());
+        ref.name = attrEdit.text.Trimmed();
         ref.type = ShortStringHash(attrEdit.vars[TYPE_VAR].GetUInt());
         FillValue(values, Variant(ref));
     }
@@ -965,7 +965,7 @@ void PickResourceDone(StringHash eventType, VariantMap& eventData)
         {
             ResourceRef ref = target.attributes[resourcePickIndex].GetResourceRef();
             ref.type = res.type;
-            ref.id = StringHash(res.name);
+            ref.name = res.name;
             target.attributes[resourcePickIndex] = Variant(ref);
             target.ApplyAttributes();
         }
@@ -974,7 +974,7 @@ void PickResourceDone(StringHash eventType, VariantMap& eventData)
             ResourceRefList refList = target.attributes[resourcePickIndex].GetResourceRefList();
             if (resourcePickSubIndex < refList.length)
             {
-                refList.ids[resourcePickSubIndex] = StringHash(res.name);
+                refList.names[resourcePickSubIndex] = res.name;
                 target.attributes[resourcePickIndex] = Variant(refList);
                 target.ApplyAttributes();
             }
@@ -984,7 +984,7 @@ void PickResourceDone(StringHash eventType, VariantMap& eventData)
             Array<Variant>@ attrs = target.attributes[resourcePickIndex].GetVariantVector();
             ResourceRef ref = attrs[resourcePickSubIndex].GetResourceRef();
             ref.type = res.type;
-            ref.id = StringHash(res.name);
+            ref.name = res.name;
             attrs[resourcePickSubIndex] = ref;
             target.attributes[resourcePickIndex] = Variant(attrs);
             target.ApplyAttributes();

Docs/AngelScriptAPI.h

@@ -885,7 +885,7 @@ class ResourceRef
 
 // Properties:
 ShortStringHash type;
-StringHash id;
+String name;
 };
 
 class ResourceRefList
@@ -898,7 +898,7 @@ void Resize(uint);
 uint length;
 /* (readonly) */
 bool empty;
-Array<StringHash> ids;
+Array<String> names;
 ShortStringHash type;
 };
 
@@ -1457,10 +1457,8 @@ bool Exists(const String&) const;
 File GetFile(const String&);
 String GetPreferredResourceDir(const String&) const;
 String SanitateResourceName(const String&) const;
-const String& GetResourceName(StringHash) const;
 String GetResourceFileName(const String&) const;
 Resource GetResource(const String&, const String&);
-Resource GetResource(ShortStringHash, StringHash);
 Resource GetResource(ShortStringHash, const String&);
 
 // Properties:

Docs/ScriptAPI.dox

@@ -885,7 +885,7 @@ Properties:
 Properties:
 
 - ShortStringHash type
-- StringHash id
+- String name
 
 
 ### ResourceRefList
@@ -898,7 +898,7 @@ Properties:
 
 - uint length (readonly)
 - bool empty (readonly)
-- StringHash[] ids
+- String[] names
 - ShortStringHash type
 
 
@@ -1398,10 +1398,8 @@ Methods:
 - File@ GetFile(const String&)
 - String GetPreferredResourceDir(const String&) const
 - String SanitateResourceName(const String&) const
-- const String& GetResourceName(StringHash) const
 - String GetResourceFileName(const String&) const
 - Resource@ GetResource(const String&, const String&)
-- Resource@ GetResource(ShortStringHash, StringHash)
 - Resource@ GetResource(ShortStringHash, const String&)
 
 Properties:

Source/Engine/Audio/SoundSource.cpp

@@ -498,7 +498,7 @@ void SoundSource::Mix(int* dest, unsigned samples, int mixRate, bool stereo, boo
 void SoundSource::SetSoundAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    Play(cache->GetResource<Sound>(value.id_));
+    Play(cache->GetResource<Sound>(value.name_));
 }
 
 void SoundSource::SetPositionAttr(int value)

Source/Engine/Core/Variant.cpp

@@ -231,7 +231,7 @@ void Variant::FromString(VariantType type, const char* value)
                 SetType(VAR_RESOURCEREF);
                 ResourceRef& ref = *(reinterpret_cast<ResourceRef*>(&value_));
                 ref.type_ = values[0];
-                ref.id_ = values[1];
+                ref.name_ = values[1];
             }
         }
         break;
@@ -244,9 +244,9 @@ void Variant::FromString(VariantType type, const char* value)
                 SetType(VAR_RESOURCEREFLIST);
                 ResourceRefList& refList = *(reinterpret_cast<ResourceRefList*>(&value_));
                 refList.type_ = values[0];
-                refList.ids_.Resize(values.Size() - 1);
+                refList.names_.Resize(values.Size() - 1);
                 for (unsigned i = 1; i < values.Size(); ++i)
-                    refList.ids_[i - 1] = values[i];
+                    refList.names_[i - 1] = values[i];
             }
         }
         break;
@@ -332,7 +332,7 @@ String Variant::ToString() const
 
     default:
         // VAR_RESOURCEREF, VAR_RESOURCEREFLIST, VAR_VARIANTVECTOR, VAR_VARIANTMAP
-        // Reference string serialization requires hash-to-name mapping from the context & subsystems. Can not support here
+        // Reference string serialization requires typehash-to-name mapping from the context. Can not support here
         // Also variant map or vector string serialization is not supported. XML or binary save should be used instead
         return String::EMPTY;
     }
@@ -377,14 +377,14 @@ bool Variant::IsZero() const
         return value_.ptr_ == 0;
 
     case VAR_RESOURCEREF:
-        return reinterpret_cast<const ResourceRef*>(&value_)->id_ == StringHash::ZERO;
+        return reinterpret_cast<const ResourceRef*>(&value_)->name_.Empty();
 
     case VAR_RESOURCEREFLIST:
     {
-        Vector<StringHash> ids = reinterpret_cast<const ResourceRefList*>(&value_)->ids_;
-        for (Vector<StringHash>::ConstIterator i = ids.Begin(); i != ids.End(); ++i)
+        const Vector<String>& names = reinterpret_cast<const ResourceRefList*>(&value_)->names_;
+        for (Vector<String>::ConstIterator i = names.Begin(); i != names.End(); ++i)
         {
-            if (*i != StringHash::ZERO)
+            if (!i->Empty())
                 return false;
         }
         return true;

Source/Engine/Core/Variant.h

@@ -103,29 +103,29 @@ struct URHO3D_API ResourceRef
     {
     }
 
-    /// Construct with type and id.
-    ResourceRef(ShortStringHash type, StringHash id) :
+    /// Construct with type and resource name.
+    ResourceRef(ShortStringHash type, const String& name) :
         type_(type),
-        id_(id)
+        name_(name)
     {
     }
 
     // Construct from another ResourceRef.
     ResourceRef(const ResourceRef& rhs) :
         type_(rhs.type_),
-        id_(rhs.id_)
+        name_(rhs.name_)
     {
     }
 
     /// Object type.
     ShortStringHash type_;
-    /// Object identifier (name hash.)
-    StringHash id_;
+    /// Object name.
+    String name_;
 
     /// Test for equality with another reference.
-    bool operator == (const ResourceRef& rhs) const { return type_ == rhs.type_ && id_ == rhs.id_; }
+    bool operator == (const ResourceRef& rhs) const { return type_ == rhs.type_ && name_ == rhs.name_; }
     /// Test for inequality with another reference.
-    bool operator != (const ResourceRef& rhs) const { return type_ != rhs.type_ || id_ != rhs.id_; }
+    bool operator != (const ResourceRef& rhs) const { return type_ != rhs.type_ || name_ != rhs.name_; }
 };
 
 /// %List of typed resource references.
@@ -142,21 +142,21 @@ struct URHO3D_API ResourceRefList
     {
     }
     /// Construct with type and id list.
-    ResourceRefList(ShortStringHash type, const Vector<StringHash>& ids) :
+    ResourceRefList(ShortStringHash type, const Vector<String>& names) :
         type_(type),
-        ids_(ids)
+        names_(names)
     {
     }
 
     /// Object type.
     ShortStringHash type_;
-    /// List of object identifiers (name hashes).
-    Vector<StringHash> ids_;
+    /// List of object names.
+    Vector<String> names_;
 
     /// Test for equality with another reference list.
-    bool operator == (const ResourceRefList& rhs) const { return type_ == rhs.type_ && ids_ == rhs.ids_; }
+    bool operator == (const ResourceRefList& rhs) const { return type_ == rhs.type_ && names_ == rhs.names_; }
     /// Test for inequality with another reference list.
-    bool operator != (const ResourceRefList& rhs) const { return type_ != rhs.type_ || ids_ != rhs.ids_; }
+    bool operator != (const ResourceRefList& rhs) const { return type_ != rhs.type_ || names_ != rhs.names_; }
 };
 
 class Variant;

Source/Engine/Graphics/AnimatedModel.cpp

@@ -739,7 +739,7 @@ void AnimatedModel::SetModelAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
     // When loading a scene, set model without creating the bone nodes (will be assigned later during post-load)
-    SetModel(cache->GetResource<Model>(value.id_), !loading_);
+    SetModel(cache->GetResource<Model>(value.name_), !loading_);
 }
 
 void AnimatedModel::SetBonesEnabledAttr(VariantVector value)
@@ -768,7 +768,7 @@ void AnimatedModel::SetAnimationStatesAttr(VariantVector value)
         {
             // Note: null animation is allowed here for editing
             const ResourceRef& animRef = value[index++].GetResourceRef();
-            SharedPtr<AnimationState> newState(new AnimationState(this, cache->GetResource<Animation>(animRef.id_)));
+            SharedPtr<AnimationState> newState(new AnimationState(this, cache->GetResource<Animation>(animRef.name_)));
             animationStates_.Push(newState);
 
             newState->SetStartBone(skeleton_.GetBone(value[index++].GetString()));
@@ -819,7 +819,7 @@ VariantVector AnimatedModel::GetAnimationStatesAttr() const
         AnimationState* state = *i;
         Animation* animation = state->GetAnimation();
         Bone* startBone = state->GetStartBone();
-        ret.Push(ResourceRef(Animation::GetTypeStatic(), animation ? animation->GetNameHash() : StringHash()));
+        ret.Push(GetResourceRef(animation, Animation::GetTypeStatic()));
         ret.Push(startBone ? startBone->name_ : String::EMPTY);
         ret.Push(state->IsLooped());
         ret.Push(state->GetWeight());

Source/Engine/Graphics/AnimationController.cpp

@@ -168,6 +168,7 @@ bool AnimationController::Play(const String& name, unsigned char layer, bool loo
     {
         AnimationControl newControl;
         Animation* animation = state->GetAnimation();
+        newControl.name_ = animation->GetName();
         newControl.hash_ = animation->GetNameHash();
         animations_.Push(newControl);
         index = animations_.Size() - 1;
@@ -494,7 +495,8 @@ void AnimationController::SetAnimationsAttr(VariantVector value)
     while (index + 4 < value.Size())    // Prevent out-of-bound index access
     {
         AnimationControl newControl;
-        newControl.hash_ = value[index++].GetStringHash();
+        newControl.name_ = value[index++].GetString();
+        newControl.hash_ = StringHash(newControl.name_);
         newControl.speed_ = value[index++].GetFloat();
         newControl.targetWeight_ = value[index++].GetFloat();
         newControl.fadeTime_ = value[index++].GetFloat();
@@ -515,14 +517,15 @@ void AnimationController::SetNetAnimationsAttr(const PODVector<unsigned char>& v
     unsigned numAnimations = buf.ReadVLE();
     while (numAnimations--)
     {
-        StringHash animHash = buf.ReadStringHash();
+        String animName = buf.ReadString();
+        StringHash animHash(animName);
         processedAnimations.Insert(animHash);
         
         // Check if the animation state exists. If not, add new
         AnimationState* state = GetAnimationState(animHash);
         if (!state)
         {
-            Animation* newAnimation = GetSubsystem<ResourceCache>()->GetResource<Animation>(animHash);
+            Animation* newAnimation = GetSubsystem<ResourceCache>()->GetResource<Animation>(animName);
             state = AddAnimationState(newAnimation);
             if (!state)
             {
@@ -540,6 +543,7 @@ void AnimationController::SetNetAnimationsAttr(const PODVector<unsigned char>& v
         if (index == animations_.Size())
         {
             AnimationControl newControl;
+            newControl.name_ = animName;
             newControl.hash_ = animHash;
             animations_.Push(newControl);
         }
@@ -617,7 +621,7 @@ void AnimationController::SetNodeAnimationStatesAttr(VariantVector value)
         {
             // Note: null animation is allowed here for editing
             const ResourceRef& animRef = value[index++].GetResourceRef();
-            SharedPtr<AnimationState> newState(new AnimationState(GetNode(), cache->GetResource<Animation>(animRef.id_)));
+            SharedPtr<AnimationState> newState(new AnimationState(GetNode(), cache->GetResource<Animation>(animRef.name_)));
             nodeAnimationStates_.Push(newState);
 
             newState->SetLooped(value[index++].GetBool());
@@ -638,7 +642,7 @@ VariantVector AnimationController::GetAnimationsAttr() const
     ret.Reserve(animations_.Size() * 5);
     for (Vector<AnimationControl>::ConstIterator i = animations_.Begin(); i != animations_.End(); ++i)
     {
-        ret.Push(i->hash_);
+        ret.Push(i->name_);
         ret.Push(i->speed_);
         ret.Push(i->targetWeight_);
         ret.Push(i->fadeTime_);
@@ -680,7 +684,7 @@ const PODVector<unsigned char>& AnimationController::GetNetAnimationsAttr() cons
         if (i->setWeightTtl_ > 0.0f)
             ctrl |= CTRL_SETWEIGHT;
         
-        attrBuffer_.WriteStringHash(i->hash_);
+        attrBuffer_.WriteString(i->name_);
         attrBuffer_.WriteUByte(ctrl);
         attrBuffer_.WriteUByte(state->GetLayer());
         attrBuffer_.WriteShort((short)Clamp(i->speed_ * 2048.0f, -32767.0f, 32767.0f));
@@ -714,7 +718,7 @@ VariantVector AnimationController::GetNodeAnimationStatesAttr() const
     {
         AnimationState* state = *i;
         Animation* animation = state->GetAnimation();
-        ret.Push(ResourceRef(Animation::GetTypeStatic(), animation ? animation->GetNameHash() : StringHash()));
+        ret.Push(GetResourceRef(animation, Animation::GetTypeStatic()));
         ret.Push(state->IsLooped());
         ret.Push(state->GetTime());
     }

Source/Engine/Graphics/AnimationController.h

@@ -51,6 +51,8 @@ struct AnimationControl
     {
     }
 
+    /// Animation resource name.
+    String name_;
     /// Animation resource name hash.
     StringHash hash_;
     /// Animation speed.

Source/Engine/Graphics/BillboardSet.cpp

@@ -236,7 +236,7 @@ Billboard* BillboardSet::GetBillboard(unsigned index)
 void BillboardSet::SetMaterialAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetMaterial(cache->GetResource<Material>(value.id_));
+    SetMaterial(cache->GetResource<Material>(value.name_));
 }
 
 void BillboardSet::SetBillboardsAttr(VariantVector value)

Source/Engine/Graphics/CustomGeometry.cpp

@@ -414,8 +414,8 @@ void CustomGeometry::SetGeometryDataAttr(PODVector<unsigned char> value)
 void CustomGeometry::SetMaterialsAttr(const ResourceRefList& value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    for (unsigned i = 0; i < value.ids_.Size(); ++i)
-        SetMaterial(i, cache->GetResource<Material>(value.ids_[i]));
+    for (unsigned i = 0; i < value.names_.Size(); ++i)
+        SetMaterial(i, cache->GetResource<Material>(value.names_[i]));
 }
 
 PODVector<unsigned char> CustomGeometry::GetGeometryDataAttr() const
@@ -451,9 +451,9 @@ PODVector<unsigned char> CustomGeometry::GetGeometryDataAttr() const
 
 const ResourceRefList& CustomGeometry::GetMaterialsAttr() const
 {
-    materialsAttr_.ids_.Resize(batches_.Size());
+    materialsAttr_.names_.Resize(batches_.Size());
     for (unsigned i = 0; i < batches_.Size(); ++i)
-        materialsAttr_.ids_[i] = batches_[i].material_ ? batches_[i].material_->GetNameHash() : StringHash();
+        materialsAttr_.names_[i] = GetResourceName(batches_[i].material_);
     
     return materialsAttr_;
 }

Source/Engine/Graphics/DecalSet.cpp

@@ -504,7 +504,7 @@ Material* DecalSet::GetMaterial() const
 void DecalSet::SetMaterialAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetMaterial(cache->GetResource<Material>(value.id_));
+    SetMaterial(cache->GetResource<Material>(value.name_));
 }
 
 void DecalSet::SetDecalsAttr(PODVector<unsigned char> value)

Source/Engine/Graphics/Light.cpp

@@ -427,13 +427,13 @@ const Matrix3x4& Light::GetVolumeTransform(Camera* camera)
 void Light::SetRampTextureAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    rampTexture_ = static_cast<Texture*>(cache->GetResource(value.type_, value.id_));
+    rampTexture_ = static_cast<Texture*>(cache->GetResource(value.type_, value.name_));
 }
 
 void Light::SetShapeTextureAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    shapeTexture_ = static_cast<Texture*>(cache->GetResource(value.type_, value.id_));
+    shapeTexture_ = static_cast<Texture*>(cache->GetResource(value.type_, value.name_));
 }
 
 ResourceRef Light::GetRampTextureAttr() const

Source/Engine/Graphics/StaticModel.cpp

@@ -370,14 +370,14 @@ void StaticModel::SetNumGeometries(unsigned num)
 void StaticModel::SetModelAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetModel(cache->GetResource<Model>(value.id_));
+    SetModel(cache->GetResource<Model>(value.name_));
 }
 
 void StaticModel::SetMaterialsAttr(const ResourceRefList& value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    for (unsigned i = 0; i < value.ids_.Size(); ++i)
-        SetMaterial(i, cache->GetResource<Material>(value.ids_[i]));
+    for (unsigned i = 0; i < value.names_.Size(); ++i)
+        SetMaterial(i, cache->GetResource<Material>(value.names_[i]));
 }
 
 ResourceRef StaticModel::GetModelAttr() const
@@ -387,9 +387,9 @@ ResourceRef StaticModel::GetModelAttr() const
 
 const ResourceRefList& StaticModel::GetMaterialsAttr() const
 {
-    materialsAttr_.ids_.Resize(batches_.Size());
+    materialsAttr_.names_.Resize(batches_.Size());
     for (unsigned i = 0; i < batches_.Size(); ++i)
-        materialsAttr_.ids_[i] = batches_[i].material_ ? batches_[i].material_->GetNameHash() : StringHash();
+        materialsAttr_.names_[i] = GetResourceName(batches_[i].material_);
     
     return materialsAttr_;
 }

Source/Engine/Graphics/Terrain.cpp

@@ -533,13 +533,13 @@ void Terrain::UpdatePatchLod(TerrainPatch* patch)
 void Terrain::SetMaterialAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetMaterial(cache->GetResource<Material>(value.id_));
+    SetMaterial(cache->GetResource<Material>(value.name_));
 }
 
 void Terrain::SetHeightMapAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    Image* image = cache->GetResource<Image>(value.id_);
+    Image* image = cache->GetResource<Image>(value.name_);
     SetHeightMapInternal(image, false);
 }
 

Source/Engine/IO/Deserializer.cpp

@@ -251,7 +251,7 @@ ResourceRef Deserializer::ReadResourceRef()
 {
     ResourceRef ret;
     ret.type_ = ReadShortStringHash();
-    ret.id_ = ReadStringHash();
+    ret.name_ = ReadString();
     return ret;
 }
 
@@ -259,9 +259,9 @@ ResourceRefList Deserializer::ReadResourceRefList()
 {
     ResourceRefList ret;
     ret.type_ = ReadShortStringHash();
-    ret.ids_.Resize(ReadVLE());
-    if (ret.ids_.Size())
-        Read(&ret.ids_[0], ret.ids_.Size() * sizeof(StringHash));
+    ret.names_.Resize(ReadVLE());
+    for (unsigned i = 0; i < ret.names_.Size(); ++i)
+        ret.names_[i] = ReadString();
     return ret;
 }
 

Source/Engine/IO/Serializer.cpp

@@ -191,19 +191,20 @@ bool Serializer::WriteResourceRef(const ResourceRef& value)
 {
     bool success = true;
     success &= WriteShortStringHash(value.type_);
-    success &= WriteStringHash(value.id_);
+    success &= WriteString(value.name_);
     return success;
 }
 
 bool Serializer::WriteResourceRefList(const ResourceRefList& value)
 {
     bool success = true;
-    unsigned size = value.ids_.Size() * sizeof(StringHash);
+    unsigned size = value.names_.Size() * sizeof(StringHash);
     
     success &= WriteShortStringHash(value.type_);
-    success &= WriteVLE(value.ids_.Size());
-    if (size)
-        success &= Write(&value.ids_[0], size) == size;
+    success &= WriteVLE(value.names_.Size());
+    for (unsigned i = 0; i < value.names_.Size(); ++i)
+        success &= WriteString(value.names_[i]);
+    
     return success;
 }
 

Source/Engine/LuaScript/pkgs/Core/Variant.pkg

@@ -27,11 +27,11 @@ struct ResourceRef
 {
     ResourceRef();
     ResourceRef(ShortStringHash type);
-    ResourceRef(ShortStringHash type, StringHash id);
+    ResourceRef(ShortStringHash type, String name);
     ResourceRef(const ResourceRef& rhs);
     
     ShortStringHash type_ @ type;
-    StringHash id_ @ id;
+    String name_ @ name;
 
     bool operator == (const ResourceRef& rhs) const;
 };

Source/Engine/LuaScript/pkgs/Resource/ResourceCache.pkg

@@ -13,11 +13,9 @@ class ResourceCache
     Resource* GetResource(const String type, const String name);
     
     bool Exists(const String name) const;
-    bool Exists(StringHash nameHash) const;
     unsigned GetMemoryBudget(ShortStringHash type) const;
     unsigned GetMemoryUse(ShortStringHash type) const;
     unsigned GetTotalMemoryUse() const;
-    const String GetResourceName(StringHash nameHash) const;
     String GetResourceFileName(const String name) const;
     
     bool GetAutoReloadResources() const;

Source/Engine/Physics/CollisionShape.cpp

@@ -721,7 +721,7 @@ void CollisionShape::NotifyRigidBody(bool updateMass)
 void CollisionShape::SetModelAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    model_ = cache->GetResource<Model>(value.id_);
+    model_ = cache->GetResource<Model>(value.name_);
     recreateShape_ = true;
     MarkNetworkUpdate();
 }

Source/Engine/Resource/Resource.h

@@ -73,14 +73,9 @@ private:
     unsigned memoryUse_;
 };
 
-inline StringHash GetResourceHash(Resource* resource)
+inline const String& GetResourceName(Resource* resource)
 {
-    return resource ? resource->GetNameHash() : StringHash();
-}
-
-inline String GetResourceName(Resource* resource)
-{
-    return resource ? resource->GetName() : String();
+    return resource ? resource->GetName() : String::EMPTY;
 }
 
 inline ShortStringHash GetResourceType(Resource* resource, ShortStringHash defaultType)
@@ -90,21 +85,21 @@ inline ShortStringHash GetResourceType(Resource* resource, ShortStringHash defau
 
 inline ResourceRef GetResourceRef(Resource* resource, ShortStringHash defaultType)
 {
-    return ResourceRef(GetResourceType(resource, defaultType), GetResourceHash(resource));
+    return ResourceRef(GetResourceType(resource, defaultType), GetResourceName(resource));
 }
 
-template <class T> Vector<StringHash> GetResourceHashes(const Vector<SharedPtr<T> >& resources)
+template <class T> Vector<String> GetResourceNames(const Vector<SharedPtr<T> >& resources)
 {
     Vector<StringHash> ret(resources.Size());
     for (unsigned i = 0; i < resources.Size(); ++i)
-        ret[i] = GetResourceHash(resources[i]);
+        ret[i] = GetResourceName(resources[i]);
     
     return ret;
 }
 
 template <class T> ResourceRefList GetResourceRefList(const Vector<SharedPtr<T> >& resources)
 {
-    return ResourceRefList(T::GetTypeStatic(), GetResourceHashes(resources));
+    return ResourceRefList(T::GetTypeStatic(), GetResourceNames(resources));
 }
 
 }

Source/Engine/Resource/ResourceCache.cpp

@@ -90,12 +90,6 @@ bool ResourceCache::AddResourceDir(const String& pathName)
     
     resourceDirs_.Push(fixedPath);
     
-    // Scan the path for files recursively and add their hash-to-name mappings
-    Vector<String> fileNames;
-    fileSystem->ScanDir(fileNames, fixedPath, "*.*", SCAN_FILES, true);
-    for (unsigned i = 0; i < fileNames.Size(); ++i)
-        StoreNameHash(fileNames[i]);
-    
     // If resource auto-reloading active, create a file watcher for the directory
     if (autoReloadResources_)
     {
@@ -119,11 +113,6 @@ void ResourceCache::AddPackageFile(PackageFile* package, bool addAsFirst)
     else
         packages_.Push(SharedPtr<PackageFile>(package));
     
-    // Scan the package for files and add their hash-to-name mappings
-    const HashMap<String, PackageEntry>& entries = package->GetEntries();
-    for (HashMap<String, PackageEntry>::ConstIterator i = entries.Begin(); i != entries.End(); ++i)
-        StoreNameHash(i->first_);
-    
     LOGINFO("Added resource package " + package->GetName());
 }
 
@@ -142,7 +131,6 @@ bool ResourceCache::AddManualResource(Resource* resource)
         return false;
     }
     
-    StoreNameHash(name);
     resource->ResetUseTimer();
     resourceGroups_[resource->GetType()].resources_[resource->GetNameHash()] = resource;
     UpdateResourceGroup(resource->GetType());
@@ -383,39 +371,25 @@ SharedPtr<File> ResourceCache::GetFile(const String& nameIn)
     return SharedPtr<File>();
 }
 
-Resource* ResourceCache::GetResource(ShortStringHash type, const String& nameIn)
-{
-    String name = SanitateResourceName(nameIn);
-    
-    // Add the name to the hash map, so if this is an unknown resource, the error will not be unintelligible
-    StoreNameHash(name);
-    
-    return GetResource(type, StringHash(name));
-}
-
 Resource* ResourceCache::GetResource(ShortStringHash type, const char* name)
 {
     return GetResource(type, String(name));
 }
 
-Resource* ResourceCache::GetResource(ShortStringHash type, StringHash nameHash)
+Resource* ResourceCache::GetResource(ShortStringHash type, const String& nameIn)
 {
-    // If null hash, return null pointer immediately
-    if (!nameHash)
+    String name = SanitateResourceName(nameIn);
+    
+    // If empty name, return null pointer immediately
+    if (name.Empty())
         return 0;
     
+    StringHash nameHash(name);
     const SharedPtr<Resource>& existing = FindResource(type, nameHash);
     if (existing)
         return existing;
     
     SharedPtr<Resource> resource;
-    const String& name = GetResourceName(nameHash);
-    if (name.Empty())
-    {
-        LOGERROR("Could not load unknown resource " + String(nameHash));
-        return 0;
-    }
-    
     // Make sure the pointer is non-null and is a Resource subclass
     resource = DynamicCast<Resource>(context_->CreateObject(type));
     if (!resource)
@@ -481,11 +455,6 @@ bool ResourceCache::Exists(const String& nameIn) const
     return false;
 }
 
-bool ResourceCache::Exists(StringHash nameHash) const
-{
-    return Exists(GetResourceName(nameHash));
-}
-
 unsigned ResourceCache::GetMemoryBudget(ShortStringHash type) const
 {
     HashMap<ShortStringHash, ResourceGroup>::ConstIterator i = resourceGroups_.Find(type);
@@ -512,15 +481,6 @@ unsigned ResourceCache::GetTotalMemoryUse() const
     return total;
 }
 
-const String& ResourceCache::GetResourceName(StringHash nameHash) const
-{
-    HashMap<StringHash, String>::ConstIterator i = hashToName_.Find(nameHash);
-    if (i == hashToName_.End())
-        return String::EMPTY;
-    else
-        return i->second_;
-}
-
 String ResourceCache::GetResourceFileName(const String& name) const
 {
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
@@ -603,26 +563,7 @@ String ResourceCache::SanitateResourceName(const String& nameIn) const
         name = namePath + GetFileNameAndExtension(name);
     }
 
-    return name;
-}
-
-void ResourceCache::StoreNameHash(const String& name)
-{
-    if (name.Empty())
-        return;
-    
-    StringHash hash(name);
-    
-    // If entry exists, check for difference (collision)
-    HashMap<StringHash, String>::Iterator i = hashToName_.Find(hash);
-    if (i != hashToName_.End())
-    {
-        if (i->second_.Compare(name, false))
-            LOGERROR("Resource hash collision " + i->second_ + " vs " + name);
-        i->second_ = name;
-    }
-    else
-        hashToName_[hash] = name;
+    return name.Trimmed();
 }
 
 void ResourceCache::StoreResourceDependency(Resource* resource, const String& dependency)

Source/Engine/Resource/ResourceCache.h

@@ -96,8 +96,6 @@ public:
     Resource* GetResource(ShortStringHash type, const String& name);
     /// Return a resource by type and name. Load if not loaded yet. Return null if fails.
     Resource* GetResource(ShortStringHash type, const char* name);
-    /// Return a resource by type and name hash. Load if not loaded yet. Return null if fails.
-    Resource* GetResource(ShortStringHash type, StringHash nameHash);
     /// Return all loaded resources of a specific type.
     void GetResources(PODVector<Resource*>& result, ShortStringHash type) const;
     /// Return all loaded resources.
@@ -110,22 +108,16 @@ public:
     template <class T> T* GetResource(const String& name);
     /// Template version of returning a resource by name.
     template <class T> T* GetResource(const char* name);
-    /// Template version of returning a resource by name hash.
-    template <class T> T* GetResource(StringHash nameHash);
     /// Template version of returning loaded resources of a specific type.
     template <class T> void GetResources(PODVector<T*>& result) const;
     /// Return whether a file exists by name.
     bool Exists(const String& name) const;
-    /// Return whether a file exists by name hash.
-    bool Exists(StringHash nameHash) const;
     /// Return memory budget for a resource type.
     unsigned GetMemoryBudget(ShortStringHash type) const;
     /// Return total memory use for a resource type.
     unsigned GetMemoryUse(ShortStringHash type) const;
     /// Return total memory use for all resources.
     unsigned GetTotalMemoryUse() const;
-    /// Return resource name from hash, or empty if not found.
-    const String& GetResourceName(StringHash nameHash) const;
     /// Return full absolute file name of resource if possible.
     String GetResourceFileName(const String& name) const;
     /// Return whether automatic resource reloading is enabled.
@@ -135,8 +127,6 @@ public:
     String GetPreferredResourceDir(const String& path) const;
     /// Remove unsupported constructs from the resource name to prevent ambiguity, and normalize absolute filename to resource path relative if possible.
     String SanitateResourceName(const String& name) const;
-    /// Store a hash-to-name mapping.
-    void StoreNameHash(const String& name);
     /// Store a dependency for a resource. If a dependency file changes, the resource will be reloaded.
     void StoreResourceDependency(Resource* resource, const String& dependency);
     /// Reset dependencies for a resource.
@@ -162,8 +152,6 @@ private:
     Vector<SharedPtr<FileWatcher> > fileWatchers_;
     /// Package files.
     Vector<SharedPtr<PackageFile> > packages_;
-    /// Mapping of hashes to filenames.
-    HashMap<StringHash, String> hashToName_;
     /// Dependent resources.
     HashMap<StringHash, HashSet<StringHash> > dependentResources_;
     /// Automatic resource reloading flag.
@@ -182,12 +170,6 @@ template <class T> T* ResourceCache::GetResource(const char* name)
     return static_cast<T*>(GetResource(type, name));
 }
 
-template <class T> T* ResourceCache::GetResource(StringHash nameHash)
-{
-    ShortStringHash type = T::GetTypeStatic();
-    return static_cast<T*>(GetResource(type, nameHash));
-}
-
 template <class T> void ResourceCache::GetResources(PODVector<T*>& result) const
 {
     PODVector<Resource*>& resources = reinterpret_cast<PODVector<Resource*>&>(result);

Source/Engine/Resource/XMLElement.cpp

@@ -23,7 +23,6 @@
 #include "Precompiled.h"
 #include "Context.h"
 #include "Log.h"
-#include "ResourceCache.h"
 #include "StringUtils.h"
 #include "XMLFile.h"
 
@@ -361,11 +360,10 @@ bool XMLElement::SetResourceRef(const ResourceRef& value)
     if (!file_ || (!node_ && !xpathNode_))
         return false;
 
-    // Need the context & resource cache to query for reverse hash mappings
+    // Need the context to query for the type
     Context* context = file_->GetContext();
-    ResourceCache* cache = file_->GetSubsystem<ResourceCache>();
 
-    return SetAttribute("value", String(context->GetTypeName(value.type_)) + ";" + cache->GetResourceName(value.id_));
+    return SetAttribute("value", String(context->GetTypeName(value.type_)) + ";" + value.name_);
 }
 
 bool XMLElement::SetResourceRefList(const ResourceRefList& value)
@@ -373,15 +371,14 @@ bool XMLElement::SetResourceRefList(const ResourceRefList& value)
     if (!file_ || (!node_ && !xpathNode_))
         return false;
 
-    // Need the context & resource cache to query for reverse hash mappings
+    // Need the context to query for the type
     Context* context = file_->GetContext();
-    ResourceCache* cache = file_->GetSubsystem<ResourceCache>();
 
     String str(context->GetTypeName(value.type_));
-    for (unsigned i = 0; i < value.ids_.Size(); ++i)
+    for (unsigned i = 0; i < value.names_.Size(); ++i)
     {
         str += ";";
-        str += cache->GetResourceName(value.ids_[i]);
+        str += value.names_[i];
     }
 
     return SetAttribute("value", str.CString());
@@ -734,12 +731,7 @@ ResourceRef XMLElement::GetResourceRef() const
     if (values.Size() == 2)
     {
         ret.type_ = values[0];
-        ret.id_ = values[1];
-
-        // Whenever we encounter a resource name read from a ResourceRef XML element, store the reverse mapping to
-        // ResourceCache if possible. We will probably use the hash to request a resource shortly afterward
-        if (file_)
-            file_->GetSubsystem<ResourceCache>()->StoreNameHash(values[1]);
+        ret.name_ = values[1];
     }
 
     return ret;
@@ -752,18 +744,10 @@ ResourceRefList XMLElement::GetResourceRefList() const
     Vector<String> values = GetAttribute("value").Split(';');
     if (values.Size() >= 1)
     {
-        // Whenever we encounter resource names read from a ResourceRefList XML element, store the reverse mapping to
-        // ResourceCache if possible. We will probably use the hashes to request resources shortly afterward
-        ResourceCache* cache = file_ ? file_->GetSubsystem<ResourceCache>() : 0;
-
         ret.type_ = values[0];
-        ret.ids_.Resize(values.Size() - 1);
+        ret.names_.Resize(values.Size() - 1);
         for (unsigned i = 1; i < values.Size(); ++i)
-        {
-            ret.ids_[i - 1] = StringHash(values[i]);
-            if (cache)
-                cache->StoreNameHash(values[i]);
-        }
+            ret.names_[i - 1] = values[i];
     }
 
     return ret;

Source/Engine/Script/CoreAPI.cpp

@@ -154,39 +154,39 @@ static void DestructResourceRefList(ResourceRefList* ptr)
 
 static void ResourceRefListResize(unsigned size, ResourceRefList* ptr)
 {
-    ptr->ids_.Resize(size);
+    ptr->names_.Resize(size);
 }
 
 static unsigned ResourceRefListGetSize(ResourceRefList* ptr)
 {
-    return ptr->ids_.Size();
+    return ptr->names_.Size();
 }
 
 static bool ResourceRefListIsEmpty(ResourceRefList* ptr)
 {
-    return ptr->ids_.Size() == 0;
+    return ptr->names_.Size() == 0;
 }
 
-static void ResourceRefListSetId(unsigned index, const StringHash& id, ResourceRefList* ptr)
+static void ResourceRefListSetName(unsigned index, const String& name, ResourceRefList* ptr)
 {
-    if (index >= ptr->ids_.Size())
+    if (index >= ptr->names_.Size())
     {
         asGetActiveContext()->SetException("Index out of bounds");
         return;
     }
 
-    ptr->ids_[index] = id;
+    ptr->names_[index] = name;
 }
 
-static StringHash ResourceRefListGetId(unsigned index, ResourceRefList* ptr)
+static const String& ResourceRefListGetName(unsigned index, ResourceRefList* ptr)
 {
-    if (index >= ptr->ids_.Size())
+    if (index >= ptr->names_.Size())
     {
         asGetActiveContext()->SetException("Index out of bounds");
-        return StringHash();
+        return String::EMPTY;
     }
 
-    return ptr->ids_[index];
+    return ptr->names_[index];
 }
 
 void ArrayToVariantVector(CScriptArray* arr, VariantVector& dest)
@@ -413,7 +413,7 @@ static void RegisterVariant(asIScriptEngine* engine)
     engine->RegisterObjectMethod("ResourceRef", "ResourceRef& opAssign(const ResourceRef&in)", asMETHOD(ResourceRef, operator =), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceRef", "bool opEquals(const ResourceRef&in) const", asMETHOD(ResourceRef, operator ==), asCALL_THISCALL);
     engine->RegisterObjectProperty("ResourceRef", "ShortStringHash type", offsetof(ResourceRef, type_));
-    engine->RegisterObjectProperty("ResourceRef", "StringHash id", offsetof(ResourceRef, id_));
+    engine->RegisterObjectProperty("ResourceRef", "String name", offsetof(ResourceRef, name_));
 
     engine->RegisterObjectType("ResourceRefList", sizeof(ResourceRefList), asOBJ_VALUE | asOBJ_APP_CLASS_C);
     engine->RegisterObjectBehaviour("ResourceRefList", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(ConstructResourceRefList), asCALL_CDECL_OBJLAST);
@@ -424,8 +424,8 @@ static void RegisterVariant(asIScriptEngine* engine)
     engine->RegisterObjectMethod("ResourceRefList", "void Resize(uint)", asFUNCTION(ResourceRefListResize), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("ResourceRefList", "uint get_length() const", asFUNCTION(ResourceRefListGetSize), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("ResourceRefList", "bool get_empty() const", asFUNCTION(ResourceRefListIsEmpty), asCALL_CDECL_OBJLAST);
-    engine->RegisterObjectMethod("ResourceRefList", "void set_ids(uint, const StringHash&in) const", asFUNCTION(ResourceRefListSetId), asCALL_CDECL_OBJLAST);
-    engine->RegisterObjectMethod("ResourceRefList", "StringHash get_ids(uint) const", asFUNCTION(ResourceRefListGetId), asCALL_CDECL_OBJLAST);
+    engine->RegisterObjectMethod("ResourceRefList", "void set_names(uint, const String&in) const", asFUNCTION(ResourceRefListSetName), asCALL_CDECL_OBJLAST);
+    engine->RegisterObjectMethod("ResourceRefList", "const String& get_names(uint) const", asFUNCTION(ResourceRefListGetName), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectProperty("ResourceRefList", "ShortStringHash type", offsetof(ResourceRef, type_));
 
     engine->RegisterObjectType("Variant", sizeof(Variant), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK);

Source/Engine/Script/ResourceAPI.cpp

@@ -114,10 +114,8 @@ static void RegisterResourceCache(asIScriptEngine* engine)
     engine->RegisterObjectMethod("ResourceCache", "File@ GetFile(const String&in)", asFUNCTION(ResourceCacheGetFile), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("ResourceCache", "String GetPreferredResourceDir(const String&in) const", asMETHOD(ResourceCache, GetPreferredResourceDir), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "String SanitateResourceName(const String&in) const", asMETHOD(ResourceCache, SanitateResourceName), asCALL_THISCALL);
-    engine->RegisterObjectMethod("ResourceCache", "const String& GetResourceName(StringHash) const", asMETHOD(ResourceCache, GetResourceName), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "String GetResourceFileName(const String&in) const", asMETHOD(ResourceCache, GetResourceFileName), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "Resource@+ GetResource(const String&in, const String&in)", asFUNCTION(ResourceCacheGetResource), asCALL_CDECL_OBJLAST);
-    engine->RegisterObjectMethod("ResourceCache", "Resource@+ GetResource(ShortStringHash, StringHash)", asMETHODPR(ResourceCache, GetResource, (ShortStringHash, StringHash), Resource*), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "Resource@+ GetResource(ShortStringHash, const String&in)", asMETHODPR(ResourceCache, GetResource, (ShortStringHash, const String&), Resource*), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "void set_memoryBudget(const String&in, uint)", asFUNCTION(ResourceCacheSetMemoryBudget), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("ResourceCache", "uint get_memoryBudget(const String&in) const", asFUNCTION(ResourceCacheGetMemoryBudget), asCALL_CDECL_OBJLAST);

Source/Engine/Script/ScriptInstance.cpp

@@ -108,7 +108,7 @@ void ScriptInstance::OnSetAttribute(const AttributeInfo& attr, const Variant& sr
         if (resourcePtr)
             resourcePtr->ReleaseRef();
         const ResourceRef& ref = src.GetResourceRef();
-        resourcePtr = GetSubsystem<ResourceCache>()->GetResource(ref.type_, ref.id_);
+        resourcePtr = GetSubsystem<ResourceCache>()->GetResource(ref.type_, ref.name_);
         if (resourcePtr)
             resourcePtr->AddRef();
     }
@@ -145,8 +145,7 @@ void ScriptInstance::OnGetAttribute(const AttributeInfo& attr, Variant& dest) co
     {
         Resource* resource = *(reinterpret_cast<Resource**>(attr.ptr_));
         // If resource is non-null get its type and name hash. Otherwise get type from the default value
-        dest = resource ? ResourceRef(resource->GetType(), resource->GetNameHash()) :
-            ResourceRef(attr.defaultValue_.GetResourceRef().type_);
+        dest = GetResourceRef(resource, attr.defaultValue_.GetResourceRef().type_);
     }
     else
         Serializable::OnGetAttribute(attr, dest);
@@ -345,7 +344,7 @@ void ScriptInstance::AddEventHandler(Object* sender, StringHash eventType, const
 void ScriptInstance::SetScriptFileAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetScriptFile(cache->GetResource<ScriptFile>(value.id_));
+    SetScriptFile(cache->GetResource<ScriptFile>(value.name_));
 }
 
 void ScriptInstance::SetDelayedCallsAttr(PODVector<unsigned char> value)

Source/Engine/UI/BorderImage.cpp

@@ -189,7 +189,7 @@ void BorderImage::GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vert
 void BorderImage::SetTextureAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetTexture(cache->GetResource<Texture2D>(value.id_));
+    SetTexture(cache->GetResource<Texture2D>(value.name_));
 }
 
 ResourceRef BorderImage::GetTextureAttr() const

Source/Engine/UI/Cursor.cpp

@@ -172,7 +172,7 @@ void Cursor::SetShapesAttr(VariantVector value)
             ResourceRef ref = value[index++].GetResourceRef();
             IntRect imageRect = value[index++].GetIntRect();
             IntVector2 hotSpot = value[index++].GetIntVector2();
-            DefineShape(shape, GetSubsystem<ResourceCache>()->GetResource<Image>(ref.id_), imageRect, hotSpot);
+            DefineShape(shape, GetSubsystem<ResourceCache>()->GetResource<Image>(ref.name_), imageRect, hotSpot);
         }
         else
             index += 3;

Source/Engine/UI/Sprite.cpp

@@ -267,7 +267,7 @@ const Matrix3x4& Sprite::GetTransform() const
 void Sprite::SetTextureAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetTexture(cache->GetResource<Texture2D>(value.id_));
+    SetTexture(cache->GetResource<Texture2D>(value.name_));
 }
 
 ResourceRef Sprite::GetTextureAttr() const

Source/Engine/UI/Text.cpp

@@ -382,7 +382,7 @@ void Text::SetEffectDepthBias(float bias)
 void Text::SetFontAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    font_ = cache->GetResource<Font>(value.id_);
+    font_ = cache->GetResource<Font>(value.name_);
 }
 
 ResourceRef Text::GetFontAttr() const

Source/Engine/UI/Text3D.cpp

@@ -410,13 +410,13 @@ void Text3D::MarkTextDirty()
 void Text3D::SetMaterialAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetMaterial(cache->GetResource<Material>(value.id_));
+    SetMaterial(cache->GetResource<Material>(value.name_));
 }
 
 void Text3D::SetFontAttr(ResourceRef value)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    text_.font_ = cache->GetResource<Font>(value.id_);
+    text_.font_ = cache->GetResource<Font>(value.name_);
 }
 
 ResourceRef Text3D::GetMaterialAttr() const