From 324287376547bb1e7964add341521e90227f9e18 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 10:07:06 +0800 Subject: [PATCH] Updated. --- .../ofxKinectV2TouchApp/data/corners.xml | 16 +-- .../ofxKinectV2TouchApp/data/kinect2.xml | 6 +- .../ofxKinectV2TouchApp/data/settings.xml | 6 +- .../data/settings/homo_setting.xml | 120 ++---------------- .../data/settings/spout_settings.xml | 2 +- _Startup/04_IceSlide.bat | 2 +- 6 files changed, 27 insertions(+), 125 deletions(-) diff --git a/04_IceSlide/ofxKinectV2TouchApp/data/corners.xml b/04_IceSlide/ofxKinectV2TouchApp/data/corners.xml index b8b5c05..f89f9ae 100644 --- a/04_IceSlide/ofxKinectV2TouchApp/data/corners.xml +++ b/04_IceSlide/ofxKinectV2TouchApp/data/corners.xml @@ -1,20 +1,20 @@ - 169.093368530 - 204.093383789 + 54.093368530 + 136.093383789 - 268.906646729 - 203.093383789 + 445.906646729 + 143.093383789 - 279.906616211 - 294.906646729 + 443.906616211 + 316.906646729 - 168.093368530 - 293.906616211 + 51.093368530 + 319.906616211 diff --git a/04_IceSlide/ofxKinectV2TouchApp/data/kinect2.xml b/04_IceSlide/ofxKinectV2TouchApp/data/kinect2.xml index f9ba333..4d99d57 100644 --- a/04_IceSlide/ofxKinectV2TouchApp/data/kinect2.xml +++ b/04_IceSlide/ofxKinectV2TouchApp/data/kinect2.xml @@ -4,11 +4,11 @@ 0 256 256 - 20 + 49.555 1 1 - -5, -5, 0.408163 - 5, 5, 1.63265 + -5, -5, 0.163265 + 5, 5, 2.12245 5 0.2 diff --git a/04_IceSlide/ofxKinectV2TouchApp/data/settings.xml b/04_IceSlide/ofxKinectV2TouchApp/data/settings.xml index 37ba83e..251766a 100644 --- a/04_IceSlide/ofxKinectV2TouchApp/data/settings.xml +++ b/04_IceSlide/ofxKinectV2TouchApp/data/settings.xml @@ -2,7 +2,7 @@ 37 - 21 + 20 320 640 @@ -24,7 +24,7 @@ 127.0.0.1 - 12345 + 3333 false false @@ -80,7 +80,7 @@ - ofxKinectV2TouchApp + false diff --git a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml index 1c80c45..7baa79f 100644 --- a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -6,15 +6,15 @@ 1 0 60 -2177.000000000 -126.000000000 +1124.000000000 +226.000000000 1280.000000000 960.000000000 0.000000000 0.000000000 - 0.333333343 + 1.000000000 1.000000000 0.000000000 @@ -36,124 +36,26 @@ 0.000000000 0.000000000 - 0.000694444 - 0.012500000 + 0.023958333 + 0.055833332 1.000000000 0.000000000 - 0.328645825 - 0.002500000 + 0.945312500 + 0.105833337 0.000000000 1.000000000 - 0.000347221 - 0.996666789 + 0.020833334 + 0.814166665 1.000000000 1.000000000 - 0.328993082 - 0.970833361 - - - - - - 0.333333343 - 0.000000000 - 0.333333343 - 1.000000000 - - 0.000000000 - 0.000000000 - 0.000000000 - 0.000000000 - - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - - 1 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.338020831 - 0.007500000 - - - 1.000000000 - 0.000000000 - 0.664409697 - 0.012499994 - - - 0.000000000 - 1.000000000 - 0.338715285 - 0.959166646 - - - 1.000000000 - 1.000000000 - 0.661631942 - 0.933333337 - - - - - - 0.666666687 - 0.000000000 - 0.333333313 - 1.000000000 - - 0.000000000 - 0.000000000 - 0.000000000 - 0.000000000 - - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - - 1 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.673263907 - 0.010000000 - - - 1.000000000 - 0.000000000 - 0.995312512 - 0.005833333 - - - 0.000000000 - 1.000000000 - 0.671701372 - 0.984166682 - - - 1.000000000 - 1.000000000 - 0.997742951 - 0.959166646 + 0.937500000 + 0.794166684 diff --git a/04_IceSlide/ucProjectionMappingUI/data/settings/spout_settings.xml b/04_IceSlide/ucProjectionMappingUI/data/settings/spout_settings.xml index 0a0adff..2cb5624 100644 --- a/04_IceSlide/ucProjectionMappingUI/data/settings/spout_settings.xml +++ b/04_IceSlide/ucProjectionMappingUI/data/settings/spout_settings.xml @@ -1,3 +1,3 @@ - Spout Camera + Main diff --git a/_Startup/04_IceSlide.bat b/_Startup/04_IceSlide.bat index e00632c..ec2051d 100644 --- a/_Startup/04_IceSlide.bat +++ b/_Startup/04_IceSlide.bat @@ -3,6 +3,6 @@ set device=04_IceSlide timeout /t 8 start "" "%root%\%device%\ofxKinectV2TouchApp\ofxKinectV2TouchApp.exe" timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-04_IceSlide\Build\..." +start "" "%root%\%device%\UnityBuild-19050-04_IceSlide\Build\19050-04-IceSlide" timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe"