From d97eb4b2dab6feb5c5fa9ca58321ac17171f71ce Mon Sep 17 00:00:00 2001 From: gil zhang Date: Mon, 3 Jul 2023 22:19:32 +0800 Subject: [PATCH] update model action bind --- .../Services/CameraEmojis/CameraService.cs | 3 +++ .../ModelLoadCompactOverlayViewModel.cs | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/ElectronBot.Braincase/Services/CameraEmojis/CameraService.cs b/src/ElectronBot.Braincase/Services/CameraEmojis/CameraService.cs index d2d1dbb..0638682 100644 --- a/src/ElectronBot.Braincase/Services/CameraEmojis/CameraService.cs +++ b/src/ElectronBot.Braincase/Services/CameraEmojis/CameraService.cs @@ -338,6 +338,7 @@ class CameraService // Set to CPU to ensure frames always contain CPU SoftwareBitmap images // instead of preferring GPU D3DSurface images. MemoryPreference = MediaCaptureMemoryPreference.Cpu, + }; await _mediaCapture.InitializeAsync(settings); @@ -408,6 +409,8 @@ class CameraService if (_cameraName != null && _cameraName.EndsWith("Cam")) { encoder.BitmapTransform.Rotation = BitmapRotation.Clockwise270Degrees; + //encoder.BitmapTransform.Rotation = BitmapRotation.Clockwise90Degrees; + //encoder.BitmapTransform.Flip = BitmapFlip.Horizontal; } // Set the software bitmap diff --git a/src/ElectronBot.Braincase/ViewModels/ModelLoadCompactOverlayViewModel.cs b/src/ElectronBot.Braincase/ViewModels/ModelLoadCompactOverlayViewModel.cs index 325c0de..9139a3c 100644 --- a/src/ElectronBot.Braincase/ViewModels/ModelLoadCompactOverlayViewModel.cs +++ b/src/ElectronBot.Braincase/ViewModels/ModelLoadCompactOverlayViewModel.cs @@ -463,7 +463,7 @@ public partial class ModelLoadCompactOverlayViewModel : ObservableRecipient App.MainWindow.DispatcherQueue.TryEnqueue(() => { - BodyModel.HxTransform3D = _bodyMt * Matrix.RotationY(MathUtil.DegreesToRadians((e.J6))); + BodyModel.HxTransform3D = _bodyMt * Matrix.RotationY(MathUtil.DegreesToRadians(-(e.J6))); Material = new DiffuseMaterial() { @@ -514,13 +514,13 @@ public partial class ModelLoadCompactOverlayViewModel : ObservableRecipient var tr2 = _rightArmMt * translationMatrix; - var tr3 = tr2 * Matrix.RotationZ(MathUtil.DegreesToRadians(-(e.J2))); - var tr4 = tr3 * Matrix.RotationX(MathUtil.DegreesToRadians(-(e.J3))); + var tr3 = tr2 * Matrix.RotationZ(MathUtil.DegreesToRadians(-(e.J4))); + var tr4 = tr3 * Matrix.RotationX(MathUtil.DegreesToRadians(-(e.J5))); var tr5 = tr4 * Matrix.Translation(rightAverage.X, rightAverage.Y, rightAverage.Z); - var tr6 = tr5 * Matrix.RotationY(MathUtil.DegreesToRadians((e.J6))); + var tr6 = tr5 * Matrix.RotationY(MathUtil.DegreesToRadians(-(e.J6))); RightArmModel.HxTransform3D = tr6; @@ -529,13 +529,13 @@ public partial class ModelLoadCompactOverlayViewModel : ObservableRecipient var leftTr2 = _leftArmMt * leftMatrix; - var leftTr3 = leftTr2 * Matrix.RotationZ(MathUtil.DegreesToRadians((e.J4))); - var leftTr4 = leftTr3 * Matrix.RotationX(MathUtil.DegreesToRadians(-(e.J5))); + var leftTr3 = leftTr2 * Matrix.RotationZ(MathUtil.DegreesToRadians((e.J2))); + var leftTr4 = leftTr3 * Matrix.RotationX(MathUtil.DegreesToRadians(-(e.J3))); var leftTr5 = leftTr4 * Matrix.Translation(leftAverage.X, leftAverage.Y, leftAverage.Z); - var leftTr6 = leftTr5 * Matrix.RotationY(MathUtil.DegreesToRadians((e.J6))); + var leftTr6 = leftTr5 * Matrix.RotationY(MathUtil.DegreesToRadians(-(e.J6))); LeftArmModel.HxTransform3D = leftTr6; @@ -548,7 +548,7 @@ public partial class ModelLoadCompactOverlayViewModel : ObservableRecipient var headTr4 = headTr3 * Matrix.Translation(HeadModelCentroidPoint.X, HeadModelCentroidPoint.Y, HeadModelCentroidPoint.Z); - var headTr5 = headTr4 * Matrix.RotationY(MathUtil.DegreesToRadians((e.J6))); + var headTr5 = headTr4 * Matrix.RotationY(MathUtil.DegreesToRadians(-(e.J6))); HeadModel.HxTransform3D = headTr5; });