From bd48e5dc45f2d9d652dcc686bf40d8fa79c5da16 Mon Sep 17 00:00:00 2001
From: Frozen2-Deveoper <tech@ultracombos.com>
Date: Fri, 20 Dec 2019 10:16:12 +0800
Subject: [PATCH] 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 @@
 		<IsEnableMessage>true</IsEnableMessage>
 		<IsMessageAutoGone>true</IsMessageAutoGone>
 	</Settings4ofxImGuiParameter>
-	<fps>60.9183</fps>
-	<graphic IsOpen="false">
+	<fps>59.9775</fps>
+	<graphic IsOpen="true">
 		<framerate>60</framerate>
 		<vsync>true</vsync>
 		<hidden_cursor>false</hidden_cursor>
 		<app_size>
-			<X>1024</X>
-			<Y>768</Y>
+			<X>977</X>
+			<Y>603</Y>
 		</app_size>
 		<fbo_size>
-			<X>1024</X>
-			<Y>768</Y>
+			<X>1920</X>
+			<Y>1080</Y>
 		</fbo_size>
-		<draw_to_screen>true</draw_to_screen>
+		<draw_to_screen>false</draw_to_screen>
 		<fullscreen>false</fullscreen>
 		<fbo_fit_mov>true</fbo_fit_mov>
-		<app_fit_fbo>true</app_fit_fbo>
+		<app_fit_fbo>false</app_fit_fbo>
 		<app_clear_color PixelType="U8">
 			<R>0</R>
 			<G>0</G>
@@ -41,12 +41,12 @@
 			<A>255</A>
 		</fbo_clear_color>
 	</graphic>
-	<spout IsOpen="false">
-		<enable>false</enable>
+	<spout IsOpen="true">
+		<enable>true</enable>
 		<sender_name>EasyVideoPlayer</sender_name>
 	</spout>
 	<movie IsOpen="true">
-		<path>movie/demo.avi</path>
+		<path>../../Material/6-SylphOlaf_hap_sound.avi</path>
 		<is_abs>false</is_abs>
 		<is_loop>true</is_loop>
 		<volume>1</volume>
@@ -54,9 +54,24 @@
 		<tile IsOpen="false">
 			<enable_horizontal>false</enable_horizontal>
 		</tile>
+	<offset>
+			<X>0</X>
+			<Y>0</Y>
+		</offset>
+		<crop IsOpen="false">
+			<enable_crop>false</enable_crop>
+			<offset>
+				<X>0</X>
+				<Y>0</Y>
+			</offset>
+			<size>
+				<X>0</X>
+				<Y>0</Y>
+			</size>
+		</crop>
 	</movie>
-	<bgm IsOpen="false">
-		<path>sound/demo.mp3</path>
+	<bgm IsOpen="true">
+		<path/>
 		<is_stream>true</is_stream>
 		<is_loop>true</is_loop>
 		<volume>1</volume>
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 @@
 <V_SYNC>1</V_SYNC>
 <FLIP_Y>0</FLIP_Y>
 <TARGET_FPS>60</TARGET_FPS>
-<X>2177.000000000</X>
-<Y>126.000000000</Y>
+<X>248.000000000</X>
+<Y>135.000000000</Y>
 <W>1280.000000000</W>
 <H>960.000000000</H>
 <HOMO>
     <ROI>
         <X>0.000000000</X>
         <Y>0.000000000</Y>
-        <W>0.333333343</W>
+        <W>1.000000000</W>
         <H>1.000000000</H>
     </ROI>
     <HALF_LEFT_OVERLAP>0.000000000</HALF_LEFT_OVERLAP>
@@ -36,124 +36,26 @@
         <POINT>
             <SRC_X>0.000000000</SRC_X>
             <SRC_Y>0.000000000</SRC_Y>
-            <DST_X>0.000694444</DST_X>
-            <DST_Y>0.012500000</DST_Y>
+            <DST_X>0.045312501</DST_X>
+            <DST_Y>0.003333333</DST_Y>
         </POINT>
         <POINT>
             <SRC_X>1.000000000</SRC_X>
             <SRC_Y>0.000000000</SRC_Y>
-            <DST_X>0.328645825</DST_X>
-            <DST_Y>0.002500000</DST_Y>
+            <DST_X>0.961458325</DST_X>
+            <DST_Y>0.010833334</DST_Y>
         </POINT>
         <POINT>
             <SRC_X>0.000000000</SRC_X>
             <SRC_Y>1.000000000</SRC_Y>
-            <DST_X>0.000347221</DST_X>
-            <DST_Y>0.996666789</DST_Y>
+            <DST_X>0.041666668</DST_X>
+            <DST_Y>0.988333464</DST_Y>
         </POINT>
         <POINT>
             <SRC_X>1.000000000</SRC_X>
             <SRC_Y>1.000000000</SRC_Y>
-            <DST_X>0.328993082</DST_X>
-            <DST_Y>0.970833361</DST_Y>
-        </POINT>
-    </CONTROL_POINT>
-</HOMO>
-<HOMO>
-    <ROI>
-        <X>0.333333343</X>
-        <Y>0.000000000</Y>
-        <W>0.333333343</W>
-        <H>1.000000000</H>
-    </ROI>
-    <HALF_LEFT_OVERLAP>0.000000000</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>
-    <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.338020831</DST_X>
-            <DST_Y>0.007500000</DST_Y>
-        </POINT>
-        <POINT>
-            <SRC_X>1.000000000</SRC_X>
-            <SRC_Y>0.000000000</SRC_Y>
-            <DST_X>0.664409697</DST_X>
-            <DST_Y>0.012499994</DST_Y>
-        </POINT>
-        <POINT>
-            <SRC_X>0.000000000</SRC_X>
-            <SRC_Y>1.000000000</SRC_Y>
-            <DST_X>0.338715285</DST_X>
-            <DST_Y>0.959166646</DST_Y>
-        </POINT>
-        <POINT>
-            <SRC_X>1.000000000</SRC_X>
-            <SRC_Y>1.000000000</SRC_Y>
-            <DST_X>0.661631942</DST_X>
-            <DST_Y>0.933333337</DST_Y>
-        </POINT>
-    </CONTROL_POINT>
-</HOMO>
-<HOMO>
-    <ROI>
-        <X>0.666666687</X>
-        <Y>0.000000000</Y>
-        <W>0.333333313</W>
-        <H>1.000000000</H>
-    </ROI>
-    <HALF_LEFT_OVERLAP>0.000000000</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>
-    <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.673263907</DST_X>
-            <DST_Y>0.010000000</DST_Y>
-        </POINT>
-        <POINT>
-            <SRC_X>1.000000000</SRC_X>
-            <SRC_Y>0.000000000</SRC_Y>
-            <DST_X>0.995312512</DST_X>
-            <DST_Y>0.005833333</DST_Y>
-        </POINT>
-        <POINT>
-            <SRC_X>0.000000000</SRC_X>
-            <SRC_Y>1.000000000</SRC_Y>
-            <DST_X>0.671701372</DST_X>
-            <DST_Y>0.984166682</DST_Y>
-        </POINT>
-        <POINT>
-            <SRC_X>1.000000000</SRC_X>
-            <SRC_Y>1.000000000</SRC_Y>
-            <DST_X>0.997742951</DST_X>
-            <DST_Y>0.959166646</DST_Y>
+            <DST_X>0.951041460</DST_X>
+            <DST_Y>0.986666679</DST_Y>
         </POINT>
     </CONTROL_POINT>
 </HOMO>
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>
-    <NAME>Spout Camera</NAME>
+    <NAME>EasyVideoPlayer</NAME>
 </SPOUT>