Merge branch '2020_12_Taipei' of http://nas.ultracombos.com:3400/19050-Frozen2/Deploy-19050-Frozen2-PC into 2020_12_Taipei

05_BallPool/ofxCCVApp/data/AR.xml

@@ -1,8 +1,8 @@
 <ofxImGuiParameter>
 	<Settings4ofxImGuiParameter>
 		<PosAndSize>
-			<X>541</X>
+			<X>276</X>
-			<Y>104</Y>
+			<Y>98</Y>
 			<Width>378</Width>
 			<Height>467</Height>
 		</PosAndSize>

05_BallPool/ofxCCVApp/data/settings.xml

@@ -1,8 +1,8 @@
 <ofxImGuiParameter>
 	<Settings4ofxImGuiParameter>
 		<PosAndSize>
-			<X>741</X>
+			<X>702</X>
-			<Y>37</Y>
+			<Y>32</Y>
 			<Width>396</Width>
 			<Height>781</Height>
 		</PosAndSize>
@@ -24,10 +24,10 @@
 	<flip_horizontally>false</flip_horizontally>
 		<flip_vertically>false</flip_vertically>
 	<hotarea_2d_blb>
-			<X>0.05</X>
+			<X>0</X>
-			<Y>0.05</Y>
+			<Y>0</Y>
-			<Width>0.9</Width>
+			<Width>1</Width>
-			<Height>0.9</Height>
+			<Height>1</Height>
 		</hotarea_2d_blb>
 		<hotarea_2d_obj>
 			<X>0</X>
@@ -41,12 +41,12 @@
 		<Max_Size>86</Max_Size>
 		<Hole>false</Hole>
 	</Contour_Finder>
-	<Blob_Tracker IsOpen="false">
+	<Blob_Tracker IsOpen="true">
 		<position_smooth>0</position_smooth>
 		<size_smooth>0</size_smooth>
 		<angle_smooth>0</angle_smooth>
 	</Blob_Tracker>
-	<Blob_Tracker_2Dobj IsOpen="false">
+	<Blob_Tracker_2Dobj IsOpen="true">
 		<position_smooth>0</position_smooth>
 		<size_smooth>0</size_smooth>
 		<angle_smooth>0</angle_smooth>
@@ -97,7 +97,7 @@
 	</Tester>
 	<app_size>
 		<X>1280</X>
-		<Y>657</Y>
+		<Y>835</Y>
 	</app_size>
 <vertical_sync>true</vertical_sync>
 	<fps_limitation>60</fps_limitation>

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
 

05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml

@@ -1,6 +1,6 @@
 <MONITOR_MODE>0</MONITOR_MODE>
 <LOCK_HOTKEY>0</LOCK_HOTKEY>
-<MULTI_WIN_FULL_SCREEN>0</MULTI_WIN_FULL_SCREEN>
+<MULTI_WIN_FULL_SCREEN>1</MULTI_WIN_FULL_SCREEN>
 <FULL_SCREEN>1</FULL_SCREEN>
 <HIDE_CURSOR_ON_FULL_SCREEN>0</HIDE_CURSOR_ON_FULL_SCREEN>
 <V_SYNC>1</V_SYNC>
@@ -14,10 +14,71 @@
     <ROI>
         <X>0.214285716</X>
         <Y>0.000000000</Y>
-        <W>0.571428597</W>
+        <W>0.285714298</W>
-        <H>0.337500006</H>
+        <H>0.333611280</H>
     </ROI>
     <HALF_LEFT_OVERLAP>0.000000000</HALF_LEFT_OVERLAP>
+    <HALF_RIGHT_OVERLAP>0.119999997</HALF_RIGHT_OVERLAP>
+    <HALF_BOTTOM_OVERLAP>0.000000000</HALF_BOTTOM_OVERLAP>
+    <HALF_TOP_OVERLAP>0.000000000</HALF_TOP_OVERLAP>
+    <COLOR_KEYS>
+        <LEFT_COLOR_KEYS count="5">1 0.75 0.5 0.25 0 </LEFT_COLOR_KEYS>
+        <RIGHT_COLOR_KEYS count="5">1 0.75 0.5 0.25 0 </RIGHT_COLOR_KEYS>
+        <BOTTOM_COLOR_KEYS count="5">1 0.75 0.5 0.25 0 </BOTTOM_COLOR_KEYS>
+        <TOP_COLOR_KEYS count="5">1 0.75 0.5 0.25 0 </TOP_COLOR_KEYS>
+    </COLOR_KEYS>
+    <IS_CTRL_PNT_REARRANGED_BY_HOMO>1</IS_CTRL_PNT_REARRANGED_BY_HOMO>
+    <TEX_ROWS>25</TEX_ROWS>
+    <TEX_COLS>25</TEX_COLS>
+    <ROWS>1</ROWS>
+    <COLS>1</COLS>
+    <CONTROL_POINT>
+        <POINT>
+            <SRC_X>0.000000000</SRC_X>
+            <SRC_Y>0.000000000</SRC_Y>
+            <DST_X>0.005208333</DST_X>
+            <DST_Y>0.003333324</DST_Y>
+        </POINT>
+        <POINT>
+            <SRC_X>0.892857134</SRC_X>
+            <SRC_Y>0.000000000</SRC_Y>
+            <DST_X>0.408593833</DST_X>
+            <DST_Y>0.017500002</DST_Y>
+        </POINT>
+        <POINT>
+            <SRC_X>1.000000000</SRC_X>
+            <SRC_Y>0.000000000</SRC_Y>
+            <DST_X>0.456906617</DST_X>
+            <DST_Y>0.019196721</DST_Y>
+        </POINT>
+        <POINT>
+            <SRC_X>0.000000000</SRC_X>
+            <SRC_Y>1.000000000</SRC_Y>
+            <DST_X>0.001822916</DST_X>
+            <DST_Y>0.974166691</DST_Y>
+        </POINT>
+        <POINT>
+            <SRC_X>0.892857134</SRC_X>
+            <SRC_Y>1.000000000</SRC_Y>
+            <DST_X>0.405468762</DST_X>
+            <DST_Y>0.986666739</DST_Y>
+        </POINT>
+        <POINT>
+            <SRC_X>1.000000000</SRC_X>
+            <SRC_Y>1.000000000</SRC_Y>
+            <DST_X>0.453812659</DST_X>
+            <DST_Y>0.988163888</DST_Y>
+        </POINT>
+    </CONTROL_POINT>
+</HOMO>
+<HOMO>
+    <ROI>
+        <X>0.500000000</X>
+        <Y>0.000000000</Y>
+        <W>0.285714298</W>
+        <H>0.337776184</H>
+    </ROI>
+    <HALF_LEFT_OVERLAP>0.119999997</HALF_LEFT_OVERLAP>
     <HALF_RIGHT_OVERLAP>0.000000000</HALF_RIGHT_OVERLAP>
     <HALF_BOTTOM_OVERLAP>0.000000000</HALF_BOTTOM_OVERLAP>
     <HALF_TOP_OVERLAP>0.000000000</HALF_TOP_OVERLAP>
