The collider's rotation changes from radians to degrees (#319)

* feat: collider shape rotation change radians to degrees
galacean · Jan 2, 2025 · a9231a5 · a9231a5
1 parent bbb2f88
commit a9231a5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/packages/auxiliary-lines/src/WireframeManager.ts b/packages/auxiliary-lines/src/WireframeManager.ts
@@ -28,7 +28,8 @@ import {
   CircleShape,
   ConeShape,
   HemisphereShape,
-  SphereShape
+  SphereShape,
+  MathUtil
 } from "@galacean/engine";
 import { PlainColorMaterial } from "@galacean/engine-toolkit-custom-material";
 import { WireframePrimitive } from "./WireframePrimitive";
@@ -350,7 +351,12 @@ export class WireframeManager extends Script {
       indices,
       this._indicesCount
     );
-    Quaternion.rotationYawPitchRoll(rotation.x, rotation.y, rotation.z, tempRotation);
+    Quaternion.rotationYawPitchRoll(
+      MathUtil.degreeToRadian(rotation.y),
+      MathUtil.degreeToRadian(rotation.x),
+      MathUtil.degreeToRadian(rotation.z),
+      tempRotation
+    );
     this._localRotation(positionsOffset, tempRotation);
     Vector3.multiply(position, worldScale, tempVector);
     this._localTranslate(positionsOffset, tempVector);
@@ -382,7 +388,12 @@ export class WireframeManager extends Script {
       indices,
       this._indicesCount
     );
-    Quaternion.rotationYawPitchRoll(rotation.x, rotation.y, rotation.z, tempRotation);
+    Quaternion.rotationYawPitchRoll(
+      MathUtil.degreeToRadian(rotation.y),
+      MathUtil.degreeToRadian(rotation.x),
+      MathUtil.degreeToRadian(rotation.z),
+      tempRotation
+    );
     this._localRotation(positionsOffset, tempRotation);
     Vector3.multiply(position, worldScale, tempVector);
     this._localTranslate(positionsOffset, tempVector);
@@ -431,7 +442,12 @@ export class WireframeManager extends Script {
       case ColliderShapeUpAxis.Z:
         tempAxis.set(halfSqrt, 0, 0, halfSqrt);
     }
-    Quaternion.rotationYawPitchRoll(rotation.x, rotation.y, rotation.z, tempRotation);
+    Quaternion.rotationYawPitchRoll(
+      MathUtil.degreeToRadian(rotation.y),
+      MathUtil.degreeToRadian(rotation.x),
+      MathUtil.degreeToRadian(rotation.z),
+      tempRotation
+    );
     Quaternion.multiply(tempRotation, tempAxis, tempRotation);
     this._localRotation(positionsOffset, tempRotation);
     Vector3.multiply(position, worldScale, tempVector);

diff --git a/packages/navigation-gizmo/src/SphereScript.ts b/packages/navigation-gizmo/src/SphereScript.ts
@@ -193,7 +193,7 @@ export class SphereScript extends Script {
     const { _tempQuat: tempQuat, _tempQuat2: tempQuat2 } = this;
 
     Quaternion.rotationAxisAngle(SphereScript._startAxis, y, tempQuat);
-    Quaternion.rotationYawPitchRoll(x, 0, 0, tempQuat2);
+    Quaternion.rotationYawPitchRoll(0, x, 0, tempQuat2);
     Quaternion.multiply(tempQuat, tempQuat2, tempQuat);
     Vector3.subtract(SphereScript._startPos, this._target, this._rotateVec);