UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-11 17:48:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Stephen Gowen 2017-11-24 17:34:14 -05:00
parent 91225fe9e3
commit b02c2aaaa4
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/spine-cpp/include/spine/ContainerUtil.h
View File

@ -126,7 +126,7 @@ namespace Spine
{
T* item = items[i];
FREE(item);
DESTROY(T, item);
items.erase(i);
}

3
spine-cpp/spine-cpp/include/spine/Extension.h
View File

@ -38,6 +38,9 @@
/* Frees memory. Can be used on const types. */
#define FREE(VALUE) spineFree((void*)VALUE)
/* Call destructor and then frees memory. Can be used on const types. */
#define DESTROY(TYPE,VALUE) VALUE->~TYPE(); spineFree((void*)VALUE)
#include <stdlib.h>
namespace Spine

21
spine-cpp/spine-cpp/include/spine/HashMap.h
View File

@ -31,7 +31,7 @@
#ifndef Spine_HashMap_h
#define Spine_HashMap_h
#include <memory>
#include <spine/Vector.h>
namespace Spine
{
@ -95,10 +95,10 @@ namespace Spine
_trailer(),
_hashSize(0)
{
_hashTable = new Entry[capacity];
_hashTable.reserve(capacity);
for (int i = 0; i < _capacity; ++i)
{
_hashTable[i] = Entry();
_hashTable.push_back(Entry());
}
_header.prev = &_header;
@ -109,8 +109,6 @@ namespace Spine
~HashMap()
{
delete [] _hashTable;
_hashSize = 0;
}
@ -150,7 +148,8 @@ namespace Spine
size_t index = hash(key);
Entry* entry = new Entry();
Entry* entry = MALLOC(Entry, 1);
new (entry) Entry();
entry->_key = key;
entry->_value = value;
@ -258,7 +257,7 @@ namespace Spine
pos._entry->next->prev = pos._entry->prev;
}
delete pos._entry;
DESTROY(Entry, pos._entry);
}
else if (_hashTable[index].next == pos._entry)
{
@ -274,7 +273,7 @@ namespace Spine
pos._entry->next->prev = pos._entry->prev;
}
delete pos._entry;
DESTROY(Entry, pos._entry);
}
else if (_hashTable[index].prev == pos._entry)
{
@ -290,14 +289,14 @@ namespace Spine
pos._entry->next->prev = pos._entry->prev;
}
delete pos._entry;
DESTROY(Entry, pos._entry);
}
else
{
pos._entry->prev->next = pos._entry->next;
pos._entry->next->prev = pos._entry->prev;
delete pos._entry;
DESTROY(Entry, pos._entry);
}
_hashSize--;
@ -332,7 +331,7 @@ namespace Spine
const H _hashFunction;
const size_t _capacity;
Entry* _hashTable;
Vector<Entry> _hashTable;
Entry _header;
Entry _trailer;
size_t _hashSize;

2
spine-cpp/spine-cpp/include/spine/Vector.h
View File

@ -184,7 +184,7 @@ namespace Spine
void deallocate(T* buffer)
{
free(buffer);
FREE(buffer);
}
void construct(T* buffer, const T& val)