UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cpp] Port of commit 48355c2, abb4362: PhysicsConstraint fixes.

Browse Source
This commit is contained in:
Mario Zechner 2025-09-15 14:55:28 +02:00
parent f8a125aa8a
commit 355f557153
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spine-cpp/src/spine/PhysicsConstraint.cpp
View File

@ -112,7 +112,7 @@ void PhysicsConstraint::update(Skeleton &skeleton, Physics physics) {
_ux = bx;
_uy = by;
} else {
float a = _remaining, i = p._inertia, f = skeleton._data.getReferenceScale(), d = -1, m = 0, e = 0, ax = 0, ay = 0,
float a = _remaining, i = p._inertia, f = skeleton._data.getReferenceScale(), d = -1, m = 0, e = 0,
qx = _data._limit * delta, qy = qx * MathUtil::abs(skeleton.getScaleY());
qx *= MathUtil::abs(skeleton._scaleX);
if (x || y) {
@ -132,8 +132,8 @@ void PhysicsConstraint::update(Skeleton &skeleton, Physics physics) {
m = t * p._massInverse;
e = p._strength;
float w = f * p._wind, g = f * p._gravity;
ax = (w * skeleton._windX + g * skeleton._gravityX) * skeleton._scaleX;
ay = (w * skeleton._windY + g * skeleton._gravityY) * skeleton.getScaleY();
float ax = (w * skeleton._windX + g * skeleton._gravityX) * skeleton._scaleX;
float ay = (w * skeleton._windY + g * skeleton._gravityY) * skeleton.getScaleY();
do {
if (x) {
_xVelocity += (ax - _xOffset * e) * m;
@ -188,10 +188,9 @@ void PhysicsConstraint::update(Skeleton &skeleton, Physics physics) {
d = MathUtil::pow(p._damping, 60 * t);
m = t * p._massInverse;
e = p._strength;
float w = f * p._wind, g = f * p._gravity;
ax = (w * skeleton._windX + g * skeleton._gravityX) * skeleton._scaleX;
ay = (w * skeleton._windY + g * skeleton._gravityY) * skeleton.getScaleY();
}
float ax = p._wind * skeleton._windX + p._gravity * skeleton._gravityX;
float ay = p._wind * skeleton._windY + p._gravity * skeleton._gravityY;
float rs = _rotateOffset, ss = _scaleOffset, h = l / f;
while (true) {
a -= t;
@ -290,4 +289,4 @@ BonePose &PhysicsConstraint::getBone() {
void PhysicsConstraint::setBone(BonePose &bone) {
_bone = &bone;
}
}

1
spine-glfw/example/physics.cpp
View File

@ -125,6 +125,7 @@ int main() {
// Set the "eyeblink-long" animation like in the web example
animationState.setAnimation(0, "eyeblink-long", true);
animationState.setAnimation(1, "wind-idle", true);
// Create the renderer and set the viewport size to match the window size. This sets up a
// pixel perfect orthogonal projection for 2D rendering.