diff --git a/05_BallPool/ofxCCVApp/data/AR.xml b/05_BallPool/ofxCCVApp/data/AR.xml index 4f0182d..74fce48 100644 --- a/05_BallPool/ofxCCVApp/data/AR.xml +++ b/05_BallPool/ofxCCVApp/data/AR.xml @@ -1,8 +1,8 @@ - 541 - 104 + 276 + 98 378 467 diff --git a/05_BallPool/ofxCCVApp/data/settings.xml b/05_BallPool/ofxCCVApp/data/settings.xml index f3f7374..0426547 100644 --- a/05_BallPool/ofxCCVApp/data/settings.xml +++ b/05_BallPool/ofxCCVApp/data/settings.xml @@ -1,8 +1,8 @@ - 741 - 37 + 702 + 32 396 781 @@ -24,10 +24,10 @@ false false - 0.05 - 0.05 - 0.9 - 0.9 + 0 + 0 + 1 + 1 0 @@ -41,12 +41,12 @@ 86 false - + 0 0 0 - + 0 0 0 @@ -97,7 +97,7 @@ 1280 - 657 + 835 true 60 diff --git a/05_BallPool/ofxCCVApp/imgui.ini b/05_BallPool/ofxCCVApp/imgui.ini index 7930ff0..7b0685a 100644 --- a/05_BallPool/ofxCCVApp/imgui.ini +++ b/05_BallPool/ofxCCVApp/imgui.ini @@ -4,12 +4,12 @@ Size=400,400 Collapsed=0 [Window][Settings] -Pos=741,37 +Pos=702,32 Size=396,781 Collapsed=0 [Window][AR] -Pos=541,104 +Pos=276,98 Size=378,467 Collapsed=1 diff --git a/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml b/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml index 09a0acb..0b80f16 100644 --- a/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -1,6 +1,6 @@ 0 0 -0 +1 1 0 1 @@ -14,10 +14,71 @@ 0.214285716 0.000000000 - 0.571428597 - 0.337500006 + 0.285714298 + 0.333611280 0.000000000 + 0.119999997 + 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.005208333 + 0.003333324 + + + 0.892857134 + 0.000000000 + 0.408593833 + 0.017500002 + + + 1.000000000 + 0.000000000 + 0.456906617 + 0.019196721 + + + 0.000000000 + 1.000000000 + 0.001822916 + 0.974166691 + + + 0.892857134 + 1.000000000 + 0.405468762 + 0.986666739 + + + 1.000000000 + 1.000000000 + 0.453812659 + 0.988163888 + + + + + + 0.500000000 + 0.000000000 + 0.285714298 + 0.337776184 + + 0.119999997 0.000000000 0.000000000 0.000000000 @@ -36,26 +97,38 @@ 0.000000000 0.000000000 - 0.036458332 - 0.039166667 + 0.543883562 + 0.006124708 + + + 0.107142851 + 0.000000000 + 0.590624988 + 0.005833333 1.000000000 0.000000000 - 0.928645849 - 0.018703705 + 0.991666555 + 0.003333333 0.000000000 1.000000000 - 0.042187501 - 0.884074092 + 0.542886555 + 0.966448486 + + + 0.107142851 + 1.000000000 + 0.590364575 + 0.969166696 1.000000000 1.000000000 - 0.930729151 - 0.881296277 + 0.997916520 + 0.992500007 diff --git a/05_BallPool/ucURGCalibration/data/settings.xml b/05_BallPool/ucURGCalibration/data/settings.xml index 0201ebb..4fecf20 100644 --- a/05_BallPool/ucURGCalibration/data/settings.xml +++ b/05_BallPool/ucURGCalibration/data/settings.xml @@ -1,5 +1,5 @@ - 490, 328 + 800, 300 0, 0 diff --git a/05_BallPool/ucURGCalibration/data/settings/urg_0.xml b/05_BallPool/ucURGCalibration/data/settings/urg_0.xml index 07e1d5e..fa8ae2e 100644 --- a/05_BallPool/ucURGCalibration/data/settings/urg_0.xml +++ b/05_BallPool/ucURGCalibration/data/settings/urg_0.xml @@ -19,8 +19,8 @@ 0, 0, 0, 1, 1 - 490 - 328 + 800 + 300 0.122449 25.5102 0.5 diff --git a/05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml b/05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml index 773d0b2..7bf7de7 100644 --- a/05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml +++ b/05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml @@ -1,18 +1,18 @@ - 392.306030273 - -2830.184326172 + 93.408325195 + -3923.029052734 - 326.922851563 - 2167.005615234 + 56.046630859 + 3960.392578125 - 3222.492919922 - 2307.114257813 + 3035.681640625 + 3988.414550781 - 3250.513427734 - -3045.017578125 + 3101.064697266 + -3904.348144531 diff --git a/10_ElsaQueen/Elsa Queen.act b/10_ElsaQueen/Elsa Queen.act index 02f5170..7935364 100644 Binary files a/10_ElsaQueen/Elsa Queen.act and b/10_ElsaQueen/Elsa Queen.act differ diff --git a/10_ElsaQueen/Material/ElsaQueen5.png b/10_ElsaQueen/Material/ElsaQueen5.png index 9d64ed8..cd1e3c3 100644 Binary files a/10_ElsaQueen/Material/ElsaQueen5.png and b/10_ElsaQueen/Material/ElsaQueen5.png differ diff --git a/_Startup/05_BallPool_8M.bat b/_Startup/05_BallPool_8M.bat index 0c6f961..6afc5ad 100644 --- a/_Startup/05_BallPool_8M.bat +++ b/_Startup/05_BallPool_8M.bat @@ -5,7 +5,7 @@ start "" "%root%\%device%\ucURGCalibration\ucURGCalibration.exe" timeout /t 8 start "" "%root%\%device%\ofxCCVApp\ofxCCVApp.exe" timeout /t 8 -CD "%root%\%device%\UnityBuild-19050-05_BallPool_8M\Build" +CD "%root%\%device%\UnityBuild-20038-05_BallPool_8M\Build" start "" "Unity_2018_Frozen.exe" timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe"