From 62e4fb52b0cdec010d2f084cb2d1fc5b1f7689bf Mon Sep 17 00:00:00 2001 From: homuler Date: Sun, 29 Nov 2020 17:36:36 +0900 Subject: [PATCH] fix: width <-> height --- Assets/MediaPipe/Examples/Scenes/DesktopCPU.unity | 7 ++----- Assets/MediaPipe/Examples/Scenes/DesktopGPU.unity | 6 ++---- .../MediaPipe/Examples/Scripts/WebCamScreenController.cs | 6 +++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Assets/MediaPipe/Examples/Scenes/DesktopCPU.unity b/Assets/MediaPipe/Examples/Scenes/DesktopCPU.unity index e822444e3..701a1fbf8 100644 --- a/Assets/MediaPipe/Examples/Scenes/DesktopCPU.unity +++ b/Assets/MediaPipe/Examples/Scenes/DesktopCPU.unity @@ -843,8 +843,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 842caaa3595af5affbad9424323d3133, type: 3} m_Name: m_EditorClassIdentifier: - DefaultHeight: 640 - DefaultWidth: 480 + DefaultWidth: 640 + DefaultHeight: 480 FPS: 30 focalLengthPx: 2 --- !u!64 &496037460 @@ -1192,7 +1192,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2fda073a1f847adffae1d745c3f44b31, type: 3} m_Name: m_EditorClassIdentifier: - helloWorldGraph: {fileID: 0} faceDetectionGraph: {fileID: 180253633339373783, guid: 234d91f7c8fa82a4a8e47b60023e8d57, type: 3} faceMeshGraph: {fileID: 5162072812703337941, guid: 99dbd193a1c29da7e97aa549bb5f64ff, @@ -1201,8 +1200,6 @@ MonoBehaviour: type: 3} handTrackingGraph: {fileID: 675775105168490772, guid: 960ce8811f93477e38b461f05b8fa161, type: 3} - multiHandTrackingGraph: {fileID: 7664826976962761858, guid: 50d43cff30debe51781e5c6df83865be, - type: 3} poseTrackingGraph: {fileID: 2633288188356736957, guid: 47232e3cbf15f0dbf8323926a7d6b7eb, type: 3} hairSegmentationGraph: {fileID: 0} diff --git a/Assets/MediaPipe/Examples/Scenes/DesktopGPU.unity b/Assets/MediaPipe/Examples/Scenes/DesktopGPU.unity index 4fa92424c..1c4fd1af6 100644 --- a/Assets/MediaPipe/Examples/Scenes/DesktopGPU.unity +++ b/Assets/MediaPipe/Examples/Scenes/DesktopGPU.unity @@ -843,8 +843,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 842caaa3595af5affbad9424323d3133, type: 3} m_Name: m_EditorClassIdentifier: - DefaultHeight: 640 - DefaultWidth: 480 + DefaultWidth: 640 + DefaultHeight: 480 FPS: 30 focalLengthPx: 2 --- !u!64 &496037460 @@ -1200,8 +1200,6 @@ MonoBehaviour: type: 3} handTrackingGraph: {fileID: 6942115883526269425, guid: 731f293a753aacb7fb2a463e77999973, type: 3} - multiHandTrackingGraph: {fileID: 2049382192924603273, guid: 0de25789197f23cdea7e3edb16daf326, - type: 3} poseTrackingGraph: {fileID: 2128668153064451319, guid: 5d2913f213c90c73e8299fec12f0b535, type: 3} hairSegmentationGraph: {fileID: 2037604842797791001, guid: 23ff6b39a3225ee19970690d46a4fba2, diff --git a/Assets/MediaPipe/Examples/Scripts/WebCamScreenController.cs b/Assets/MediaPipe/Examples/Scripts/WebCamScreenController.cs index 7b8dccb3e..beea817ac 100644 --- a/Assets/MediaPipe/Examples/Scripts/WebCamScreenController.cs +++ b/Assets/MediaPipe/Examples/Scripts/WebCamScreenController.cs @@ -2,8 +2,8 @@ using UnityEngine; public class WebCamScreenController : MonoBehaviour { - [SerializeField] int DefaultHeight = 640; - [SerializeField] int DefaultWidth = 480; + [SerializeField] int DefaultWidth = 640; + [SerializeField] int DefaultHeight = 480; [SerializeField] int FPS = 30; [SerializeField] float focalLengthPx = 2.0f; @@ -19,7 +19,7 @@ public void ResetScreen(WebCamDevice? device) { if (device == null) return; - webCamTexture = new WebCamTexture(device?.name, DefaultHeight, DefaultWidth, FPS); + webCamTexture = new WebCamTexture(device?.name, DefaultWidth, DefaultHeight, FPS); try { webCamTexture.Play();