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

[haxe] 4.3 porting WIP.

Browse Source
This commit is contained in:
Davide Tantillo 2025-06-12 15:13:59 +02:00
parent 1ec1d23b7f
commit 09bf8a52cf
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spine-haxe/example/src/starlingExamples/VineExample.hx
View File

@ -69,8 +69,7 @@ class VineExample extends Scene {
public function onTouch(e:TouchEvent) { public function onTouch(e:TouchEvent) {
var touch = e.getTouch(this); var touch = e.getTouch(this);
if (touch != null && touch.phase == TouchPhase.ENDED) { if (touch != null && touch.phase == TouchPhase.ENDED) {
SceneManager.getInstance().switchScene(new CelestialCircusExample()); SceneManager.getInstance().switchScene(new SackExample());
// SceneManager.getInstance().switchScene(new SackExample());
} }
} }
} }

8
spine-haxe/spine-haxe/spine/PhysicsConstraint.hx
View File

@ -59,8 +59,8 @@ class PhysicsConstraint extends Constraint<PhysicsConstraint, PhysicsConstraintD
public var scaleOffset = 0.; public var scaleOffset = 0.;
public var scaleLag = 0.; public var scaleLag = 0.;
public var scaleVelocity = 0.; public var scaleVelocity = 0.;
public var remaining:Float = 0; public var remaining = 0.;
public var lastTime:Float = 0; public var lastTime = 0.;
public function new(data: PhysicsConstraintData, skeleton: Skeleton) { public function new(data: PhysicsConstraintData, skeleton: Skeleton) {
super(data, new PhysicsConstraintPose(), new PhysicsConstraintPose()); super(data, new PhysicsConstraintPose(), new PhysicsConstraintPose());
@ -105,8 +105,8 @@ class PhysicsConstraint extends Constraint<PhysicsConstraint, PhysicsConstraintD
/** Rotates the physics constraint so next update(Physics) forces are applied as if the bone rotated around the /** Rotates the physics constraint so next update(Physics) forces are applied as if the bone rotated around the
* specified point in world space. */ * specified point in world space. */
public function rotate (x:Float, y:Float, degrees:Float):Void { public function rotate (x:Float, y:Float, degrees:Float):Void {
var r:Float = degrees * MathUtils.degRad, cos:Float = Math.cos(r), sin:Float = Math.sin(r); var r = degrees * MathUtils.degRad, cos = Math.cos(r), sin = Math.sin(r);
var dx:Float = cx - x, dy:Float = cy - y; var dx = cx - x, dy = cy - y;
translate(dx * cos - dy * sin - dx, dx * sin + dy * cos - dy); translate(dx * cos - dy * sin - dx, dx * sin + dy * cos - dy);
} }

2
spine-haxe/spine-haxe/spine/SkeletonJson.hx
View File

@ -111,7 +111,7 @@ class SkeletonJson {
skeletonData.y = getFloat(skeletonMap, "y"); skeletonData.y = getFloat(skeletonMap, "y");
skeletonData.width = getFloat(skeletonMap, "width"); skeletonData.width = getFloat(skeletonMap, "width");
skeletonData.height = getFloat(skeletonMap, "height"); skeletonData.height = getFloat(skeletonMap, "height");
skeletonData.referenceScale = getFloat(skeletonMap, "referenceScale", 100); skeletonData.referenceScale = getFloat(skeletonMap, "referenceScale", 100) * scale;
skeletonData.fps = getFloat(skeletonMap, "fps"); skeletonData.fps = getFloat(skeletonMap, "fps");
skeletonData.imagesPath = getString(skeletonMap, "images", ""); skeletonData.imagesPath = getString(skeletonMap, "images", "");
skeletonData.audioPath = getString(skeletonMap, "audio", ""); skeletonData.audioPath = getString(skeletonMap, "audio", "");

4
spine-haxe/spine-haxe/spine/animation/PhysicsConstraintMassTimeline.hx
View File

@ -36,11 +36,11 @@ class PhysicsConstraintMassTimeline extends PhysicsConstraintTimeline {
} }
public function get (pose: PhysicsConstraintPose):Float { public function get (pose: PhysicsConstraintPose):Float {
return pose.massInverse; return 1 / pose.massInverse;
} }
public function set (pose: PhysicsConstraintPose, value:Float):Void { public function set (pose: PhysicsConstraintPose, value:Float):Void {
pose.massInverse = value; pose.massInverse = 1 / value;
} }
public function global (constraint: PhysicsConstraintData):Bool { public function global (constraint: PhysicsConstraintData):Bool {