@series-inc/rundot-syncplay 6.0.0-rc.6 → 6.0.0-rc.7

package/core/native/physics/capsule_triangle_native.inc

@@ -242,7 +242,7 @@ Collision observeGeometry(SolverOperation& operation,const Body& capsule,const B
       for(std::uint32_t child=0;child<count;++child){work(operation);const auto at=base+std::size_t(child)*18;
         auto code=[&](unsigned lane){const auto value=payload[at+lane];if(!finite(value)||value<0||value>std::numeric_limits<std::uint32_t>::max()||std::floor(value)!=value)throw TriangleNativeFailure{tp::Failure::InvalidInput};return std::uint32_t(value);};
         const auto kind=code(0),offset=code(13),size=code(14),format=code(15);
-        if(kind>11||payload[at+16]!=0.||code(17)!=count)throw TriangleNativeFailure{tp::Failure::InvalidInput};
+        if(kind>11||(payload[at+16]!=0.&&payload[at+16]!=1.)||code(17)!=count)throw TriangleNativeFailure{tp::Failure::InvalidInput};
         const bool complex=kind==3||kind==4||kind==5||kind==6;
         if(complex){if(offset<previousEnd||offset>node.count||size>node.count-offset)throw TriangleNativeFailure{tp::Failure::InvalidInput};previousEnd=offset+size;}
         else if(offset||size||format)throw TriangleNativeFailure{tp::Failure::InvalidInput};

package/core/native/physics/physics.cpp

@@ -958,6 +958,20 @@ void populateBoxContactPoints(const Body& a, const Body& b, Collision& collision
     const Candidate& candidate = candidates[selected[index]];
     appendBoxContactPoint(collision, candidate.point, candidate.featureId);
   }
+  if (collision.pointCount > 0) {
+    double sumX = 0.0;
+    double sumY = 0.0;
+    double sumZ = 0.0;
+    for (std::uint32_t i = 0; i < collision.pointCount; ++i) {
+      sumX += collision.points[i][0];
+      sumY += collision.points[i][1];
+      sumZ += collision.points[i][2];
+    }
+    const double inv = 1.0 / static_cast<double>(collision.pointCount);
+    collision.pointX = sumX * inv;
+    collision.pointY = sumY * inv;
+    collision.pointZ = sumZ * inv;
+  }
 }
 
 Collision boxBoxOriented(const Body& a, const Body& b) {
@@ -18653,7 +18667,7 @@ std::int32_t solveStartingConstraints(SolverOperation& operation,
     || operation.materialMotionEpochs != nullptr) {
     operation.jointSubstepDuration = substepOptions.dtTicks;
     resolveSoAContacts(operation, operation.storage.soaBodies.data(), bodyCount,
-      substepOptions.velocityIterations, substepOptions, ContactPass::OwnedPositionCorrection);
+      1, substepOptions, ContactPass::OwnedPositionCorrection);
     if (operation.storage.contactConstraintOverflow) return 5;
     resolveSoAContacts(operation, operation.storage.soaBodies.data(), bodyCount,
       0, substepOptions,

package/core/native/physics/physics.hpp

@@ -253,7 +253,7 @@ struct StepOptions {
   std::uint32_t velocityIterations = 6;
   double gravityX = 0.0;
   double gravityZ = 0.0;
-  double restitutionThreshold = 0.0;
+  double restitutionThreshold = 0.5;
   double contactSpeed = 0.0;
   double maximumLinearSpeed = 0.0;
   double contactHertz = 0.0;