| 45 | } |
| 46 | |
| 47 | MovementParameters MovementParameters::merge(MovementParameters const& rhs) const { |
| 48 | MovementParameters merged; |
| 49 | |
| 50 | merged.mass = rhs.mass.orMaybe(mass); |
| 51 | merged.gravityMultiplier = rhs.gravityMultiplier.orMaybe(gravityMultiplier); |
| 52 | merged.liquidBuoyancy = rhs.liquidBuoyancy.orMaybe(liquidBuoyancy); |
| 53 | merged.airBuoyancy = rhs.airBuoyancy.orMaybe(airBuoyancy); |
| 54 | merged.bounceFactor = rhs.bounceFactor.orMaybe(bounceFactor); |
| 55 | merged.stopOnFirstBounce = rhs.stopOnFirstBounce.orMaybe(stopOnFirstBounce); |
| 56 | merged.enableSurfaceSlopeCorrection = rhs.enableSurfaceSlopeCorrection.orMaybe(enableSurfaceSlopeCorrection); |
| 57 | merged.slopeSlidingFactor = rhs.slopeSlidingFactor.orMaybe(slopeSlidingFactor); |
| 58 | merged.maxMovementPerStep = rhs.maxMovementPerStep.orMaybe(maxMovementPerStep); |
| 59 | merged.maximumCorrection = rhs.maximumCorrection.orMaybe(maximumCorrection); |
| 60 | merged.speedLimit = rhs.speedLimit.orMaybe(speedLimit); |
| 61 | merged.discontinuityThreshold = rhs.discontinuityThreshold.orMaybe(discontinuityThreshold); |
| 62 | merged.collisionPoly = rhs.collisionPoly.orMaybe(collisionPoly); |
| 63 | merged.stickyCollision = rhs.stickyCollision.orMaybe(stickyCollision); |
| 64 | merged.stickyForce = rhs.stickyForce.orMaybe(stickyForce); |
| 65 | merged.airFriction = rhs.airFriction.orMaybe(airFriction); |
| 66 | merged.liquidFriction = rhs.liquidFriction.orMaybe(liquidFriction); |
| 67 | merged.groundFriction = rhs.groundFriction.orMaybe(groundFriction); |
| 68 | merged.collisionEnabled = rhs.collisionEnabled.orMaybe(collisionEnabled); |
| 69 | merged.frictionEnabled = rhs.frictionEnabled.orMaybe(frictionEnabled); |
| 70 | merged.gravityEnabled = rhs.gravityEnabled.orMaybe(gravityEnabled); |
| 71 | merged.ignorePlatformCollision = rhs.ignorePlatformCollision.orMaybe(ignorePlatformCollision); |
| 72 | merged.maximumPlatformCorrection = rhs.maximumPlatformCorrection.orMaybe(maximumPlatformCorrection); |
| 73 | merged.maximumPlatformCorrectionVelocityFactor = rhs.maximumPlatformCorrectionVelocityFactor.orMaybe(maximumPlatformCorrectionVelocityFactor); |
| 74 | merged.physicsEffectCategories = rhs.physicsEffectCategories.orMaybe(physicsEffectCategories); |
| 75 | merged.restDuration = rhs.restDuration.orMaybe(restDuration); |
| 76 | |
| 77 | return merged; |
| 78 | } |
| 79 | |
| 80 | Json MovementParameters::toJson() const { |
| 81 | return JsonObject{ |
no test coverage detected