@esotericsoftware/spine-core 4.0.9 → 4.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Animation.js +577 -710
- package/dist/AnimationState.js +239 -259
- package/dist/AnimationStateData.js +15 -17
- package/dist/AssetManagerBase.d.ts +3 -0
- package/dist/AssetManagerBase.js +168 -147
- package/dist/AtlasAttachmentLoader.js +20 -22
- package/dist/Bone.js +89 -91
- package/dist/BoneData.js +4 -6
- package/dist/ConstraintData.js +4 -6
- package/dist/Event.js +4 -6
- package/dist/EventData.js +4 -6
- package/dist/IkConstraint.js +48 -50
- package/dist/IkConstraintData.js +12 -31
- package/dist/PathConstraint.js +116 -118
- package/dist/PathConstraintData.js +9 -28
- package/dist/Skeleton.js +189 -192
- package/dist/SkeletonBinary.js +352 -363
- package/dist/SkeletonBounds.js +79 -81
- package/dist/SkeletonClipping.js +86 -88
- package/dist/SkeletonData.js +46 -48
- package/dist/SkeletonJson.js +307 -310
- package/dist/Skin.js +65 -69
- package/dist/Slot.js +16 -18
- package/dist/SlotData.js +4 -6
- package/dist/Texture.js +14 -39
- package/dist/TextureAtlas.js +56 -85
- package/dist/TransformConstraint.js +77 -79
- package/dist/TransformConstraintData.js +20 -39
- package/dist/Triangulator.js +71 -73
- package/dist/Updatable.js +1 -1
- package/dist/Utils.js +183 -245
- package/dist/VertexEffect.js +1 -1
- package/dist/attachments/Attachment.js +41 -62
- package/dist/attachments/AttachmentLoader.js +1 -1
- package/dist/attachments/BoundingBoxAttachment.js +9 -28
- package/dist/attachments/ClippingAttachment.js +9 -28
- package/dist/attachments/MeshAttachment.js +29 -48
- package/dist/attachments/PathAttachment.js +11 -30
- package/dist/attachments/PointAttachment.js +16 -35
- package/dist/attachments/RegionAttachment.js +82 -101
- package/dist/attachments/index.js +1 -1
- package/dist/iife/spine-core.js +62 -22
- package/dist/iife/spine-core.js.map +2 -2
- package/dist/iife/spine-core.min.js +2 -2
- package/dist/index.js +1 -1
- package/dist/polyfills.js +2 -2
- package/dist/vertexeffects/JitterEffect.js +10 -12
- package/dist/vertexeffects/SwirlEffect.js +18 -20
- package/package.json +1 -1
- package/dist/Animation.js.map +0 -1
- package/dist/AnimationState.js.map +0 -1
- package/dist/AnimationStateData.js.map +0 -1
- package/dist/AssetManagerBase.js.map +0 -1
- package/dist/AtlasAttachmentLoader.js.map +0 -1
- package/dist/Bone.js.map +0 -1
- package/dist/BoneData.js.map +0 -1
- package/dist/ConstraintData.js.map +0 -1
- package/dist/Event.js.map +0 -1
- package/dist/EventData.js.map +0 -1
- package/dist/IkConstraint.js.map +0 -1
- package/dist/IkConstraintData.js.map +0 -1
- package/dist/PathConstraint.js.map +0 -1
- package/dist/PathConstraintData.js.map +0 -1
- package/dist/Skeleton.js.map +0 -1
- package/dist/SkeletonBinary.js.map +0 -1
- package/dist/SkeletonBounds.js.map +0 -1
- package/dist/SkeletonClipping.js.map +0 -1
- package/dist/SkeletonData.js.map +0 -1
- package/dist/SkeletonJson.js.map +0 -1
- package/dist/Skin.js.map +0 -1
- package/dist/Slot.js.map +0 -1
- package/dist/SlotData.js.map +0 -1
- package/dist/Texture.js.map +0 -1
- package/dist/TextureAtlas.js.map +0 -1
- package/dist/TransformConstraint.js.map +0 -1
- package/dist/TransformConstraintData.js.map +0 -1
- package/dist/Triangulator.js.map +0 -1
- package/dist/Updatable.js.map +0 -1
- package/dist/Utils.js.map +0 -1
- package/dist/VertexEffect.js.map +0 -1
- package/dist/attachments/Attachment.js.map +0 -1
- package/dist/attachments/AttachmentLoader.js.map +0 -1
- package/dist/attachments/BoundingBoxAttachment.js.map +0 -1
- package/dist/attachments/ClippingAttachment.js.map +0 -1
- package/dist/attachments/MeshAttachment.js.map +0 -1
- package/dist/attachments/PathAttachment.js.map +0 -1
- package/dist/attachments/PointAttachment.js.map +0 -1
- package/dist/attachments/RegionAttachment.js.map +0 -1
- package/dist/attachments/index.js.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/polyfills.js.map +0 -1
- package/dist/vertexeffects/JitterEffect.js.map +0 -1
- package/dist/vertexeffects/SwirlEffect.js.map +0 -1
package/dist/TextureAtlas.js
CHANGED
|
@@ -26,92 +26,77 @@
|
|
|
26
26
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
27
27
|
* THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
28
28
|
*****************************************************************************/
|
|
29
|
-
var __extends = (this && this.__extends) || (function () {
|
|
30
|
-
var extendStatics = function (d, b) {
|
|
31
|
-
extendStatics = Object.setPrototypeOf ||
|
|
32
|
-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
33
|
-
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
34
|
-
return extendStatics(d, b);
|
|
35
|
-
};
|
|
36
|
-
return function (d, b) {
|
|
37
|
-
if (typeof b !== "function" && b !== null)
|
|
38
|
-
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
|
39
|
-
extendStatics(d, b);
|
|
40
|
-
function __() { this.constructor = d; }
|
|
41
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
42
|
-
};
|
|
43
|
-
})();
|
|
44
29
|
import { TextureFilter, TextureWrap, TextureRegion } from "./Texture";
|
|
45
30
|
import { Utils } from "./Utils";
|
|
46
|
-
|
|
47
|
-
|
|
31
|
+
export class TextureAtlas {
|
|
32
|
+
constructor(atlasText) {
|
|
48
33
|
this.pages = new Array();
|
|
49
34
|
this.regions = new Array();
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
pageFields["size"] =
|
|
35
|
+
let reader = new TextureAtlasReader(atlasText);
|
|
36
|
+
let entry = new Array(4);
|
|
37
|
+
let page = null;
|
|
38
|
+
let region = null;
|
|
39
|
+
let pageFields = {};
|
|
40
|
+
pageFields["size"] = () => {
|
|
56
41
|
page.width = parseInt(entry[1]);
|
|
57
42
|
page.height = parseInt(entry[2]);
|
|
58
43
|
};
|
|
59
|
-
pageFields["format"] =
|
|
44
|
+
pageFields["format"] = () => {
|
|
60
45
|
// page.format = Format[tuple[0]]; we don't need format in WebGL
|
|
61
46
|
};
|
|
62
|
-
pageFields["filter"] =
|
|
47
|
+
pageFields["filter"] = () => {
|
|
63
48
|
page.minFilter = Utils.enumValue(TextureFilter, entry[1]);
|
|
64
49
|
page.magFilter = Utils.enumValue(TextureFilter, entry[2]);
|
|
65
50
|
};
|
|
66
|
-
pageFields["repeat"] =
|
|
51
|
+
pageFields["repeat"] = () => {
|
|
67
52
|
if (entry[1].indexOf('x') != -1)
|
|
68
53
|
page.uWrap = TextureWrap.Repeat;
|
|
69
54
|
if (entry[1].indexOf('y') != -1)
|
|
70
55
|
page.vWrap = TextureWrap.Repeat;
|
|
71
56
|
};
|
|
72
|
-
pageFields["pma"] =
|
|
57
|
+
pageFields["pma"] = () => {
|
|
73
58
|
page.pma = entry[1] == "true";
|
|
74
59
|
};
|
|
75
60
|
var regionFields = {};
|
|
76
|
-
regionFields["xy"] =
|
|
61
|
+
regionFields["xy"] = () => {
|
|
77
62
|
region.x = parseInt(entry[1]);
|
|
78
63
|
region.y = parseInt(entry[2]);
|
|
79
64
|
};
|
|
80
|
-
regionFields["size"] =
|
|
65
|
+
regionFields["size"] = () => {
|
|
81
66
|
region.width = parseInt(entry[1]);
|
|
82
67
|
region.height = parseInt(entry[2]);
|
|
83
68
|
};
|
|
84
|
-
regionFields["bounds"] =
|
|
69
|
+
regionFields["bounds"] = () => {
|
|
85
70
|
region.x = parseInt(entry[1]);
|
|
86
71
|
region.y = parseInt(entry[2]);
|
|
87
72
|
region.width = parseInt(entry[3]);
|
|
88
73
|
region.height = parseInt(entry[4]);
|
|
89
74
|
};
|
|
90
|
-
regionFields["offset"] =
|
|
75
|
+
regionFields["offset"] = () => {
|
|
91
76
|
region.offsetX = parseInt(entry[1]);
|
|
92
77
|
region.offsetY = parseInt(entry[2]);
|
|
93
78
|
};
|
|
94
|
-
regionFields["orig"] =
|
|
79
|
+
regionFields["orig"] = () => {
|
|
95
80
|
region.originalWidth = parseInt(entry[1]);
|
|
96
81
|
region.originalHeight = parseInt(entry[2]);
|
|
97
82
|
};
|
|
98
|
-
regionFields["offsets"] =
|
|
83
|
+
regionFields["offsets"] = () => {
|
|
99
84
|
region.offsetX = parseInt(entry[1]);
|
|
100
85
|
region.offsetY = parseInt(entry[2]);
|
|
101
86
|
region.originalWidth = parseInt(entry[3]);
|
|
102
87
|
region.originalHeight = parseInt(entry[4]);
|
|
103
88
|
};
|
|
104
|
-
regionFields["rotate"] =
|
|
105
|
-
|
|
89
|
+
regionFields["rotate"] = () => {
|
|
90
|
+
let value = entry[1];
|
|
106
91
|
if (value == "true")
|
|
107
92
|
region.degrees = 90;
|
|
108
93
|
else if (value != "false")
|
|
109
94
|
region.degrees = parseInt(value);
|
|
110
95
|
};
|
|
111
|
-
regionFields["index"] =
|
|
96
|
+
regionFields["index"] = () => {
|
|
112
97
|
region.index = parseInt(entry[1]);
|
|
113
98
|
};
|
|
114
|
-
|
|
99
|
+
let line = reader.readLine();
|
|
115
100
|
// Ignore empty lines before first entry.
|
|
116
101
|
while (line && line.trim().length == 0)
|
|
117
102
|
line = reader.readLine();
|
|
@@ -124,8 +109,8 @@ var TextureAtlas = /** @class */ (function () {
|
|
|
124
109
|
line = reader.readLine();
|
|
125
110
|
}
|
|
126
111
|
// Page and region entries.
|
|
127
|
-
|
|
128
|
-
|
|
112
|
+
let names = null;
|
|
113
|
+
let values = null;
|
|
129
114
|
while (true) {
|
|
130
115
|
if (line === null)
|
|
131
116
|
break;
|
|
@@ -139,7 +124,7 @@ var TextureAtlas = /** @class */ (function () {
|
|
|
139
124
|
while (true) {
|
|
140
125
|
if (reader.readEntry(entry, line = reader.readLine()) == 0)
|
|
141
126
|
break;
|
|
142
|
-
|
|
127
|
+
let field = pageFields[entry[0]];
|
|
143
128
|
if (field)
|
|
144
129
|
field();
|
|
145
130
|
}
|
|
@@ -150,10 +135,10 @@ var TextureAtlas = /** @class */ (function () {
|
|
|
150
135
|
region.page = page;
|
|
151
136
|
region.name = line;
|
|
152
137
|
while (true) {
|
|
153
|
-
|
|
138
|
+
let count = reader.readEntry(entry, line = reader.readLine());
|
|
154
139
|
if (count == 0)
|
|
155
140
|
break;
|
|
156
|
-
|
|
141
|
+
let field = regionFields[entry[0]];
|
|
157
142
|
if (field)
|
|
158
143
|
field();
|
|
159
144
|
else {
|
|
@@ -162,8 +147,8 @@ var TextureAtlas = /** @class */ (function () {
|
|
|
162
147
|
values = [];
|
|
163
148
|
}
|
|
164
149
|
names.push(entry[0]);
|
|
165
|
-
|
|
166
|
-
for (
|
|
150
|
+
let entryValues = [];
|
|
151
|
+
for (let i = 0; i < count; i++)
|
|
167
152
|
entryValues.push(parseInt(entry[i + 1]));
|
|
168
153
|
values.push(entryValues);
|
|
169
154
|
}
|
|
@@ -192,51 +177,46 @@ var TextureAtlas = /** @class */ (function () {
|
|
|
192
177
|
}
|
|
193
178
|
}
|
|
194
179
|
}
|
|
195
|
-
|
|
196
|
-
for (
|
|
180
|
+
findRegion(name) {
|
|
181
|
+
for (let i = 0; i < this.regions.length; i++) {
|
|
197
182
|
if (this.regions[i].name == name) {
|
|
198
183
|
return this.regions[i];
|
|
199
184
|
}
|
|
200
185
|
}
|
|
201
186
|
return null;
|
|
202
|
-
}
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
for (var _i = 0, _a = this.pages; _i < _a.length; _i++) {
|
|
206
|
-
var page = _a[_i];
|
|
187
|
+
}
|
|
188
|
+
setTextures(assetManager, pathPrefix = "") {
|
|
189
|
+
for (let page of this.pages)
|
|
207
190
|
page.setTexture(assetManager.get(pathPrefix + page.name));
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
for (var i = 0; i < this.pages.length; i++) {
|
|
191
|
+
}
|
|
192
|
+
dispose() {
|
|
193
|
+
for (let i = 0; i < this.pages.length; i++) {
|
|
212
194
|
this.pages[i].texture.dispose();
|
|
213
195
|
}
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
var TextureAtlasReader = /** @class */ (function () {
|
|
219
|
-
function TextureAtlasReader(text) {
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
class TextureAtlasReader {
|
|
199
|
+
constructor(text) {
|
|
220
200
|
this.index = 0;
|
|
221
201
|
this.lines = text.split(/\r\n|\r|\n/);
|
|
222
202
|
}
|
|
223
|
-
|
|
203
|
+
readLine() {
|
|
224
204
|
if (this.index >= this.lines.length)
|
|
225
205
|
return null;
|
|
226
206
|
return this.lines[this.index++];
|
|
227
|
-
}
|
|
228
|
-
|
|
207
|
+
}
|
|
208
|
+
readEntry(entry, line) {
|
|
229
209
|
if (!line)
|
|
230
210
|
return 0;
|
|
231
211
|
line = line.trim();
|
|
232
212
|
if (line.length == 0)
|
|
233
213
|
return 0;
|
|
234
|
-
|
|
214
|
+
let colon = line.indexOf(':');
|
|
235
215
|
if (colon == -1)
|
|
236
216
|
return 0;
|
|
237
217
|
entry[0] = line.substr(0, colon).trim();
|
|
238
|
-
for (
|
|
239
|
-
|
|
218
|
+
for (let i = 1, lastMatch = colon + 1;; i++) {
|
|
219
|
+
let comma = line.indexOf(',', lastMatch);
|
|
240
220
|
if (comma == -1) {
|
|
241
221
|
entry[i] = line.substr(lastMatch).trim();
|
|
242
222
|
return i;
|
|
@@ -246,30 +226,21 @@ var TextureAtlasReader = /** @class */ (function () {
|
|
|
246
226
|
if (i == 4)
|
|
247
227
|
return 4;
|
|
248
228
|
}
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
function TextureAtlasPage() {
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
export class TextureAtlasPage {
|
|
232
|
+
constructor() {
|
|
254
233
|
this.minFilter = TextureFilter.Nearest;
|
|
255
234
|
this.magFilter = TextureFilter.Nearest;
|
|
256
235
|
this.uWrap = TextureWrap.ClampToEdge;
|
|
257
236
|
this.vWrap = TextureWrap.ClampToEdge;
|
|
258
237
|
}
|
|
259
|
-
|
|
238
|
+
setTexture(texture) {
|
|
260
239
|
this.texture = texture;
|
|
261
240
|
texture.setFilters(this.minFilter, this.magFilter);
|
|
262
241
|
texture.setWraps(this.uWrap, this.vWrap);
|
|
263
|
-
};
|
|
264
|
-
return TextureAtlasPage;
|
|
265
|
-
}());
|
|
266
|
-
export { TextureAtlasPage };
|
|
267
|
-
var TextureAtlasRegion = /** @class */ (function (_super) {
|
|
268
|
-
__extends(TextureAtlasRegion, _super);
|
|
269
|
-
function TextureAtlasRegion() {
|
|
270
|
-
return _super !== null && _super.apply(this, arguments) || this;
|
|
271
242
|
}
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
//# sourceMappingURL=TextureAtlas.js.map
|
|
243
|
+
}
|
|
244
|
+
export class TextureAtlasRegion extends TextureRegion {
|
|
245
|
+
}
|
|
246
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TextureAtlas.js","sourceRoot":"","sources":["../src/TextureAtlas.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,8 +31,8 @@ import { Vector2, MathUtils } from "./Utils";
|
|
|
31
31
|
* bones to match that of the target bone.
|
|
32
32
|
*
|
|
33
33
|
* See [Transform constraints](http://esotericsoftware.com/spine-transform-constraints) in the Spine User Guide. */
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
export class TransformConstraint {
|
|
35
|
+
constructor(data, skeleton) {
|
|
36
36
|
this.mixRotate = 0;
|
|
37
37
|
this.mixX = 0;
|
|
38
38
|
this.mixY = 0;
|
|
@@ -53,14 +53,14 @@ var TransformConstraint = /** @class */ (function () {
|
|
|
53
53
|
this.mixScaleY = data.mixScaleY;
|
|
54
54
|
this.mixShearY = data.mixShearY;
|
|
55
55
|
this.bones = new Array();
|
|
56
|
-
for (
|
|
56
|
+
for (let i = 0; i < data.bones.length; i++)
|
|
57
57
|
this.bones.push(skeleton.findBone(data.bones[i].name));
|
|
58
58
|
this.target = skeleton.findBone(data.target.name);
|
|
59
59
|
}
|
|
60
|
-
|
|
60
|
+
isActive() {
|
|
61
61
|
return this.active;
|
|
62
|
-
}
|
|
63
|
-
|
|
62
|
+
}
|
|
63
|
+
update() {
|
|
64
64
|
if (this.mixRotate == 0 && this.mixX == 0 && this.mixY == 0 && this.mixScaleX == 0 && this.mixScaleX == 0 && this.mixShearY == 0)
|
|
65
65
|
return;
|
|
66
66
|
if (this.data.local) {
|
|
@@ -75,168 +75,166 @@ var TransformConstraint = /** @class */ (function () {
|
|
|
75
75
|
else
|
|
76
76
|
this.applyAbsoluteWorld();
|
|
77
77
|
}
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
for (
|
|
89
|
-
|
|
78
|
+
}
|
|
79
|
+
applyAbsoluteWorld() {
|
|
80
|
+
let mixRotate = this.mixRotate, mixX = this.mixX, mixY = this.mixY, mixScaleX = this.mixScaleX, mixScaleY = this.mixScaleY, mixShearY = this.mixShearY;
|
|
81
|
+
let translate = mixX != 0 || mixY != 0;
|
|
82
|
+
let target = this.target;
|
|
83
|
+
let ta = target.a, tb = target.b, tc = target.c, td = target.d;
|
|
84
|
+
let degRadReflect = ta * td - tb * tc > 0 ? MathUtils.degRad : -MathUtils.degRad;
|
|
85
|
+
let offsetRotation = this.data.offsetRotation * degRadReflect;
|
|
86
|
+
let offsetShearY = this.data.offsetShearY * degRadReflect;
|
|
87
|
+
let bones = this.bones;
|
|
88
|
+
for (let i = 0, n = bones.length; i < n; i++) {
|
|
89
|
+
let bone = bones[i];
|
|
90
90
|
if (mixRotate != 0) {
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
let a = bone.a, b = bone.b, c = bone.c, d = bone.d;
|
|
92
|
+
let r = Math.atan2(tc, ta) - Math.atan2(c, a) + offsetRotation;
|
|
93
93
|
if (r > MathUtils.PI)
|
|
94
94
|
r -= MathUtils.PI2;
|
|
95
95
|
else if (r < -MathUtils.PI) //
|
|
96
96
|
r += MathUtils.PI2;
|
|
97
97
|
r *= mixRotate;
|
|
98
|
-
|
|
98
|
+
let cos = Math.cos(r), sin = Math.sin(r);
|
|
99
99
|
bone.a = cos * a - sin * c;
|
|
100
100
|
bone.b = cos * b - sin * d;
|
|
101
101
|
bone.c = sin * a + cos * c;
|
|
102
102
|
bone.d = sin * b + cos * d;
|
|
103
103
|
}
|
|
104
104
|
if (translate) {
|
|
105
|
-
|
|
105
|
+
let temp = this.temp;
|
|
106
106
|
target.localToWorld(temp.set(this.data.offsetX, this.data.offsetY));
|
|
107
107
|
bone.worldX += (temp.x - bone.worldX) * mixX;
|
|
108
108
|
bone.worldY += (temp.y - bone.worldY) * mixY;
|
|
109
109
|
}
|
|
110
110
|
if (mixScaleX != 0) {
|
|
111
|
-
|
|
111
|
+
let s = Math.sqrt(bone.a * bone.a + bone.c * bone.c);
|
|
112
112
|
if (s != 0)
|
|
113
113
|
s = (s + (Math.sqrt(ta * ta + tc * tc) - s + this.data.offsetScaleX) * mixScaleX) / s;
|
|
114
114
|
bone.a *= s;
|
|
115
115
|
bone.c *= s;
|
|
116
116
|
}
|
|
117
117
|
if (mixScaleY != 0) {
|
|
118
|
-
|
|
118
|
+
let s = Math.sqrt(bone.b * bone.b + bone.d * bone.d);
|
|
119
119
|
if (s != 0)
|
|
120
120
|
s = (s + (Math.sqrt(tb * tb + td * td) - s + this.data.offsetScaleY) * mixScaleY) / s;
|
|
121
121
|
bone.b *= s;
|
|
122
122
|
bone.d *= s;
|
|
123
123
|
}
|
|
124
124
|
if (mixShearY > 0) {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
125
|
+
let b = bone.b, d = bone.d;
|
|
126
|
+
let by = Math.atan2(d, b);
|
|
127
|
+
let r = Math.atan2(td, tb) - Math.atan2(tc, ta) - (by - Math.atan2(bone.c, bone.a));
|
|
128
128
|
if (r > MathUtils.PI)
|
|
129
129
|
r -= MathUtils.PI2;
|
|
130
130
|
else if (r < -MathUtils.PI) //
|
|
131
131
|
r += MathUtils.PI2;
|
|
132
132
|
r = by + (r + offsetShearY) * mixShearY;
|
|
133
|
-
|
|
133
|
+
let s = Math.sqrt(b * b + d * d);
|
|
134
134
|
bone.b = Math.cos(r) * s;
|
|
135
135
|
bone.d = Math.sin(r) * s;
|
|
136
136
|
}
|
|
137
137
|
bone.updateAppliedTransform();
|
|
138
138
|
}
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
for (
|
|
149
|
-
|
|
139
|
+
}
|
|
140
|
+
applyRelativeWorld() {
|
|
141
|
+
let mixRotate = this.mixRotate, mixX = this.mixX, mixY = this.mixY, mixScaleX = this.mixScaleX, mixScaleY = this.mixScaleY, mixShearY = this.mixShearY;
|
|
142
|
+
let translate = mixX != 0 || mixY != 0;
|
|
143
|
+
let target = this.target;
|
|
144
|
+
let ta = target.a, tb = target.b, tc = target.c, td = target.d;
|
|
145
|
+
let degRadReflect = ta * td - tb * tc > 0 ? MathUtils.degRad : -MathUtils.degRad;
|
|
146
|
+
let offsetRotation = this.data.offsetRotation * degRadReflect, offsetShearY = this.data.offsetShearY * degRadReflect;
|
|
147
|
+
let bones = this.bones;
|
|
148
|
+
for (let i = 0, n = bones.length; i < n; i++) {
|
|
149
|
+
let bone = bones[i];
|
|
150
150
|
if (mixRotate != 0) {
|
|
151
|
-
|
|
152
|
-
|
|
151
|
+
let a = bone.a, b = bone.b, c = bone.c, d = bone.d;
|
|
152
|
+
let r = Math.atan2(tc, ta) + offsetRotation;
|
|
153
153
|
if (r > MathUtils.PI)
|
|
154
154
|
r -= MathUtils.PI2;
|
|
155
155
|
else if (r < -MathUtils.PI) //
|
|
156
156
|
r += MathUtils.PI2;
|
|
157
157
|
r *= mixRotate;
|
|
158
|
-
|
|
158
|
+
let cos = Math.cos(r), sin = Math.sin(r);
|
|
159
159
|
bone.a = cos * a - sin * c;
|
|
160
160
|
bone.b = cos * b - sin * d;
|
|
161
161
|
bone.c = sin * a + cos * c;
|
|
162
162
|
bone.d = sin * b + cos * d;
|
|
163
163
|
}
|
|
164
164
|
if (translate) {
|
|
165
|
-
|
|
165
|
+
let temp = this.temp;
|
|
166
166
|
target.localToWorld(temp.set(this.data.offsetX, this.data.offsetY));
|
|
167
167
|
bone.worldX += temp.x * mixX;
|
|
168
168
|
bone.worldY += temp.y * mixY;
|
|
169
169
|
}
|
|
170
170
|
if (mixScaleX != 0) {
|
|
171
|
-
|
|
171
|
+
let s = (Math.sqrt(ta * ta + tc * tc) - 1 + this.data.offsetScaleX) * mixScaleX + 1;
|
|
172
172
|
bone.a *= s;
|
|
173
173
|
bone.c *= s;
|
|
174
174
|
}
|
|
175
175
|
if (mixScaleY != 0) {
|
|
176
|
-
|
|
176
|
+
let s = (Math.sqrt(tb * tb + td * td) - 1 + this.data.offsetScaleY) * mixScaleY + 1;
|
|
177
177
|
bone.b *= s;
|
|
178
178
|
bone.d *= s;
|
|
179
179
|
}
|
|
180
180
|
if (mixShearY > 0) {
|
|
181
|
-
|
|
181
|
+
let r = Math.atan2(td, tb) - Math.atan2(tc, ta);
|
|
182
182
|
if (r > MathUtils.PI)
|
|
183
183
|
r -= MathUtils.PI2;
|
|
184
184
|
else if (r < -MathUtils.PI) //
|
|
185
185
|
r += MathUtils.PI2;
|
|
186
|
-
|
|
186
|
+
let b = bone.b, d = bone.d;
|
|
187
187
|
r = Math.atan2(d, b) + (r - MathUtils.PI / 2 + offsetShearY) * mixShearY;
|
|
188
|
-
|
|
188
|
+
let s = Math.sqrt(b * b + d * d);
|
|
189
189
|
bone.b = Math.cos(r) * s;
|
|
190
190
|
bone.d = Math.sin(r) * s;
|
|
191
191
|
}
|
|
192
192
|
bone.updateAppliedTransform();
|
|
193
193
|
}
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
for (
|
|
200
|
-
|
|
201
|
-
|
|
194
|
+
}
|
|
195
|
+
applyAbsoluteLocal() {
|
|
196
|
+
let mixRotate = this.mixRotate, mixX = this.mixX, mixY = this.mixY, mixScaleX = this.mixScaleX, mixScaleY = this.mixScaleY, mixShearY = this.mixShearY;
|
|
197
|
+
let target = this.target;
|
|
198
|
+
let bones = this.bones;
|
|
199
|
+
for (let i = 0, n = bones.length; i < n; i++) {
|
|
200
|
+
let bone = bones[i];
|
|
201
|
+
let rotation = bone.arotation;
|
|
202
202
|
if (mixRotate != 0) {
|
|
203
|
-
|
|
203
|
+
let r = target.arotation - rotation + this.data.offsetRotation;
|
|
204
204
|
r -= (16384 - ((16384.499999999996 - r / 360) | 0)) * 360;
|
|
205
205
|
rotation += r * mixRotate;
|
|
206
206
|
}
|
|
207
|
-
|
|
207
|
+
let x = bone.ax, y = bone.ay;
|
|
208
208
|
x += (target.ax - x + this.data.offsetX) * mixX;
|
|
209
209
|
y += (target.ay - y + this.data.offsetY) * mixY;
|
|
210
|
-
|
|
210
|
+
let scaleX = bone.ascaleX, scaleY = bone.ascaleY;
|
|
211
211
|
if (mixScaleX != 0 && scaleX != 0)
|
|
212
212
|
scaleX = (scaleX + (target.ascaleX - scaleX + this.data.offsetScaleX) * mixScaleX) / scaleX;
|
|
213
213
|
if (mixScaleY != 0 && scaleY != 0)
|
|
214
214
|
scaleY = (scaleY + (target.ascaleY - scaleY + this.data.offsetScaleY) * mixScaleY) / scaleY;
|
|
215
|
-
|
|
215
|
+
let shearY = bone.ashearY;
|
|
216
216
|
if (mixShearY != 0) {
|
|
217
|
-
|
|
217
|
+
let r = target.ashearY - shearY + this.data.offsetShearY;
|
|
218
218
|
r -= (16384 - ((16384.499999999996 - r / 360) | 0)) * 360;
|
|
219
219
|
shearY += r * mixShearY;
|
|
220
220
|
}
|
|
221
221
|
bone.updateWorldTransformWith(x, y, rotation, scaleX, scaleY, bone.ashearX, shearY);
|
|
222
222
|
}
|
|
223
|
-
}
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
for (
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
223
|
+
}
|
|
224
|
+
applyRelativeLocal() {
|
|
225
|
+
let mixRotate = this.mixRotate, mixX = this.mixX, mixY = this.mixY, mixScaleX = this.mixScaleX, mixScaleY = this.mixScaleY, mixShearY = this.mixShearY;
|
|
226
|
+
let target = this.target;
|
|
227
|
+
let bones = this.bones;
|
|
228
|
+
for (let i = 0, n = bones.length; i < n; i++) {
|
|
229
|
+
let bone = bones[i];
|
|
230
|
+
let rotation = bone.arotation + (target.arotation + this.data.offsetRotation) * mixRotate;
|
|
231
|
+
let x = bone.ax + (target.ax + this.data.offsetX) * mixX;
|
|
232
|
+
let y = bone.ay + (target.ay + this.data.offsetY) * mixY;
|
|
233
|
+
let scaleX = bone.ascaleX * (((target.ascaleX - 1 + this.data.offsetScaleX) * mixScaleX) + 1);
|
|
234
|
+
let scaleY = bone.ascaleY * (((target.ascaleY - 1 + this.data.offsetScaleY) * mixScaleY) + 1);
|
|
235
|
+
let shearY = bone.ashearY + (target.ashearY + this.data.offsetShearY) * mixShearY;
|
|
236
236
|
bone.updateWorldTransformWith(x, y, rotation, scaleX, scaleY, bone.ashearX, shearY);
|
|
237
237
|
}
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
}());
|
|
241
|
-
export { TransformConstraint };
|
|
242
|
-
//# sourceMappingURL=TransformConstraint.js.map
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TransformConstraint.js","sourceRoot":"","sources":["../src/TransformConstraint.ts"],"names":[],"mappings":"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"}
|