fix(PropertyAnimation): space conversion (Orillusion#162)

Fix parameters used for space conversion fix rotate order from animation. Rotate the angle of the duck 180 degrees update submodule of public
Roview · May 19, 2023 · 4dd34a3 · 4dd34a3
1 parent 8d7cde8
commit 4dd34a3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/public b/public
diff --git a/samples/animation/Sample_PropertyAnimation.ts b/samples/animation/Sample_PropertyAnimation.ts
@@ -10,7 +10,7 @@ class Sample_PropertyAnimation {
     async run() {
         Engine3D.setting.shadow.autoUpdate = true;
         Engine3D.setting.shadow.updateFrameRate = 1;
-        Engine3D.setting.shadow.shadowBound = 10;
+        Engine3D.setting.shadow.shadowBound = 20;
         Engine3D.setting.shadow.shadowBias = 0.0001;
 
         await Engine3D.init();
@@ -37,10 +37,13 @@ class Sample_PropertyAnimation {
 
         // load external model
         let model = await Engine3D.res.loadGltf('PBR/Duck/Duck.gltf') as Object3D;
-        this.scene.addChild(model);
+        let container = new Object3D();
+        container.addChild(model);
+        model.rotationY = 180;
+        this.scene.addChild(container);
         model.scaleX = model.scaleY = model.scaleZ = 0.01;
 
-        this.animation = await this.initPropertyAnim(model);
+        this.animation = await this.initPropertyAnim(container);
         this.animation.play(this.animation.defaultClip);
 
         return true;

diff --git a/src/components/anim/curveAnim/AnimationMonitor.ts b/src/components/anim/curveAnim/AnimationMonitor.ts
@@ -176,7 +176,7 @@ export class AnimationMonitor {
 
                 if (hasQuaternion) {
                     let transform = this._target.transform;
-                    Matrix4.getEuler(transform.localRotation, transform.localRotQuat, true, 'YXZ');
+                    Matrix4.getEuler(transform.localRotation, transform.localRotQuat, true, 'ZYX');
                 }
             }
         }

diff --git a/src/components/anim/curveAnim/PropertyHelp.ts b/src/components/anim/curveAnim/PropertyHelp.ts
@@ -47,9 +47,9 @@ export class PropertyHelp {
     };
 
     static property_scale: any = {
-        'm_LocalPosition.x': -1,
+        'm_LocalPosition.x': 1,
         'm_LocalPosition.y': 1,
-        'm_LocalPosition.z': 1,
+        'm_LocalPosition.z': -1,
 
         'localEulerAnglesRaw.x': -1, //Deg2Rad(1),
         'localEulerAnglesRaw.y': 1, //Deg2Rad(1),
@@ -59,9 +59,9 @@ export class PropertyHelp {
         'm_LocalEulerAngles.y': 1, //Deg2Rad(1),
         'm_LocalEulerAngles.z': 1, //Deg2Rad(1),
 
-        'm_LocalRotation.x': -1, //Rad2Deg(1),
+        'm_LocalRotation.x': 1, //Rad2Deg(1),
         'm_LocalRotation.y': 1, //Rad2Deg(1),
-        'm_LocalRotation.z': 1, //Rad2Deg(1),
+        'm_LocalRotation.z': -1, //Rad2Deg(1),
         'm_LocalRotation.w': -1, //Rad2Deg(1),
 
         'm_LocalScale.x': 1,