@rafaelaugusto/jolt 0.1.0-rc.1 → 0.1.0-rc.2

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.
Files changed (36) hide show
  1. package/README.md +39 -11
  2. package/dist/interactive-navigation/index.d.ts.map +1 -1
  3. package/dist/interactive-navigation/index.js +39 -3
  4. package/dist/interactive-navigation/index.js.map +1 -1
  5. package/dist/mixer.d.ts.map +1 -1
  6. package/dist/mixer.js +9 -1
  7. package/dist/mixer.js.map +1 -1
  8. package/dist/physics/index.d.ts +23 -0
  9. package/dist/physics/index.d.ts.map +1 -1
  10. package/dist/physics/index.js +10 -0
  11. package/dist/physics/index.js.map +1 -1
  12. package/dist/physics/native.d.ts +1 -0
  13. package/dist/physics/native.d.ts.map +1 -1
  14. package/dist/physics/native.js +6 -0
  15. package/dist/physics/native.js.map +1 -1
  16. package/dist/press.d.ts.map +1 -1
  17. package/dist/press.js +11 -2
  18. package/dist/press.js.map +1 -1
  19. package/dist/scroll-header/index.d.ts.map +1 -1
  20. package/dist/scroll-header/index.js +36 -10
  21. package/dist/scroll-header/index.js.map +1 -1
  22. package/package.json +1 -1
  23. package/platforms/android/java/org/rafaelaugusto/jolt/CircleMath.java +18 -11
  24. package/platforms/android/java/org/rafaelaugusto/jolt/CircleWorld.java +22 -11
  25. package/platforms/ios/src/JoltCircleMath.h +19 -11
  26. package/platforms/ios/src/JoltCircleWorld.h +1 -0
  27. package/platforms/ios/src/JoltCircleWorld.m +32 -17
  28. package/platforms/ios/src/JoltScrollHeader.m +8 -0
  29. package/src/android-plugin.d.ts +1 -0
  30. package/src/interactive-navigation/index.ts +32 -3
  31. package/src/ios-plugin.d.ts +1 -0
  32. package/src/mixer.ts +7 -1
  33. package/src/physics/index.ts +33 -0
  34. package/src/physics/native.ts +11 -0
  35. package/src/press.ts +10 -2
  36. package/src/scroll-header/index.ts +34 -8
