From 783c75db5f9a74893556176314834440c3fd14ed Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 09:48:54 +0800 Subject: [PATCH 01/10] Updated the batch --- _Startup/03_RoyalGallery_Portrait.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_Startup/03_RoyalGallery_Portrait.bat b/_Startup/03_RoyalGallery_Portrait.bat index 4a85940..539491c 100644 --- a/_Startup/03_RoyalGallery_Portrait.bat +++ b/_Startup/03_RoyalGallery_Portrait.bat @@ -1,4 +1,5 @@ set root=C:\UC\Project-19050-Frozen2\_Deploy_PC set device=03_RoyalGallery timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-03_RoyalGallery_Portrait\Build\19050-03_RoyalGallery_Portrait.exe" +CD "%root%\%device%\UnityBuild-19050-03_RoyalGallery_Portrait\Build\" +start "" "19050-03_RoyalGallery_Portrait.exe" From f790b38193c364cf3ab51fcffef8511747877f76 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 09:59:47 +0800 Subject: [PATCH 02/10] Updated the batch --- _Startup/03_RoyalGallery_Portrait.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Startup/03_RoyalGallery_Portrait.bat b/_Startup/03_RoyalGallery_Portrait.bat index 539491c..18a2bba 100644 --- a/_Startup/03_RoyalGallery_Portrait.bat +++ b/_Startup/03_RoyalGallery_Portrait.bat @@ -2,4 +2,4 @@ set root=C:\UC\Project-19050-Frozen2\_Deploy_PC set device=03_RoyalGallery timeout /t 8 CD "%root%\%device%\UnityBuild-19050-03_RoyalGallery_Portrait\Build\" -start "" "19050-03_RoyalGallery_Portrait.exe" +CALL "19050-03_RoyalGallery_Portrait.exe" From 324287376547bb1e7964add341521e90227f9e18 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 10:07:06 +0800 Subject: [PATCH 03/10] 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" From bd48e5dc45f2d9d652dcc686bf40d8fa79c5da16 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 10:16:12 +0800 Subject: [PATCH 04/10] Updated 06 settings. --- .../data/setting/AppEasyVideoPlayer.xml | 41 ++++-- 06_SylphOlaf/AppEasyVideoPlayer/imgui.ini | 5 + .../data/settings/homo_setting.xml | 120 ++---------------- .../data/settings/spout_settings.xml | 2 +- 4 files changed, 45 insertions(+), 123 deletions(-) diff --git a/06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml b/06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml index 7719f6c..0abcb6d 100644 --- a/06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml +++ b/06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml @@ -11,23 +11,23 @@ true true - 60.9183 - + 59.9775 + 60 true false - 1024 - 768 + 977 + 603 - 1024 - 768 + 1920 + 1080 - true + false false true - true + false 0 0 @@ -41,12 +41,12 @@ 255 - - false + + true EasyVideoPlayer - movie/demo.avi + ../../Material/6-SylphOlaf_hap_sound.avi false true 1 @@ -54,9 +54,24 @@ false + + 0 + 0 + + + false + + 0 + 0 + + + 0 + 0 + + - - sound/demo.mp3 + + true true 1 diff --git a/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini b/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini index 327dbba..50cd1f8 100644 --- a/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini +++ b/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini @@ -8,3 +8,8 @@ Pos=10,10 Size=450,686 Collapsed=0 +[Window][AppEasyVideoPlayer::Info] +Pos=400,266 +Size=177,71 +Collapsed=0 + diff --git a/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml b/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml index 1c80c45..f8f1cf5 100644 --- a/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -6,15 +6,15 @@ 1 0 60 -2177.000000000 -126.000000000 +248.000000000 +135.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.045312501 + 0.003333333 1.000000000 0.000000000 - 0.328645825 - 0.002500000 + 0.961458325 + 0.010833334 0.000000000 1.000000000 - 0.000347221 - 0.996666789 + 0.041666668 + 0.988333464 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.951041460 + 0.986666679 diff --git a/06_SylphOlaf/ucProjectionMappingUI/data/settings/spout_settings.xml b/06_SylphOlaf/ucProjectionMappingUI/data/settings/spout_settings.xml index 0a0adff..d9c3744 100644 --- a/06_SylphOlaf/ucProjectionMappingUI/data/settings/spout_settings.xml +++ b/06_SylphOlaf/ucProjectionMappingUI/data/settings/spout_settings.xml @@ -1,3 +1,3 @@ - Spout Camera + EasyVideoPlayer From c367754cc8d759da605c0508b3eb11ffde3a38ac Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 10:25:05 +0800 Subject: [PATCH 05/10] Updated 08 settings. --- _Startup/08_DarkSea.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_Startup/08_DarkSea.bat b/_Startup/08_DarkSea.bat index 1a37994..6d21255 100644 --- a/_Startup/08_DarkSea.bat +++ b/_Startup/08_DarkSea.bat @@ -1,10 +1,11 @@ set root=C:\UC\Project-19050-Frozen2\_Deploy_PC +set root_fast=E:\UC\Project-19050-Frozen2\_Deploy_PC set device=08_DarkSea timeout /t 8 start "" "%root%\%device%\ucURGCalibration\ucURGCalibration.exe" timeout /t 8 start "" "%root%\%device%\ofxCCVApp\ofxCCVApp.exe" timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-08_DarkSea\Build\..." +start "" "%root_fast%\%device%\UnityBuild-19050-08_DarkSea\Build\..." timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" From b9cdc9b222ca0bd015a0bfe1e1c4b275a2232f45 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 10:26:28 +0800 Subject: [PATCH 06/10] Updated 08 settings. --- .../Build/.gitkeep | 1 - .../Material/.gitkeep | 1 - 08_DarkSea/ofxCCVApp/imgui.ini | 2 +- .../data/settings/homo_setting.xml | 205 +++++++++++++----- .../data/settings/spout_settings.xml | 2 +- 08_DarkSea/ucURGCalibration/data/settings.xml | 2 +- .../ucURGCalibration/data/settings/urg_0.xml | 8 +- .../data/settings/urg_homo_0.xml | 16 +- 8 files changed, 166 insertions(+), 71 deletions(-) delete mode 100644 08_DarkSea/UnityBuild-19050-08_DarkSea/Build/.gitkeep delete mode 100644 08_DarkSea/UnityBuild-19050-08_DarkSea/Material/.gitkeep diff --git a/08_DarkSea/UnityBuild-19050-08_DarkSea/Build/.gitkeep b/08_DarkSea/UnityBuild-19050-08_DarkSea/Build/.gitkeep deleted file mode 100644 index 0e8c54b..0000000 --- a/08_DarkSea/UnityBuild-19050-08_DarkSea/Build/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -#gitkeep file diff --git a/08_DarkSea/UnityBuild-19050-08_DarkSea/Material/.gitkeep b/08_DarkSea/UnityBuild-19050-08_DarkSea/Material/.gitkeep deleted file mode 100644 index 0e8c54b..0000000 --- a/08_DarkSea/UnityBuild-19050-08_DarkSea/Material/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -#gitkeep file diff --git a/08_DarkSea/ofxCCVApp/imgui.ini b/08_DarkSea/ofxCCVApp/imgui.ini index 3b47927..ca6c065 100644 --- a/08_DarkSea/ofxCCVApp/imgui.ini +++ b/08_DarkSea/ofxCCVApp/imgui.ini @@ -4,7 +4,7 @@ Size=400,400 Collapsed=0 [Window][Settings] -Pos=-111,13 +Pos=600,114 Size=396,781 Collapsed=0 diff --git a/08_DarkSea/ucProjectionMappingUI/data/settings/homo_setting.xml b/08_DarkSea/ucProjectionMappingUI/data/settings/homo_setting.xml index 1c80c45..bd28e80 100644 --- a/08_DarkSea/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/08_DarkSea/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -2,32 +2,32 @@ 0 0 1 -0 +1 1 0 60 -2177.000000000 -126.000000000 +359.000000000 +201.000000000 1280.000000000 960.000000000 0.000000000 0.000000000 - 0.333333343 - 1.000000000 + 0.500000000 + 0.500000000 0.000000000 - 0.000000000 + 0.187755108 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 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 - 1 + 0 25 25 1 @@ -36,45 +36,118 @@ 0.000000000 0.000000000 - 0.000694444 - 0.012500000 + 0.019921962 + 0.005416667 - 1.000000000 + 0.841924369 + 0.000000000 + 0.345052093 + 0.018333338 + + + 0.999999940 0.000000000 - 0.328645825 - 0.002500000 + 0.404097229 + 0.021522747 0.000000000 1.000000000 - 0.000347221 - 0.996666789 + 0.069010407 + 0.421250045 - 1.000000000 + 0.841924369 + 1.000000000 + 0.325260431 + 0.423541665 + + + 0.999999940 1.000000000 - 0.328993082 - 0.970833361 + 0.372287333 + 0.419795513 - 0.333333343 + 0.500000000 0.000000000 - 0.333333343 - 1.000000000 + 0.500000000 + 0.500000000 - 0.000000000 + 0.187755108 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 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + + 0 + 25 + 25 + 1 + 1 + + + 0.000000000 + 0.000000000 + 0.599206388 + 0.010111506 + + + 0.158075601 + 0.000000000 + 0.659374952 + 0.008750000 + + + 0.999999940 + 0.000000000 + 0.968489826 + 0.029583333 + + + 0.000000000 + 1.000000000 + 0.613850772 + 0.425345212 + + + 0.158075601 + 1.000000000 + 0.663697481 + 0.427124679 + + + 0.999999940 + 1.000000000 + 0.923958004 + 0.434166610 + + + + + + 0.000000000 + 0.500000000 + 0.500000000 + 0.500000000 + + 0.000000000 + 0.195918366 + 0.000000000 + 0.000000000 + + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 1 25 @@ -85,45 +158,57 @@ 0.000000000 0.000000000 - 0.338020831 - 0.007500000 + 0.011458335 + 0.503750026 + + + 0.836177528 + 0.000000000 + 0.316927075 + 0.511250019 1.000000000 0.000000000 - 0.664409697 - 0.012499994 + 0.377009392 + 0.512725174 0.000000000 1.000000000 - 0.338715285 - 0.959166646 + 0.009375000 + 0.971249998 + + + 0.836177528 + 1.000000000 + 0.307968676 + 0.980083406 1.000000000 1.000000000 - 0.661631942 - 0.933333337 + 0.366693556 + 0.981820703 - 0.666666687 - 0.000000000 - 0.333333313 - 1.000000000 + 0.500000000 + 0.500000000 + 0.500000000 + 0.500000000 - 0.000000000 + 0.191836730 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 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 + 1 0.795918 0.771429 0.44898 0 1 25 @@ -134,26 +219,38 @@ 0.000000000 0.000000000 - 0.673263907 - 0.010000000 + 0.613004148 + 0.512778401 + + + 0.160958901 + 0.000000000 + 0.670572937 + 0.514166594 1.000000000 0.000000000 - 0.995312512 - 0.005833333 + 0.964322865 + 0.521250010 0.000000000 1.000000000 - 0.671701372 - 0.984166682 + 0.605866313 + 0.975512207 + + + 0.160958901 + 1.000000000 + 0.665104091 + 0.975291550 1.000000000 1.000000000 - 0.997742951 - 0.959166646 + 0.967187285 + 0.974166751 diff --git a/08_DarkSea/ucProjectionMappingUI/data/settings/spout_settings.xml b/08_DarkSea/ucProjectionMappingUI/data/settings/spout_settings.xml index 0a0adff..3384dd0 100644 --- a/08_DarkSea/ucProjectionMappingUI/data/settings/spout_settings.xml +++ b/08_DarkSea/ucProjectionMappingUI/data/settings/spout_settings.xml @@ -1,3 +1,3 @@ - Spout Camera + UnitySpout diff --git a/08_DarkSea/ucURGCalibration/data/settings.xml b/08_DarkSea/ucURGCalibration/data/settings.xml index 3a649eb..2869f9e 100644 --- a/08_DarkSea/ucURGCalibration/data/settings.xml +++ b/08_DarkSea/ucURGCalibration/data/settings.xml @@ -1,5 +1,5 @@ - 897.959, 163.265 + 801.02, 372.449 0, 0 diff --git a/08_DarkSea/ucURGCalibration/data/settings/urg_0.xml b/08_DarkSea/ucURGCalibration/data/settings/urg_0.xml index b14240c..4a17e50 100644 --- a/08_DarkSea/ucURGCalibration/data/settings/urg_0.xml +++ b/08_DarkSea/ucURGCalibration/data/settings/urg_0.xml @@ -1,6 +1,6 @@
- 192.168.0.10 + 192.168.234.210 10940 -135 135 @@ -12,15 +12,15 @@ 90 0.1 - 0.10706 + 0.112413 1 0, 0, 0, 1, 1 - 641 - 159 + 797 + 380 0.122449 25.5102 0.5 diff --git a/08_DarkSea/ucURGCalibration/data/settings/urg_homo_0.xml b/08_DarkSea/ucURGCalibration/data/settings/urg_homo_0.xml index f12788c..051e8b7 100644 --- a/08_DarkSea/ucURGCalibration/data/settings/urg_homo_0.xml +++ b/08_DarkSea/ucURGCalibration/data/settings/urg_homo_0.xml @@ -1,18 +1,18 @@ - 1429.108276367 - 2288.440429688 + 85.846679688 + -2863.099121094 - 1429.107910156 - -2914.256835938 + 128.990478516 + 3628.580078125 - -112.085693359 - -2876.894531250 + 3658.385498047 + 4125.410156250 - -93.405029297 - 2307.121337891 + 3669.504882813 + -4037.342041016 From b55f08cb20ec917fd5ac43aaad8bbe9129edf721 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 11:22:24 +0800 Subject: [PATCH 07/10] Updated 01 settings. --- .../ofxKinectV2TouchApp/data/corners.xml | 16 ++++++++-------- .../ofxKinectV2TouchApp/data/kinect2.xml | 4 ++-- .../ofxKinectV2TouchApp/data/settings.xml | 4 ++-- .../data/settings/homo_setting.xml | 18 +++++++++--------- .../data/settings/spout_settings.xml | 2 +- _Startup/01_ForstCoronation_1.bat | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml b/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml index b8b5c05..e40559c 100644 --- a/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml +++ b/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml @@ -1,20 +1,20 @@ - 169.093368530 - 204.093383789 + 116.093368530 + 45.093383789 - 268.906646729 - 203.093383789 + 438.906646729 + 33.000000000 - 279.906616211 - 294.906646729 + 434.906616211 + 363.906646729 - 168.093368530 - 293.906616211 + 133.093368530 + 326.906616211 diff --git a/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml b/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml index f9ba333..4382756 100644 --- a/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml +++ b/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml @@ -7,8 +7,8 @@ 20 1 1 - -5, -5, 0.408163 - 5, 5, 1.63265 + -5, -5, 0.489796 + 5, 5, 3.59184 5 0.2 diff --git a/01_ForstCoronation/ofxKinectV2TouchApp/data/settings.xml b/01_ForstCoronation/ofxKinectV2TouchApp/data/settings.xml index 37ba83e..6a7fc38 100644 --- a/01_ForstCoronation/ofxKinectV2TouchApp/data/settings.xml +++ b/01_ForstCoronation/ofxKinectV2TouchApp/data/settings.xml @@ -24,7 +24,7 @@ 127.0.0.1 - 12345 + 3333 false false @@ -80,7 +80,7 @@ - ofxKinectV2TouchApp + false diff --git a/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml b/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml index f7853be..aad8be5 100644 --- a/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -1,13 +1,13 @@ -0 +1 0 1 -1 -1 +0 +0 1 0 60 -1143.000000000 -62.000000000 +234.000000000 +112.000000000 1280.000000000 745.000000000 @@ -36,19 +36,19 @@ 0.000000000 0.000000000 - 0.002929688 - -0.497395903 + 0.002148234 + -0.497786552 1.000000000 0.000000000 1.000488281 - -0.500651121 + -0.501044810 0.000000000 0.333333343 - 0.002929688 + 0.002408855 0.001302082 diff --git a/01_ForstCoronation/ucProjectionMappingUI/data/settings/spout_settings.xml b/01_ForstCoronation/ucProjectionMappingUI/data/settings/spout_settings.xml index 84dce78..3384dd0 100644 --- a/01_ForstCoronation/ucProjectionMappingUI/data/settings/spout_settings.xml +++ b/01_ForstCoronation/ucProjectionMappingUI/data/settings/spout_settings.xml @@ -1,3 +1,3 @@ - AntManSender + UnitySpout diff --git a/_Startup/01_ForstCoronation_1.bat b/_Startup/01_ForstCoronation_1.bat index 34e932a..d9166d1 100644 --- a/_Startup/01_ForstCoronation_1.bat +++ b/_Startup/01_ForstCoronation_1.bat @@ -4,6 +4,6 @@ set device=01_ForstCoronation timeout /t 8 start "" "%root%\%device%\ofxKinectV2TouchApp\ofxKinectV2TouchApp.exe" timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-01_ForstCoronation\Build\..." +start "" "%root%\%device%\UnityBuild-19050-01_ForstCoronation\Build\FrostCoronation.exe" timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" From 2a7f4158a6fa0acbfaf4165204395232a28f23c1 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 11:33:18 +0800 Subject: [PATCH 08/10] Updated 03 nav --- _Startup/03_RoyalGallery_Navigator.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Startup/03_RoyalGallery_Navigator.bat b/_Startup/03_RoyalGallery_Navigator.bat index c3327de..cb91528 100644 --- a/_Startup/03_RoyalGallery_Navigator.bat +++ b/_Startup/03_RoyalGallery_Navigator.bat @@ -7,5 +7,5 @@ start "" "PrinterController.exe" timeout /t 8 cd "%root%\%device%\UnityBuild-19050-03_RoyalGallery_Navigator\Build\" -start "" "19050-03_RoyalGallery_Navigator.exe" +CALL "19050-03_RoyalGallery_Navigator.exe" From 570464b678f5a6254a39db121ba8faaf4ec2e09e Mon Sep 17 00:00:00 2001 From: LH Date: Fri, 20 Dec 2019 21:53:40 +0800 Subject: [PATCH 09/10] Updated the shutdown time. --- _Utils/create_auto_shutdown.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Utils/create_auto_shutdown.bat b/_Utils/create_auto_shutdown.bat index 215a81e..043df81 100644 --- a/_Utils/create_auto_shutdown.bat +++ b/_Utils/create_auto_shutdown.bat @@ -2,6 +2,6 @@ ECHO Create Auto Shutdown Schtask. -SCHTASKS /CREATE /SC DAILY /TN "auto_shutdown" /TR "SHUTDOWN /P /F" /ST 23:00 +SCHTASKS /CREATE /SC DAILY /TN "auto_shutdown" /TR "SHUTDOWN /P /F" /ST 22:00 PAUSE From 8315feb3603f04090fac0b657028aacc1a32684f Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Sat, 21 Dec 2019 00:06:58 +0800 Subject: [PATCH 10/10] Updated 04 settings. --- .../ucProjectionMappingUI/data/settings/homo_setting.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml index 7baa79f..05e29df 100644 --- a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -2,7 +2,7 @@ 0 0 1 -0 +1 1 0 60