@@ -36,26 +97,38 @@
         <POINT>
             <SRC_X>0.000000000</SRC_X>
             <SRC_Y>0.000000000</SRC_Y>
-            <DST_X>0.036458332</DST_X>
+            <DST_X>0.543883562</DST_X>
-            <DST_Y>0.039166667</DST_Y>
+            <DST_Y>0.006124708</DST_Y>
+        </POINT>
+        <POINT>
+            <SRC_X>0.107142851</SRC_X>
+            <SRC_Y>0.000000000</SRC_Y>
+            <DST_X>0.590624988</DST_X>
+            <DST_Y>0.005833333</DST_Y>
         </POINT>
         <POINT>
             <SRC_X>1.000000000</SRC_X>
             <SRC_Y>0.000000000</SRC_Y>
-            <DST_X>0.928645849</DST_X>
+            <DST_X>0.991666555</DST_X>
-            <DST_Y>0.018703705</DST_Y>
+            <DST_Y>0.003333333</DST_Y>
         </POINT>
         <POINT>
             <SRC_X>0.000000000</SRC_X>
             <SRC_Y>1.000000000</SRC_Y>
-            <DST_X>0.042187501</DST_X>
+            <DST_X>0.542886555</DST_X>
-            <DST_Y>0.884074092</DST_Y>
+            <DST_Y>0.966448486</DST_Y>
+        </POINT>
+        <POINT>
+            <SRC_X>0.107142851</SRC_X>
+            <SRC_Y>1.000000000</SRC_Y>
+            <DST_X>0.590364575</DST_X>
+            <DST_Y>0.969166696</DST_Y>
         </POINT>
         <POINT>
             <SRC_X>1.000000000</SRC_X>
             <SRC_Y>1.000000000</SRC_Y>
-            <DST_X>0.930729151</DST_X>
+            <DST_X>0.997916520</DST_X>
-            <DST_Y>0.881296277</DST_Y>
+            <DST_Y>0.992500007</DST_Y>
         </POINT>
     </CONTROL_POINT>
 </HOMO>

05_BallPool/ucURGCalibration/data/settings.xml

@@ -1,5 +1,5 @@
 <ucURGCalibration>
-	<Fbo_Size>490, 328</Fbo_Size>
+	<Fbo_Size>800, 300</Fbo_Size>
 	<urg_0_pos>0, 0</urg_0_pos>
 <ucURGCalibration/>
 </ucURGCalibration>

05_BallPool/ucURGCalibration/data/settings/urg_0.xml

@@ -19,8 +19,8 @@
 		<ROI>0, 0, 0, 1, 1</ROI>
 	</Homography>
 	<Blob_Viewer>
-		<Fbo_Width>490</Fbo_Width>
+		<Fbo_Width>800</Fbo_Width>
-		<Fbo_Height>328</Fbo_Height>
+		<Fbo_Height>300</Fbo_Height>
 		<Strength>0.122449</Strength>
 		<Radius>25.5102</Radius>
 		<Threshold>0.5</Threshold>

05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml

@@ -1,18 +1,18 @@
 <CALIBRATION_DATA>
     <PT_PAIR>
-        <SRC_X>392.306030273</SRC_X>
+        <SRC_X>93.408325195</SRC_X>
-        <SRC_Y>-2830.184326172</SRC_Y>
+        <SRC_Y>-3923.029052734</SRC_Y>
     </PT_PAIR>
     <PT_PAIR>
-        <SRC_X>326.922851563</SRC_X>
+        <SRC_X>56.046630859</SRC_X>
-        <SRC_Y>2167.005615234</SRC_Y>
+        <SRC_Y>3960.392578125</SRC_Y>
     </PT_PAIR>
     <PT_PAIR>
-        <SRC_X>3222.492919922</SRC_X>
+        <SRC_X>3035.681640625</SRC_X>
-        <SRC_Y>2307.114257813</SRC_Y>
+        <SRC_Y>3988.414550781</SRC_Y>
     </PT_PAIR>
     <PT_PAIR>
-        <SRC_X>3250.513427734</SRC_X>
+        <SRC_X>3101.064697266</SRC_X>
-        <SRC_Y>-3045.017578125</SRC_Y>
+        <SRC_Y>-3904.348144531</SRC_Y>
     </PT_PAIR>
 </CALIBRATION_DATA>

_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"