mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
Merge branch '3.8' into 3.9-beta
This commit is contained in:
commit
befba130ad
@ -8048,7 +8048,7 @@ var spine;
|
|||||||
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
||||||
};
|
};
|
||||||
RegionAttachment.prototype.copy = function () {
|
RegionAttachment.prototype.copy = function () {
|
||||||
var copy = new RegionAttachment(name);
|
var copy = new RegionAttachment(this.name);
|
||||||
copy.region = this.region;
|
copy.region = this.region;
|
||||||
copy.rendererObject = this.rendererObject;
|
copy.rendererObject = this.rendererObject;
|
||||||
copy.path = this.path;
|
copy.path = this.path;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -8048,7 +8048,7 @@ var spine;
|
|||||||
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
||||||
};
|
};
|
||||||
RegionAttachment.prototype.copy = function () {
|
RegionAttachment.prototype.copy = function () {
|
||||||
var copy = new RegionAttachment(name);
|
var copy = new RegionAttachment(this.name);
|
||||||
copy.region = this.region;
|
copy.region = this.region;
|
||||||
copy.rendererObject = this.rendererObject;
|
copy.rendererObject = this.rendererObject;
|
||||||
copy.path = this.path;
|
copy.path = this.path;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -8048,7 +8048,7 @@ var spine;
|
|||||||
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
||||||
};
|
};
|
||||||
RegionAttachment.prototype.copy = function () {
|
RegionAttachment.prototype.copy = function () {
|
||||||
var copy = new RegionAttachment(name);
|
var copy = new RegionAttachment(this.name);
|
||||||
copy.region = this.region;
|
copy.region = this.region;
|
||||||
copy.rendererObject = this.rendererObject;
|
copy.rendererObject = this.rendererObject;
|
||||||
copy.path = this.path;
|
copy.path = this.path;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -8048,7 +8048,7 @@ var spine;
|
|||||||
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
||||||
};
|
};
|
||||||
RegionAttachment.prototype.copy = function () {
|
RegionAttachment.prototype.copy = function () {
|
||||||
var copy = new RegionAttachment(name);
|
var copy = new RegionAttachment(this.name);
|
||||||
copy.region = this.region;
|
copy.region = this.region;
|
||||||
copy.rendererObject = this.rendererObject;
|
copy.rendererObject = this.rendererObject;
|
||||||
copy.path = this.path;
|
copy.path = this.path;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -8048,7 +8048,7 @@ var spine;
|
|||||||
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
||||||
};
|
};
|
||||||
RegionAttachment.prototype.copy = function () {
|
RegionAttachment.prototype.copy = function () {
|
||||||
var copy = new RegionAttachment(name);
|
var copy = new RegionAttachment(this.name);
|
||||||
copy.region = this.region;
|
copy.region = this.region;
|
||||||
copy.rendererObject = this.rendererObject;
|
copy.rendererObject = this.rendererObject;
|
||||||
copy.path = this.path;
|
copy.path = this.path;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -8048,7 +8048,7 @@ var spine;
|
|||||||
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
worldVertices[offset + 1] = offsetX * c + offsetY * d + y;
|
||||||
};
|
};
|
||||||
RegionAttachment.prototype.copy = function () {
|
RegionAttachment.prototype.copy = function () {
|
||||||
var copy = new RegionAttachment(name);
|
var copy = new RegionAttachment(this.name);
|
||||||
copy.region = this.region;
|
copy.region = this.region;
|
||||||
copy.rendererObject = this.rendererObject;
|
copy.rendererObject = this.rendererObject;
|
||||||
copy.path = this.path;
|
copy.path = this.path;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -214,7 +214,7 @@ module spine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
copy (): Attachment {
|
copy (): Attachment {
|
||||||
let copy = new RegionAttachment(name);
|
let copy = new RegionAttachment(this.name);
|
||||||
copy.region = this.region;
|
copy.region = this.region;
|
||||||
copy.rendererObject = this.rendererObject;
|
copy.rendererObject = this.rendererObject;
|
||||||
copy.path = this.path;
|
copy.path = this.path;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user