From b9cdc9b222ca0bd015a0bfe1e1c4b275a2232f45 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Fri, 20 Dec 2019 10:26:28 +0800 Subject: [PATCH] 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