package/dist/physics/native.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"native.js","sourceRoot":"","sources":["../../src/physics/native.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"native.js","sourceRoot":"","sources":["../../src/physics/native.ts"],"names":[],"mappings":"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"}
package/dist/press.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"press.d.ts","sourceRoot":"","sources":["../src/press.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAKnE;;;;;;;;GAQG;AACH,wBAAgB,KAAK,CACnB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,SAA2B,EACpC,OAAO,CAAC,EAAE,cAAc,GAAG,UAAU,GACpC,MAAM,IAAI,CAwCZ"}
1
+ {"version":3,"file":"press.d.ts","sourceRoot":"","sources":["../src/press.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAKnE;;;;;;;;GAQG;AACH,wBAAgB,KAAK,CACnB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,SAA2B,EACpC,OAAO,CAAC,EAAE,cAAc,GAAG,UAAU,GACpC,MAAM,IAAI,CA+CZ"}
package/dist/press.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import { Color } from '@nativescript/core';
2
2
  import { isColorProperty } from './color.js';
3
- import { animate, startingValues, toView } from './animate.js';
3
+ import { animate, startingValues, stop, toView } from './animate.js';
4
+ import { identity } from './mixer.js';
4
5
  import { readValue } from './properties.js';
5
6
  const pressIn = { type: 'spring', duration: 200, bounce: 0 };
6
7
  const release = { type: 'spring', duration: 450, bounce: 0.35 };
@@ -16,6 +17,7 @@ const release = { type: 'spring', duration: 450, bounce: 0.35 };
16
17
  export function press(target, pressed = { scale: 0.96 }, options) {
17
18
  const view = toView(target);
18
19
  const properties = [...startingValues(pressed, options).keys()];
20
+ const layer = typeof options === 'object' ? options.layer : undefined;
19
21
  let rest;
20
22
  let active;
21
23
  const onTouch = (event) => {
@@ -23,7 +25,11 @@ export function press(target, pressed = { scale: 0.96 }, options) {
23
25
  if (action === 'down' && !rest && view.isEnabled !== false) {
24
26
  rest = Object.fromEntries(properties.map((p) => [
25
27
  p,
26
- isColorProperty(p) ? new Color(readValue(view, p)) : readValue(view, p),
28
+ layer !== undefined
29
+ ? identity(p)
30
+ : isColorProperty(p)
31
+ ? new Color(readValue(view, p))
32
+ : readValue(view, p),
27
33
  ]));
28
34
  active = animate(view, pressed, options ?? pressIn);
29
35
  }
@@ -36,6 +42,9 @@ export function press(target, pressed = { scale: 0.96 }, options) {
36
42
  };
37
43
  const cancel = () => {
38
44
  active?.stop();
45
+ // A completed press still holds its layer contribution until it is removed.
46
+ if (layer !== undefined)
47
+ stop(view, properties, { layer });
39
48
  active = undefined;
40
49
  rest = undefined;
41
50
  };
package/dist/press.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"press.js","sourceRoot":"","sources":["../src/press.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAA8C,MAAM,oBAAoB,CAAA;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAI3C,MAAM,OAAO,GAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAAA;AACxE,MAAM,OAAO,GAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;AAE3E;;;;;;;;GAQG;AACH,MAAM,UAAU,KAAK,CACnB,MAAc,EACd,OAAO,GAAc,EAAE,KAAK,EAAE,IAAI,EAAE,EACpC,OAAqC;IAErC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IAC3B,MAAM,UAAU,GAAG,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAC/D,IAAI,IAA2B,CAAA;IAC/B,IAAI,MAAqC,CAAA;IAEzC,MAAM,OAAO,GAAG,CAAC,KAAgB,EAAE,EAAE;QACnC,MAAM,EAAE,MAAM,EAAE,GAAG,KAA8B,CAAA;QACjD,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;YAC3D,IAAI,GAAG,MAAM,CAAC,WAAW,CACvB,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBACpB,CAAC;gBACD,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;aACxE,CAAC,CACH,CAAA;YACD,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,CAAA;QACrD,CAAC;aAAM,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;YAC5D,MAAM,GAAG,OAAO,CACd,IAAI,EACJ,IAAI,EACJ,OAAO,OAAO,KAAK,QAAQ;gBACzB,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;gBACjC,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,CACzB,CAAA;YACD,IAAI,GAAG,SAAS,CAAA;QAClB,CAAC;IACH,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,MAAM,EAAE,IAAI,EAAE,CAAA;QACd,MAAM,GAAG,SAAS,CAAA;QAClB,IAAI,GAAG,SAAS,CAAA;IAClB,CAAC,CAAA;IACD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzB,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IAC3B,OAAO,GAAG,EAAE;QACV,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC1B,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QAC5B,MAAM,EAAE,CAAA;IACV,CAAC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"press.js","sourceRoot":"","sources":["../src/press.ts"],"names":[],"mappings":"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"}
package/dist/scroll-header/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/scroll-header/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,KAAK,EACL,UAAU,EACV,IAAI,EAGL,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,aAAa,CAAA;AACpB,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,eAAe,CAAA;AACtB,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,CAAA;AAE1D,MAAM,WAAW,mBAAmB;IAClC,wFAAwF;IACxF,MAAM,EAAE,UAAU,CAAA;IAClB,OAAO,EAAE,IAAI,CAAA;IACb,KAAK,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,IAAI,CAAA;IACb,YAAY,EAAE,IAAI,CAAA;IAClB,OAAO,EAAE,IAAI,CAAA;IACb,oFAAoF;IACpF,SAAS,EAAE,MAAM,CAAA;IACjB,uFAAuF;IACvF,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrC,uEAAuE;IACvE,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,yDAAyD;IACzD,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,WAAW,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,4FAA4F;IAC5F,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,SAAS,MAAM,EAAE,CAAA;IAC9B,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAA;CAChD;AACD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAA;IACpC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,GAAG,SAAS,CAAA;IACnD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,cAAc,CAAC,MAAM,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjE,yFAAyF;IACzF,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IACrD,WAAW,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IACrC,KAAK,IAAI,IAAI,CAAA;IACb,IAAI,IAAI,IAAI,CAAA;IACZ,OAAO,IAAI,IAAI,CAAA;CAChB;AAmBD,2FAA2F;AAC3F,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAiavF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/scroll-header/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,KAAK,EACL,UAAU,EACV,IAAI,EAGL,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,aAAa,CAAA;AACpB,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,eAAe,CAAA;AACtB,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,CAAA;AAE1D,MAAM,WAAW,mBAAmB;IAClC,wFAAwF;IACxF,MAAM,EAAE,UAAU,CAAA;IAClB,OAAO,EAAE,IAAI,CAAA;IACb,KAAK,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,IAAI,CAAA;IACb,YAAY,EAAE,IAAI,CAAA;IAClB,OAAO,EAAE,IAAI,CAAA;IACb,oFAAoF;IACpF,SAAS,EAAE,MAAM,CAAA;IACjB,uFAAuF;IACvF,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrC,uEAAuE;IACvE,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,yDAAyD;IACzD,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,WAAW,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,4FAA4F;IAC5F,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,SAAS,MAAM,EAAE,CAAA;IAC9B,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAA;CAChD;AACD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAA;IACpC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,GAAG,SAAS,CAAA;IACnD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,cAAc,CAAC,MAAM,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjE,yFAAyF;IACzF,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IACrD,WAAW,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IACrC,KAAK,IAAI,IAAI,CAAA;IACb,IAAI,IAAI,IAAI,CAAA;IACZ,OAAO,IAAI,IAAI,CAAA;CAChB;AAmBD,2FAA2F;AAC3F,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,GAAG,YAAY,CA2bvF"}
package/dist/scroll-header/index.js CHANGED
@@ -75,11 +75,11 @@ export function scrollHeader(list, options) {
75
75
  sectionY: section.translateY,
76
76
  };
77
77
  let geometry, native, value;
78
- let ended = false, held = false, background = false, queued = false, revision = 0;
79
- let measuring, operation = false;
78
+ let ended = false, ready = false, held = false, background = false, queued = false, invalidated = false, revision = 0;
79
+ let measuring, restoringOffset, operation = false;
80
80
  let detachBindings = [], pending = new Set(), last = initialState();
81
81
  const notify = () => {
82
- if (ended)
82
+ if (ended || !ready)
83
83
  return;
84
84
  last = native?.snapshot() ?? last;
85
85
  try {
@@ -188,10 +188,10 @@ export function scrollHeader(list, options) {
188
188
  const next = headerGeometry(expanded, minimum, section.getActualSize().height, isIOS
189
189
  ? options.rowHeight
190
190
  : Math.round(options.rowHeight * list.android.getResources().getDisplayMetrics().density) / list.android.getResources().getDisplayMetrics().density, options.parallax ?? Math.min(64, (expanded - minimum) * 0.25), divider, options.titleFade, options.toolbarFade);
191
- if (geometry && JSON.stringify(next) === JSON.stringify(geometry) && native)
191
+ if (ready && geometry && JSON.stringify(next) === JSON.stringify(geometry) && native)
192
192
  return;
193
193
  const before = geometry, offset = native?.snapshot().offset ?? (last.updates ? last.offset : undefined);
194
- geometry = next;
194
+ ready = false;
195
195
  native?.enabled(false);
196
196
  try {
197
197
  native?.configure(next, reducedMotion());
@@ -199,28 +199,43 @@ export function scrollHeader(list, options) {
199
199
  await layout(list);
200
200
  if (ended || generation !== revision)
201
201
  return;
202
+ geometry = next;
202
203
  value ??= springValue(motionValue(0), { duration: 0 });
203
204
  maps();
204
205
  if (!native)
205
206
  native = createScrollHeaderDriver(list, value, { title, toolbarTitle, toolbar, diagnostic: options.diagnostic }, next, reducedMotion(), () => {
206
207
  void Promise.resolve().then(notify);
207
208
  });
208
- if (offset !== undefined)
209
- native.scroll(before ? resizedOffset(offset, before, next) : offset, false);
209
+ if (offset !== undefined) {
210
+ restoringOffset = before ? resizedOffset(offset, before, next) : offset;
211
+ native.scroll(restoringOffset, false);
212
+ await layout(list);
213
+ if (ended || generation !== revision)
214
+ return;
215
+ }
210
216
  native.enabled(!held && !background);
217
+ ready = true;
211
218
  notify();
212
219
  }
213
220
  finally {
221
+ restoringOffset = undefined;
214
222
  native?.enabled(!held && !background);
215
223
  }
216
224
  };
217
225
  const queueMeasure = () => {
218
- if (ended || queued || measuring || operation)
226
+ if (ended)
227
+ return;
228
+ if (measuring || operation) {
229
+ invalidated = true;
230
+ return;
231
+ }
232
+ if (queued)
219
233
  return;
220
234
  queued = true;
221
235
  void Promise.resolve()
222
236
  .then(() => {
223
237
  queued = false;
238
+ invalidated = false;
224
239
  return control.remeasure();
225
240
  })
226
241
  .catch((error) => {
@@ -230,9 +245,12 @@ export function scrollHeader(list, options) {
230
245
  };
231
246
  const detach = () => {
232
247
  revision++;
248
+ ready = false;
233
249
  for (const cancel of [...pending])
234
250
  cancel();
235
251
  last = native?.snapshot() ?? last;
252
+ if (restoringOffset !== undefined)
253
+ last = { ...last, offset: restoringOffset };
236
254
  native?.dispose();
237
255
  native = undefined;
238
256
  detachBindings.splice(0).forEach((off) => off());
@@ -255,7 +273,7 @@ export function scrollHeader(list, options) {
255
273
  });
256
274
  const control = {
257
275
  get ready() {
258
- return !!native && !ended;
276
+ return ready && !ended;
259
277
  },
260
278
  get disposed() {
261
279
  return ended;
@@ -267,10 +285,18 @@ export function scrollHeader(list, options) {
267
285
  return geometry;
268
286
  },
269
287
  remeasure() {
288
+ invalidated = true;
270
289
  if (measuring)
271
290
  return measuring;
272
- measuring = measure().finally(() => {
291
+ measuring = (async () => {
292
+ do {
293
+ invalidated = false;
294
+ await measure();
295
+ } while (invalidated && !ended && list.isLoaded && !operation);
296
+ })().finally(() => {
273
297
  measuring = undefined;
298
+ if (invalidated)
299
+ queueMeasure();
274
300
  });
275
301
  return measuring;
276
302
  },
package/dist/scroll-header/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scroll-header/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scroll-header/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rafaelaugusto/jolt",
3
- "version": "0.1.0-rc.1",
3
+ "version": "0.1.0-rc.2",
4
4
  "description": "Native animations for NativeScript: presets, springs, keyframes and stagger in one call.",
5
5
  "keywords": [
6
6
  "nativescript",
package/platforms/android/java/org/rafaelaugusto/jolt/CircleMath.java CHANGED
@@ -18,7 +18,7 @@ public final class CircleMath {
18
18
  public double x,y,vx,vy,r,m,tx,ty,ax,ay,releaseX,releaseY,releaseVX,releaseVY;
19
19
  public boolean released;
20
20
  public boolean held,supported;
21
- public final Attachment attachment=new Attachment();
21
+ public final Attachment attachment=new Attachment(),drag=new Attachment();
22
22
  public final Snap snap=new Snap();
23
23
  }
24
24
  public final Body[] bodies;
@@ -35,12 +35,13 @@ public final class CircleMath {
35
35
  for(Body b:bodies){if(2*b.r>Math.min(width,height))return false;area+=Math.PI*b.r*b.r;}
36
36
  return area<=width*height*.4;
37
37
  }
38
+ private static boolean kinematic(Body b){return b.held&&!b.drag.enabled;}
38
39
  private void walls(Body b,boolean impulse){
39
40
  double e=restitution;
40
- if(b.x<=b.r){b.x=b.r;if(b.ax<0)b.supported=true;if(impulse&&!b.held&&b.vx<0){b.vx=Math.abs(b.vx)<40?0:-b.vx*e;contacts++;}}
41
- if(b.x>=width-b.r){b.x=width-b.r;if(b.ax>0)b.supported=true;if(impulse&&!b.held&&b.vx>0){b.vx=Math.abs(b.vx)<40?0:-b.vx*e;contacts++;}}
42
- if(b.y<=b.r){b.y=b.r;if(b.ay<0)b.supported=true;if(impulse&&!b.held&&b.vy<0){b.vy=Math.abs(b.vy)<40?0:-b.vy*e;contacts++;}}
43
- if(b.y>=height-b.r){b.y=height-b.r;if(b.ay>0)b.supported=true;if(impulse&&!b.held&&b.vy>0){b.vy=Math.abs(b.vy)<40?0:-b.vy*e;contacts++;}}
41
+ if(b.x<=b.r){b.x=b.r;if(b.ax<0)b.supported=true;if(impulse&&!kinematic(b)&&b.vx<0){b.vx=Math.abs(b.vx)<40?0:-b.vx*e;contacts++;}}
42
+ if(b.x>=width-b.r){b.x=width-b.r;if(b.ax>0)b.supported=true;if(impulse&&!kinematic(b)&&b.vx>0){b.vx=Math.abs(b.vx)<40?0:-b.vx*e;contacts++;}}
43
+ if(b.y<=b.r){b.y=b.r;if(b.ay<0)b.supported=true;if(impulse&&!kinematic(b)&&b.vy<0){b.vy=Math.abs(b.vy)<40?0:-b.vy*e;contacts++;}}
44
+ if(b.y>=height-b.r){b.y=height-b.r;if(b.ay>0)b.supported=true;if(impulse&&!kinematic(b)&&b.vy>0){b.vy=Math.abs(b.vy)<40?0:-b.vy*e;contacts++;}}
44
45
  }
45
46
  public void contacts(boolean impulse,int iterations){
46
47
  for(int iteration=0;iteration<iterations;iteration++){
@@ -49,7 +50,7 @@ public final class CircleMath {
49
50
  double dx=b.x-a.x,dy=b.y-a.y,d=Math.hypot(dx,dy),radius=a.r+b.r;
50
51
  if(d>radius+.02)continue;
51
52
  double nx=d>1e-9?dx/d:1,ny=d>1e-9?dy/d:0;
52
- double ia=a.held?0:1/a.m,ib=b.held?0:1/b.m,total=ia+ib;
53
+ double ia=kinematic(a)?0:1/a.m,ib=kinematic(b)?0:1/b.m,total=ia+ib;
53
54
  if(total==0)continue;
54
55
  double overlap=Math.max(0,radius-d);
55
56
  a.x-=nx*overlap*ia/total;a.y-=ny*overlap*ia/total;
@@ -91,12 +92,15 @@ public final class CircleMath {
91
92
  double decay=Math.exp(-damping*DT);boolean still=true;
92
93
  for(Body b:bodies){
93
94
  b.supported=false;b.ax=gx;b.ay=gy;
94
- if(b.held){b.vx=(b.tx-b.x)/DT;b.vy=(b.ty-b.y)/DT;still=false;}
95
+ if(b.held)still=false;
96
+ if(kinematic(b)){b.vx=(b.tx-b.x)/DT;b.vy=(b.ty-b.y)/DT;still=false;}
95
97
  else {
96
98
  double damping=0;
97
- if(b.attachment.enabled||b.snap.active){
99
+ if((b.held&&b.drag.enabled)||b.attachment.enabled||b.snap.active){
98
100
  double x,y,length,stiffness;
99
- if(b.snap.active){
101
+ if(b.held&&b.drag.enabled){
102
+ x=b.tx;y=b.ty;length=b.drag.length;stiffness=b.drag.stiffness;damping=b.drag.damping;
103
+ }else if(b.snap.active){
100
104
  x=snapX(b,b.snap.index);y=snapY(b,b.snap.index);length=0;stiffness=b.snap.stiffness;damping=b.snap.damping;b.ax=b.ay=0;
101
105
  }else {
102
106
  x=b.attachment.u*width;y=b.attachment.v*height;length=b.attachment.length;stiffness=b.attachment.stiffness;damping=b.attachment.damping;
@@ -132,10 +136,13 @@ public final class CircleMath {
132
136
  }
133
137
  public void drag(int index,double x,double y){
134
138
  Body b=bodies[index];if(!b.held){b.snap.previousActive=b.snap.active;b.snap.previousIndex=b.snap.index;b.snap.active=false;}
135
- b.held=true;b.tx=clamp(x,b.r,width-b.r);b.ty=clamp(y,b.r,height-b.r);wake();
139
+ b.held=true;double inset=b.drag.enabled?0:b.r;b.tx=clamp(x,inset,width-inset);b.ty=clamp(y,inset,height-inset);wake();
136
140
  }
137
141
  public void release(int index,double vx,double vy){
138
- Body b=bodies[index];b.held=false;b.vx=vx;b.vy=vy;limit(b);
142
+ Body b=bodies[index];
143
+ // Preserve integrated body momentum rather than substituting pointer velocity.
144
+ if(!b.held||!b.drag.enabled){b.vx=vx;b.vy=vy;}
145
+ b.held=false;limit(b);
139
146
  b.released=true;b.releaseX=b.x;b.releaseY=b.y;b.releaseVX=b.vx;b.releaseVY=b.vy;
140
147
  if(b.snap.count>0){
141
148
  double x=b.x+b.vx*b.snap.projection,y=b.y+b.vy*b.snap.projection,best=Double.POSITIVE_INFINITY;
package/platforms/android/java/org/rafaelaugusto/jolt/CircleWorld.java CHANGED
@@ -24,7 +24,7 @@ public final class CircleWorld implements Choreographer.FrameCallback, View.OnAt
24
24
  private final CircleMath state;
25
25
  private View container;
26
26
  private final View[] views;
27
- private final CircleGuide[] guides;
27
+ private final CircleGuide[] guides,pointerGuides;
28
28
  private final boolean[] clickable;
29
29
  private final double[] initialX,initialY,initialVX,initialVY,originalX,originalY;
30
30
  private final float density;
@@ -43,7 +43,7 @@ public final class CircleWorld implements Choreographer.FrameCallback, View.OnAt
43
43
  try {
44
44
  JSONObject config=new JSONObject(options);JSONArray data=config.getJSONArray("bodies");
45
45
  int count=data.length();if(count<1||count>16)throw new IllegalArgumentException("Physics needs 1–16 circles");
46
- state=new CircleMath(count);views=new View[count];guides=new CircleGuide[count];clickable=new boolean[count];
46
+ state=new CircleMath(count);views=new View[count];guides=new CircleGuide[count];pointerGuides=new CircleGuide[count];clickable=new boolean[count];
47
47
  initialX=new double[count];initialY=new double[count];initialVX=new double[count];initialVY=new double[count];originalX=new double[count];originalY=new double[count];
48
48
  state.width=config.getDouble("width");state.height=config.getDouble("height");
49
49
  state.gx=config.getJSONObject("gravity").getDouble("x");state.gy=config.getJSONObject("gravity").getDouble("y");
@@ -53,6 +53,12 @@ public final class CircleWorld implements Choreographer.FrameCallback, View.OnAt
53
53
  b.x=v.getDouble("x");b.y=v.getDouble("y");b.r=v.getDouble("radius");b.m=v.getDouble("mass");b.vx=v.getDouble("vx");b.vy=v.getDouble("vy");
54
54
  initialX[i]=b.x/state.width;initialY[i]=b.y/state.height;initialVX[i]=b.vx;initialVY[i]=b.vy;
55
55
  configureAttachment(i,v.optJSONObject("attachment"));
56
+ JSONObject drag=v.optJSONObject("drag");
57
+ if(drag!=null){
58
+ b.drag.enabled=true;b.drag.length=drag.getDouble("length");b.drag.stiffness=drag.getDouble("stiffness");b.drag.damping=drag.getDouble("damping");
59
+ JSONObject line=drag.optJSONObject("line");
60
+ if(line!=null){pointerGuides[i]=new CircleGuide(i,line.getInt("color"),line.getDouble("width"),true);container.getOverlay().add(pointerGuides[i]);}
61
+ }
56
62
  JSONObject snap=v.optJSONObject("snap");
57
63
  if(snap!=null){
58
64
  JSONArray points=snap.getJSONArray("points");if(points.length()>CircleMath.SNAP_LIMIT)throw new IllegalArgumentException("Too many snap points");
@@ -81,14 +87,17 @@ public final class CircleWorld implements Choreographer.FrameCallback, View.OnAt
81
87
  }
82
88
  private final class CircleGuide extends Drawable {
83
89
  private final int index;
90
+ private final boolean pointer;
84
91
  private final Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG);
85
- CircleGuide(int index,int color,double width){this.index=index;paint.setColor(0xff000000|color);paint.setStrokeWidth((float)width*density);paint.setStyle(Paint.Style.STROKE);paint.setStrokeCap(Paint.Cap.ROUND);}
92
+ CircleGuide(int index,int color,double width,boolean pointer){this.index=index;this.pointer=pointer;paint.setColor(0xff000000|color);paint.setStrokeWidth((float)width*density);paint.setStyle(Paint.Style.STROKE);paint.setStrokeCap(Paint.Cap.ROUND);}
86
93
  @Override public void draw(Canvas canvas){
87
94
  CircleMath.Body b=state.bodies[index];
88
- double x=b.snap.active?state.snapX(b,b.snap.index):b.attachment.u*state.width;
89
- double y=b.snap.active?state.snapY(b,b.snap.index):b.attachment.v*state.height;
95
+ if(pointer!=(b.held&&b.drag.enabled))return;
96
+ double x=pointer?b.tx:b.snap.active?state.snapX(b,b.snap.index):b.attachment.u*state.width;
97
+ double y=pointer?b.ty:b.snap.active?state.snapY(b,b.snap.index):b.attachment.v*state.height;
90
98
  double dx=b.x-x,dy=b.y-y,d=Math.hypot(dx,dy);
91
- if(d>b.r){canvas.drawLine((float)x*density,(float)y*density,(float)(b.x-dx/d*b.r)*density,(float)(b.y-dy/d*b.r)*density,paint);canvas.drawCircle((float)x*density,(float)y*density,2.5f*density,paint);}
99
+ if(d>b.r){canvas.drawLine((float)x*density,(float)y*density,(float)(b.x-dx/d*b.r)*density,(float)(b.y-dy/d*b.r)*density,paint);}
100
+ if(pointer||d>b.r)canvas.drawCircle((float)x*density,(float)y*density,2.5f*density,paint);
92
101
  }
93
102
  @Override public void setAlpha(int alpha){paint.setAlpha(alpha);invalidateSelf();}
94
103
  @Override public void setColorFilter(ColorFilter filter){paint.setColorFilter(filter);invalidateSelf();}
@@ -99,8 +108,9 @@ public final class CircleWorld implements Choreographer.FrameCallback, View.OnAt
99
108
  else state.attach(index,true,options.getDouble("x"),options.getDouble("y"),options.getDouble("length"),options.getDouble("stiffness"),options.getDouble("damping"));
100
109
  if(guides[index]!=null){container.getOverlay().remove(guides[index]);guides[index]=null;}
101
110
  JSONObject line=options==null?null:options.optJSONObject("line");
102
- if(line!=null){guides[index]=new CircleGuide(index,line.getInt("color"),line.getDouble("width"));container.getOverlay().add(guides[index]);}
111
+ if(line!=null){guides[index]=new CircleGuide(index,line.getInt("color"),line.getDouble("width"),false);container.getOverlay().add(guides[index]);}
103
112
  }
113
+ public boolean supportsPointerSpring(){return true;}
104
114
  public void attach(int index,String options){
105
115
  if(disposed||index<0||index>=views.length)return;
106
116
  try{configureAttachment(index,options.equals("null")?null:new JSONObject(options));}catch(JSONException e){throw new IllegalArgumentException(e);}
@@ -133,7 +143,7 @@ public final class CircleWorld implements Choreographer.FrameCallback, View.OnAt
133
143
  v.setTranslationX((float)(state.bodies[i].x*density-v.getLeft()-v.getWidth()/2.0));
134
144
  v.setTranslationY((float)(state.bodies[i].y*density-v.getTop()-v.getHeight()/2.0));
135
145
  }
136
- for(CircleGuide guide:guides)if(guide!=null){guide.setBounds(0,0,container.getWidth(),container.getHeight());guide.invalidateSelf();}
146
+ for(int kind=0;kind<2;kind++)for(CircleGuide guide:kind==0?guides:pointerGuides)if(guide!=null){guide.setBounds(0,0,container.getWidth(),container.getHeight());guide.invalidateSelf();}
137
147
  }
138
148
  private void sampleVelocity(MotionEvent event){
139
149
  if(velocity==null)return;
@@ -186,14 +196,15 @@ public final class CircleWorld implements Choreographer.FrameCallback, View.OnAt
186
196
  @Override public void onViewDetachedFromWindow(View v){cancelDrag();refresh();}
187
197
  public String snapshot(){
188
198
  try {
189
- int guideCount=0;for(CircleGuide guide:guides)if(guide!=null)guideCount++;
199
+ int guideCount=0;for(int kind=0;kind<2;kind++)for(CircleGuide guide:kind==0?guides:pointerGuides)if(guide!=null)guideCount++;
190
200
  JSONArray bodies=new JSONArray();
191
201
  for(CircleMath.Body b:state.bodies){
192
202
  Object attachment=b.attachment.enabled?new JSONObject().put("anchor",new JSONObject().put("x",b.attachment.u*state.width).put("y",b.attachment.v*state.height)).put("length",b.attachment.length).put("stiffness",b.attachment.stiffness).put("damping",b.attachment.damping):JSONObject.NULL;
193
203
  Object snap=JSONObject.NULL;
194
204
  if(b.snap.active){double x=state.snapX(b,b.snap.index),y=state.snapY(b,b.snap.index);snap=new JSONObject().put("index",b.snap.index).put("point",new JSONObject().put("x",x).put("y",y)).put("settled",Math.hypot(b.x-x,b.y-y)<=.25&&Math.hypot(b.vx,b.vy)<=4&&!b.held);}
205
+ Object pointer=b.held&&b.drag.enabled?new JSONObject().put("anchor",new JSONObject().put("x",b.tx).put("y",b.ty)).put("length",b.drag.length).put("stiffness",b.drag.stiffness).put("damping",b.drag.damping):JSONObject.NULL;
195
206
  Object release=b.released?new JSONObject().put("x",b.releaseX).put("y",b.releaseY).put("vx",b.releaseVX).put("vy",b.releaseVY):JSONObject.NULL;
196
- bodies.put(new JSONObject().put("x",b.x).put("y",b.y).put("vx",b.vx).put("vy",b.vy).put("radius",b.r).put("held",b.held).put("attachment",attachment).put("snap",snap).put("release",release));
207
+ bodies.put(new JSONObject().put("x",b.x).put("y",b.y).put("vx",b.vx).put("vy",b.vy).put("radius",b.r).put("held",b.held).put("attachment",attachment).put("pointer",pointer).put("snap",snap).put("release",release));
197
208
  }
198
209
  String status=disposed?"disposed":!enabled?"paused":background||!container.isAttachedToWindow()?"detached":!fits?"invalid-bounds":state.sleeping?"sleeping":"running";
199
210
  return new JSONObject().put("status",status).put("guides",guideCount).put("bodies",bodies).put("frames",frames).put("steps",state.steps).put("contacts",state.contacts).put("dragStarts",dragStarts).put("dragMoves",dragMoves).put("dragEnds",dragEnds).put("dragCancels",dragCancels).put("processingMs",processingMs).put("droppedMs",droppedMs).put("clock",scheduled).toString();
@@ -204,7 +215,7 @@ public final class CircleWorld implements Choreographer.FrameCallback, View.OnAt
204
215
  if(application!=null)application.unregisterActivityLifecycleCallbacks(lifecycle);application=null;lifecycle=null;
205
216
  container.removeOnAttachStateChangeListener(this);
206
217
  for(int i=0;i<views.length;i++)if(views[i]!=null){View v=views[i];v.setOnTouchListener(null);v.setClickable(clickable[i]);v.setTranslationX((float)originalX[i]);v.setTranslationY((float)originalY[i]);views[i]=null;}
207
- for(int i=0;i<guides.length;i++)if(guides[i]!=null){container.getOverlay().remove(guides[i]);guides[i]=null;}
218
+ for(int kind=0;kind<2;kind++){CircleGuide[] list=kind==0?guides:pointerGuides;for(int i=0;i<list.length;i++)if(list[i]!=null){container.getOverlay().remove(list[i]);list[i]=null;}}
208
219
  container=null;worlds.remove(this);
209
220
  }
210
221
  }
package/platforms/ios/src/JoltCircleMath.h CHANGED
@@ -21,7 +21,7 @@ typedef struct {
21
21
  double x,y,vx,vy,r,m,tx,ty,ax,ay,releaseX,releaseY,releaseVX,releaseVY;
22
22
  bool released;
23
23
  bool held,supported;
24
- JoltCircleAttachment attachment;
24
+ JoltCircleAttachment attachment,drag;
25
25
  JoltCircleSnap snap;
26
26
  } JoltCircle;
27
27
  typedef struct {
@@ -38,12 +38,13 @@ static inline bool JoltCircleFits(JoltCircleState *w,double width,double height)
38
38
  for(int i=0;i<w->count;i++){JoltCircle *b=&w->bodies[i];if(2*b->r>fmin(width,height))return false;area+=3.141592653589793*b->r*b->r;}
39
39
  return area<=width*height*.4;
40
40
  }
41
+ static inline bool JoltCircleKinematic(JoltCircle *b){return b->held&&!b->drag.enabled;}
41
42
  static inline void JoltCircleWalls(JoltCircleState *w,JoltCircle *b,bool impulse){
42
43
  double e=w->restitution;
43
- if(b->x<=b->r){b->x=b->r;if(b->ax<0)b->supported=true;if(impulse&&!b->held&&b->vx<0){b->vx=fabs(b->vx)<40?0:-b->vx*e;w->contacts++;}}
44
- if(b->x>=w->width-b->r){b->x=w->width-b->r;if(b->ax>0)b->supported=true;if(impulse&&!b->held&&b->vx>0){b->vx=fabs(b->vx)<40?0:-b->vx*e;w->contacts++;}}
45
- if(b->y<=b->r){b->y=b->r;if(b->ay<0)b->supported=true;if(impulse&&!b->held&&b->vy<0){b->vy=fabs(b->vy)<40?0:-b->vy*e;w->contacts++;}}
46
- if(b->y>=w->height-b->r){b->y=w->height-b->r;if(b->ay>0)b->supported=true;if(impulse&&!b->held&&b->vy>0){b->vy=fabs(b->vy)<40?0:-b->vy*e;w->contacts++;}}
44
+ if(b->x<=b->r){b->x=b->r;if(b->ax<0)b->supported=true;if(impulse&&!JoltCircleKinematic(b)&&b->vx<0){b->vx=fabs(b->vx)<40?0:-b->vx*e;w->contacts++;}}
45
+ if(b->x>=w->width-b->r){b->x=w->width-b->r;if(b->ax>0)b->supported=true;if(impulse&&!JoltCircleKinematic(b)&&b->vx>0){b->vx=fabs(b->vx)<40?0:-b->vx*e;w->contacts++;}}
46
+ if(b->y<=b->r){b->y=b->r;if(b->ay<0)b->supported=true;if(impulse&&!JoltCircleKinematic(b)&&b->vy<0){b->vy=fabs(b->vy)<40?0:-b->vy*e;w->contacts++;}}
47
+ if(b->y>=w->height-b->r){b->y=w->height-b->r;if(b->ay>0)b->supported=true;if(impulse&&!JoltCircleKinematic(b)&&b->vy>0){b->vy=fabs(b->vy)<40?0:-b->vy*e;w->contacts++;}}
47
48
  }
48
49
  static inline void JoltCircleContacts(JoltCircleState *w,bool impulse,int iterations){
49
50
  for(int iteration=0;iteration<iterations;iteration++){
@@ -52,7 +53,7 @@ static inline void JoltCircleContacts(JoltCircleState *w,bool impulse,int iterat
52
53
  double dx=b->x-a->x,dy=b->y-a->y,d=hypot(dx,dy),radius=a->r+b->r;
53
54
  if(d>radius+.02)continue;
54
55
  double nx=d>1e-9?dx/d:1,ny=d>1e-9?dy/d:0;
55
- double ia=a->held?0:1/a->m,ib=b->held?0:1/b->m,total=ia+ib;
56
+ double ia=JoltCircleKinematic(a)?0:1/a->m,ib=JoltCircleKinematic(b)?0:1/b->m,total=ia+ib;
56
57
  if(total==0)continue;
57
58
  double overlap=fmax(0,radius-d);
58
59
  a->x-=nx*overlap*ia/total;a->y-=ny*overlap*ia/total;
@@ -106,12 +107,15 @@ static inline void JoltCircleStep(JoltCircleState *w) {
106
107
  bool quiet=true;
107
108
  for(int i=0;i<w->count;i++){
108
109
  JoltCircle *b=&w->bodies[i];b->supported=false;b->ax=w->gx;b->ay=w->gy;
109
- if(b->held){b->vx=(b->tx-b->x)/dt;b->vy=(b->ty-b->y)/dt;quiet=false;}
110
+ if(b->held)quiet=false;
111
+ if(JoltCircleKinematic(b)){b->vx=(b->tx-b->x)/dt;b->vy=(b->ty-b->y)/dt;quiet=false;}
110
112
  else {
111
113
  double damping=0;
112
- if(b->attachment.enabled||b->snap.active){
114
+ if((b->held&&b->drag.enabled)||b->attachment.enabled||b->snap.active){
113
115
  double x,y,length,stiffness;
114
- if(b->snap.active){
116
+ if(b->held&&b->drag.enabled){
117
+ x=b->tx;y=b->ty;length=b->drag.length;stiffness=b->drag.stiffness;damping=b->drag.damping;
118
+ }else if(b->snap.active){
115
119
  x=JoltCircleSnapX(w,b,b->snap.index);y=JoltCircleSnapY(w,b,b->snap.index);
116
120
  length=0;stiffness=b->snap.stiffness;damping=b->snap.damping;
117
121
  // A selected snap is a positional controller; gravity must not offset its dock.
@@ -158,10 +162,14 @@ static inline void JoltCircleStep(JoltCircleState *w) {
158
162
  static inline void JoltCircleDrag(JoltCircleState *w,int index,double x,double y) {
159
163
  JoltCircle *b=&w->bodies[index];
160
164
  if(!b->held){b->snap.previousActive=b->snap.active;b->snap.previousIndex=b->snap.index;b->snap.active=false;}
161
- b->held=true;b->tx=JoltCircleClamp(x,b->r,w->width-b->r);b->ty=JoltCircleClamp(y,b->r,w->height-b->r);JoltCircleWake(w);
165
+ b->held=true;double inset=b->drag.enabled?0:b->r;
166
+ b->tx=JoltCircleClamp(x,inset,w->width-inset);b->ty=JoltCircleClamp(y,inset,w->height-inset);JoltCircleWake(w);
162
167
  }
163
168
  static inline void JoltCircleRelease(JoltCircleState *w,int index,double vx,double vy) {
164
- JoltCircle *b=&w->bodies[index];b->held=false;b->vx=vx;b->vy=vy;JoltCircleLimitVelocity(b);
169
+ JoltCircle *b=&w->bodies[index];
170
+ // A spring-held body releases its integrated momentum, never the pointer velocity.
171
+ if(!b->held||!b->drag.enabled){b->vx=vx;b->vy=vy;}
172
+ b->held=false;JoltCircleLimitVelocity(b);
165
173
  b->released=true;b->releaseX=b->x;b->releaseY=b->y;b->releaseVX=b->vx;b->releaseVY=b->vy;
166
174
  if(b->snap.count){
167
175
  double x=b->x+b->vx*b->snap.projection,y=b->y+b->vy*b->snap.projection,best=INFINITY;
package/platforms/ios/src/JoltCircleWorld.h CHANGED
@@ -9,6 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
9
9
  - (void)attach:(NSInteger)index options:(NSString *)options;
10
10
  - (void)snapTo:(NSInteger)index target:(NSInteger)target;
11
11
  - (void)reset;
12
+ - (BOOL)supportsPointerSpring;
12
13
  - (NSString *)snapshot;
13
14
  - (void)dispose;
14
15
  + (NSUInteger)worldCount;