UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[c] Optimized attachment lookup in skin. See #1117. (#1118)

Browse Source 
* [c] Optimized attachment lookup in skin. See #1117.

* [c] Optimized attachment lookup in skin. See #1117. Changes according to suggestions in PR #1118.
This commit is contained in:
Ievgen Mukhin 2018-06-07 17:43:41 +03:00 committed by Mario Zechner
parent 35703dbce9
commit cab8127626
2 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-c/spine-c/include/spine/Skin.h
View File

@ -38,6 +38,9 @@
extern "C" { extern "C" {
#endif #endif
/* Size of hashtable used in skin structure for fast attachment lookup. */
#define SKIN_ENTRIES_HASH_TABLE_SIZE 100
struct spSkeleton; struct spSkeleton;
typedef struct spSkin { typedef struct spSkin {
@ -59,9 +62,16 @@ struct _Entry {
_Entry* next; _Entry* next;
}; };
typedef struct _SkinHashTableEntry _SkinHashTableEntry;
struct _SkinHashTableEntry {
_Entry* entry;
_SkinHashTableEntry* next; /* list for elements with same hashes */
};
typedef struct { typedef struct {
spSkin super; spSkin super;
_Entry* entries; _Entry* entries; /* entries list stored for getting attachment name by attachment index */
_SkinHashTableEntry* entriesHashTable[SKIN_ENTRIES_HASH_TABLE_SIZE]; /* hashtable for fast attachment lookup */
} _spSkin; } _spSkin;
SP_API spSkin* spSkin_create (const char* name); SP_API spSkin* spSkin_create (const char* name);

42
spine-c/spine-c/src/spine/Skin.c
View File

@ -45,6 +45,16 @@ void _Entry_dispose (_Entry* self) {
FREE(self); FREE(self);
} }
static _SkinHashTableEntry* _SkinHashTableEntry_create (_Entry* entry) {
_SkinHashTableEntry* self = NEW(_SkinHashTableEntry);
self->entry = entry;
return self;
}
static void _SkinHashTableEntry_dispose (_SkinHashTableEntry* self) {
FREE(self);
}
/**/ /**/
spSkin* spSkin_create (const char* name) { spSkin* spSkin_create (const char* name) {
@ -55,12 +65,28 @@ spSkin* spSkin_create (const char* name) {
void spSkin_dispose (spSkin* self) { void spSkin_dispose (spSkin* self) {
_Entry* entry = SUB_CAST(_spSkin, self)->entries; _Entry* entry = SUB_CAST(_spSkin, self)->entries;
while (entry) { while (entry) {
_Entry* nextEntry = entry->next; _Entry* nextEntry = entry->next;
_Entry_dispose(entry); _Entry_dispose(entry);
entry = nextEntry; entry = nextEntry;
} }
{
_SkinHashTableEntry** currentHashtableEntry = SUB_CAST(_spSkin, self)->entriesHashTable;
int i;
for (i = 0; i < SKIN_ENTRIES_HASH_TABLE_SIZE; ++i, ++currentHashtableEntry) {
_SkinHashTableEntry* hashtableEntry = *currentHashtableEntry;
while (hashtableEntry) {
_SkinHashTableEntry* nextEntry = hashtableEntry->next;
_SkinHashTableEntry_dispose(hashtableEntry);
hashtableEntry = nextEntry;
}
}
}
FREE(self->name); FREE(self->name);
FREE(self); FREE(self);
} }
@ -69,13 +95,21 @@ void spSkin_addAttachment (spSkin* self, int slotIndex, const char* name, spAtta
_Entry* newEntry = _Entry_create(slotIndex, name, attachment); _Entry* newEntry = _Entry_create(slotIndex, name, attachment);
newEntry->next = SUB_CAST(_spSkin, self)->entries; newEntry->next = SUB_CAST(_spSkin, self)->entries;
SUB_CAST(_spSkin, self)->entries = newEntry; SUB_CAST(_spSkin, self)->entries = newEntry;
{
unsigned int hashTableIndex = (unsigned int)slotIndex % SKIN_ENTRIES_HASH_TABLE_SIZE;
_SkinHashTableEntry* newHashEntry = _SkinHashTableEntry_create(newEntry);
newHashEntry->next = SUB_CAST(_spSkin, self)->entriesHashTable[hashTableIndex];
SUB_CAST(_spSkin, self)->entriesHashTable[hashTableIndex] = newHashEntry;
}
} }
spAttachment* spSkin_getAttachment (const spSkin* self, int slotIndex, const char* name) { spAttachment* spSkin_getAttachment (const spSkin* self, int slotIndex, const char* name) {
const _Entry* entry = SUB_CAST(_spSkin, self)->entries; const _SkinHashTableEntry* hashEntry = SUB_CAST(_spSkin, self)->entriesHashTable[(unsigned int)slotIndex % SKIN_ENTRIES_HASH_TABLE_SIZE];
while (entry) { while (hashEntry) {
if (entry->slotIndex == slotIndex && strcmp(entry->name, name) == 0) return entry->attachment; if (hashEntry->entry->slotIndex == slotIndex && strcmp(hashEntry->entry->name, name) == 0) return hashEntry->entry->attachment;
entry = entry->next; hashEntry = hashEntry->next;
} }
return 0; return 0;
} }