#5 set joint collision as true, angular damping multiply by 10

noname0310 · Aug 12, 2023 · 34bb529 · 34bb529
1 parent 2d3b7ad
commit 34bb529
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/res/constraint_test4.pmx b/res/constraint_test4.pmx
diff --git a/src/Runtime/mmdPhysics.ts b/src/Runtime/mmdPhysics.ts
@@ -395,7 +395,7 @@ export class MmdPhysics {
             body.setMassProperties({ mass: rigidBody.mass });
             // TODO: fix linearDamping calculation (multiply by 10 is nonsense)
             body.setLinearDamping(rigidBody.linearDamping * 10);
-            body.setAngularDamping(rigidBody.angularDamping);
+            body.setAngularDamping(rigidBody.angularDamping * 10);
             body.computeMassProperties();
 
             nodes.push(node);
@@ -582,7 +582,8 @@ export class MmdPhysics {
                         jointFinalTransformB.m[4],
                         jointFinalTransformB.m[5],
                         jointFinalTransformB.m[6]
-                    )
+                    ),
+                    collision: true
                 },
                 limits,
                 scene

diff --git a/src/Test/Scene/constraintTestScene.ts b/src/Test/Scene/constraintTestScene.ts
@@ -81,7 +81,7 @@ export class SceneBuilder implements ISceneBuilder {
         const mmdMesh = await SceneLoader.ImportMeshAsync(
             undefined,
             "res/",
-            "constraint_test3.pmx",
+            "constraint_test4.pmx",
             scene
         ).then(result => result.meshes[0]);
         mmdMesh.receiveShadows = true;

diff --git a/src/Test/index.ts b/src/Test/index.ts
@@ -1,7 +1,7 @@
 import { Engine } from "@babylonjs/core/Engines/engine";
 
 import { BaseRuntime } from "./baseRuntime";
-import { SceneBuilder } from "./Scene/physicsTestScene";
+import { SceneBuilder } from "./Scene/constraintTestScene";
 
 window.onload = (): void => {
     const canvas = document.createElement("canvas");