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

Wip

Browse Source
This commit is contained in:
Stephen Gowen 2017-10-19 15:36:38 -04:00
parent 1b89b06b77
commit 30dc2c08c6
4 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ namespace Spine
Entry* _entry; Entry* _entry;
}; };
HashMap(size_t capacity) : _capacity(capacity), _hashFunction(), _header(), _trailer() HashMap(size_t capacity = 65535) : _capacity(capacity), _hashFunction(), _header(), _trailer()
{ {
_hashTable = new Entry[capacity]; _hashTable = new Entry[capacity];
for (int i = 0; i < _capacity; ++i) for (int i = 0; i < _capacity; ++i)

12
spine-cpp/spine-cpp/include/spine/Skeleton.h
View File

@ -120,7 +120,7 @@ namespace Spine
/// @param width The width of the AABB /// @param width The width of the AABB
/// @param height The height of the AABB. /// @param height The height of the AABB.
/// @param vertexBuffer Reference to hold a SimpleArray of floats. This method will assign it with new floats as needed. /// @param vertexBuffer Reference to hold a SimpleArray of floats. This method will assign it with new floats as needed.
void getBounds(float& outX, float& outY, float& outWidth, float& outHeight, SimpleArray<float>& vertexBuffer); void getBounds(float& outX, float& outY, float& outWidth, float& outHeight, SimpleArray<float>& outVertexBuffer);
Bone* getRootBone(); Bone* getRootBone();
@ -170,15 +170,15 @@ namespace Spine
bool _flipX, _flipY; bool _flipX, _flipY;
float _x, _y; float _x, _y;
void sortIkConstraint(IkConstraint constraint); void sortIkConstraint(IkConstraint* constraint);
void sortPathConstraint(PathConstraint constraint); void sortPathConstraint(PathConstraint* constraint);
void sortTransformConstraint(TransformConstraint constraint); void sortTransformConstraint(TransformConstraint* constraint);
void sortPathConstraintAttachment(Skin skin, int slotIndex, Bone slotBone); void sortPathConstraintAttachment(Skin* skin, int slotIndex, Bone* slotBone);
void sortPathConstraintAttachment(Attachment attachment, Bone slotBone); void sortPathConstraintAttachment(Attachment* attachment, Bone* slotBone);
void sortBone(Bone bone); void sortBone(Bone bone);

10
spine-cpp/spine-cpp/include/spine/Skin.h
View File

@ -94,8 +94,14 @@ struct HashAttachmentKey
{ {
std::size_t operator()(const Spine::Skin::AttachmentKey& val) const std::size_t operator()(const Spine::Skin::AttachmentKey& val) const
{ {
std::size_t h1 = std::hash<int>{}(val._slotIndex); std::size_t h1 = static_cast<int(val._slotIndex);
std::size_t h2 = std::hash<std::string>{}(val._name);
std::size_t h2 = 7;
size_t strlen = val._name.length();
for (int i = 0; i < strlen; ++i)
{
h2 = h2 * 31 + val._name.at(i);
}
return h1 ^ (h2 << 1); return h1 ^ (h2 << 1);
} }

49
spine-cpp/spine-cpp/src/spine/Skeleton.cpp
View File

@ -42,10 +42,21 @@
namespace Spine namespace Spine
{ {
Skeleton::Skeleton(SkeletonData& data) : _data(data) Skeleton::Skeleton(SkeletonData& data) :
_data(data),
_skin(NULL),
_r(1),
_g(1),
_b(1),
_a(1),
_time(0),
_flipX(false),
_flipY(false),
_x(0),
_y(0)
{ {
_bones.reserve(_data->getBones().size()); _bones.reserve(_data.getBones().size());
bones = new SimpleArray<Bone>(data.bones.Count);
foreach (BoneData boneData in data.bones) foreach (BoneData boneData in data.bones)
{ {
Bone bone; Bone bone;
@ -63,8 +74,9 @@ namespace Spine
bones.Add(bone); bones.Add(bone);
} }
slots = new SimpleArray<Slot>(data.slots.Count); _slots.reserve(_data.getSlots().size());
drawOrder = new SimpleArray<Slot>(data.slots.Count); _drawOrder.reserve(_data.getSlots().size());
foreach (SlotData slotData in data.slots) foreach (SlotData slotData in data.slots)
{ {
Bone bone = bones.Items[slotData.boneData.index]; Bone bone = bones.Items[slotData.boneData.index];
@ -74,16 +86,23 @@ namespace Spine
} }
ikConstraints = new SimpleArray<IkConstraint>(data.ikConstraints.Count); ikConstraints = new SimpleArray<IkConstraint>(data.ikConstraints.Count);
foreach (IkConstraintData ikConstraintData in data.ikConstraints) foreach (IkConstraintData ikConstraintData in data.ikConstraints)
ikConstraints.Add(new IkConstraint(ikConstraintData, this)); {
ikConstraints.Add(new IkConstraint(ikConstraintData, this));
}
transformConstraints = new SimpleArray<TransformConstraint>(data.transformConstraints.Count); transformConstraints = new SimpleArray<TransformConstraint>(data.transformConstraints.Count);
foreach (TransformConstraintData transformConstraintData in data.transformConstraints) foreach (TransformConstraintData transformConstraintData in data.transformConstraints)
transformConstraints.Add(new TransformConstraint(transformConstraintData, this)); {
transformConstraints.Add(new TransformConstraint(transformConstraintData, this));
}
pathConstraints = new SimpleArray<PathConstraint> (data.pathConstraints.Count); pathConstraints = new SimpleArray<PathConstraint> (data.pathConstraints.Count);
foreach (PathConstraintData pathConstraintData in data.pathConstraints) foreach (PathConstraintData pathConstraintData in data.pathConstraints)
pathConstraints.Add(new PathConstraint(pathConstraintData, this)); {
pathConstraints.Add(new PathConstraint(pathConstraintData, this));
}
updateCache(); updateCache();
updateWorldTransform(); updateWorldTransform();
@ -443,7 +462,7 @@ namespace Spine
_time += delta; _time += delta;
} }
void Skeleton::getBounds(float& outX, float& outY, float& outWidth, float& outHeight, SimpleArray<float>& vertexBuffer) void Skeleton::getBounds(float& outX, float& outY, float& outWidth, float& outHeight, SimpleArray<float>& outVertexBuffer)
{ {
float minX = std::numeric_limits<float>::max(); float minX = std::numeric_limits<float>::max();
float minY = std::numeric_limits<float>::max(); float minY = std::numeric_limits<float>::max();
@ -643,7 +662,7 @@ namespace Spine
_flipY = inValue; _flipY = inValue;
} }
void Skeleton::sortIkConstraint(IkConstraint constraint) void Skeleton::sortIkConstraint(IkConstraint* constraint)
{ {
Bone target = constraint.target; Bone target = constraint.target;
sortBone(target); sortBone(target);
@ -667,7 +686,7 @@ namespace Spine
constrained.Items[constrained.Count - 1].sorted = true; constrained.Items[constrained.Count - 1].sorted = true;
} }
void Skeleton::sortPathConstraint(PathConstraint constraint) void Skeleton::sortPathConstraint(PathConstraint* constraint)
{ {
Slot slot = constraint.target; Slot slot = constraint.target;
int slotIndex = slot.data.index; int slotIndex = slot.data.index;
@ -714,7 +733,7 @@ namespace Spine
} }
} }
void Skeleton::sortTransformConstraint(TransformConstraint constraint) void Skeleton::sortTransformConstraint(TransformConstraint* constraint)
{ {
sortBone(constraint.target); sortBone(constraint.target);
@ -752,7 +771,7 @@ namespace Spine
} }
} }
void Skeleton::sortPathConstraintAttachment(Skin skin, int slotIndex, Bone slotBone) void Skeleton::sortPathConstraintAttachment(Skin* skin, int slotIndex, Bone* slotBone)
{ {
foreach (var entry in skin.Attachments) foreach (var entry in skin.Attachments)
{ {
@ -763,7 +782,7 @@ namespace Spine
} }
} }
void Skeleton::sortPathConstraintAttachment(Attachment attachment, Bone slotBone) void Skeleton::sortPathConstraintAttachment(Attachment* attachment, Bone* slotBone)
{ {
if (!(attachment is PathAttachment)) if (!(attachment is PathAttachment))
{ {
@ -790,7 +809,7 @@ namespace Spine
} }
} }
void Skeleton::sortBone(Bone bone) void Skeleton::sortBone(Bone* bone)
{ {
if (bone.sorted) if (bone.sorted)
{ {