From 04bb7153ea1639f49301eb0f3dfe9f246f49c07b Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Tue, 15 Dec 2020 12:09:16 +0800 Subject: [PATCH 1/2] [05_BallPool] Updated the settings. --- 05_BallPool/ofxCCVApp/data/AR.xml | 4 +- 05_BallPool/ofxCCVApp/data/settings.xml | 18 ++-- 05_BallPool/ofxCCVApp/imgui.ini | 4 +- .../data/settings/homo_setting.xml | 95 ++++++++++++++++--- .../ucURGCalibration/data/settings.xml | 2 +- .../ucURGCalibration/data/settings/urg_0.xml | 4 +- .../data/settings/urg_homo_0.xml | 16 ++-- _Startup/05_BallPool_8M.bat | 2 +- _Utils/create_auto_shutdown.bat | 2 +- 9 files changed, 110 insertions(+), 37 deletions(-) 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/_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" diff --git a/_Utils/create_auto_shutdown.bat b/_Utils/create_auto_shutdown.bat index 043df81..0161bb6 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 22:00 +SCHTASKS /CREATE /SC DAILY /TN "auto_shutdown" /TR "SHUTDOWN /P /F" /ST 21:00 PAUSE From 6d9a860034353fe4cad5e64679d0f0546b23ace4 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Mon, 25 Jan 2021 10:28:58 +0800 Subject: [PATCH 2/2] ELSA QUEEN updated. --- 10_ElsaQueen/Elsa Queen.act | Bin 415 -> 571 bytes 10_ElsaQueen/Material/ElsaQueen5.png | Bin 779 -> 647 bytes _Utils/create_auto_shutdown.bat | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/10_ElsaQueen/Elsa Queen.act b/10_ElsaQueen/Elsa Queen.act index 02f51705e034b6f633156f1a9489b3d55d900780..793536468a13c462489c96606d57d7305d579781 100644 GIT binary patch delta 200 zcmW-bxeftg6otP(Lq$oWK%y0ih=S5mC^STn5V3|}{;?+-uR!JjJcHW9ab}ux&pk`- zeLLUCGZ8BjCyD_EuT1h$r^<*PCzc$A0pD>JpHj!NXC@5vh7u>X@+_YA77I4G%4KQG zbGZw5kDXaxyQD5_ z)OU6F?5>lDWSoORo_90glBoL1vYUrO5lI7jMC2Br*bj=LOE_lzLYC=&X^&Pm-Hkdj^kp_NClE@v9Me zd0xpFd59)_MEn7WwJa*OPaHnXG9mT#x24jDbz}bGQAOwl+)6)#WAZvKkF&ag@3-5X|I^V?b~ zh(-MJdO}lg6O9-$&gwhpOuUJhq0PsyFoz5jn>nOz7ouUkta(r00#D?iUS16! zVZ=Od*ehpzgbr%V9T-jRx7X5T7Ge;`TCsT)3;+_DtB1DsAc6aw$mHf=yP!`6gRr8# z1Q&$uTREW9r+*5(jndAvp{+Gr*?E)ZP}2$8SV!(ggmr?r1URYIwX|bT19L?F01e{Y Ucjyy&ApigX07*qoM6N<$f{9Q1SpWb4 delta 666 zcmV;L0%iS&1&aodF_BhJe*$$$L_t(Y4UJT}ZWKWfty!61u`KNZiQ#YfAVR0aPWd1b z{sku-mJrVD<{j0?&aq2tXS%xTy;nz%cKY`DrF{Pp!RO&8c0E%(;QZ$)F0Px`5w~yo zl=$$@_IvFm_HRl&K9%_WH?U8+BhTZu?Cl}qurG1Ep5kyFafJQ>f6uF%UHn2lA3yCx zzP~FmO%ZqZcwv40@*Kx~#8uG|Z$|lWmBJrZo@t(478e{8uoGQ%I@!AYJhv2AEsju& zYF*QQLQb^cn5GgtdtG<|f)5*+YIEjqzAdUQECmPH!ZTKNtecH*s*N*sE!2{lW@KH` zt6q~rGWvFzTN~jne_%e3Mq3!I?`mMLY`f}!NJUJAEo2rBHIiEE6jgh|W9|4LT|gZ` zyP*^4r32Wg)RXkyZ-!i|GkW=koWH`&Yg*DlOiLBl19lHfpPUGc<1u*-9(Xg8NOBq@ z?S4yYGg(a9kTWG8TYd|}+3}8zxKYBx+6g3brRHJ8p0PD|e^6Rew0Rqp!Kydzok_Dp;tg_U_G!$+lM2F=Wim z2;u%y=OG=05_mZ^kyuJ9cH`7U47n!UnGI>1xc*L9$78hlKgVP~`aAv~YK!NvjBp8}`Bkki@v-_$}&os(qtyp5U+L^MF0Q*07*qoM6N<$g7x`C AZ~y=R diff --git a/_Utils/create_auto_shutdown.bat b/_Utils/create_auto_shutdown.bat index 0161bb6..d6057f4 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 21:00 +SCHTASKS /CREATE /SC DAILY /TN "auto_shutdown" /TR "SHUTDOWN /P /F" /ST 20:00 PAUSE