Merge branch '3.8' into 3.9-beta

This commit is contained in:
badlogic 2019-10-09 13:49:53 +02:00
commit fc0385cb3c
3 changed files with 25 additions and 0 deletions

View File

@ -167,6 +167,7 @@
* Added `Attachment#copy()` to all attachment type implementations. This lets you deep copy an attachment to modify it independently from the original, i.e. when programmatically changing texture coordinates or mesh vertices.
* Added `MeshAttachment#newLinkedMesh()`, creates a linked mesh linkted to either the original mesh, or the parent of the original mesh.
* Added IK softness.
* Exposed `x` and `y` on `SkeletonData` through getters and setters.
### Cocos2d-x
* Updated to cocos2d-x 3.17.1

View File

@ -127,6 +127,14 @@ public:
Vector<PathConstraintData *> &getPathConstraints();
float getX();
void setX(float inValue);
float getY();
void setY(float inValue);
float getWidth();
void setWidth(float inValue);

View File

@ -168,6 +168,22 @@ Vector<PathConstraintData *> &SkeletonData::getPathConstraints() {
return _pathConstraints;
}
float SkeletonData::getX() {
return _x;
}
void SkeletonData::setX(float inValue) {
_x = inValue;
}
float SkeletonData::getY() {
return _y;
}
void SkeletonData::setY(float inValue) {
_y = inValue;
}
float SkeletonData::getWidth() {
return _width;
}