diff --git a/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/.gitkeep b/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/.gitkeep deleted file mode 100644 index 0e8c54b..0000000 --- a/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -#gitkeep file diff --git a/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings.json b/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings.json new file mode 100644 index 0000000..03c145f --- /dev/null +++ b/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings.json @@ -0,0 +1,256 @@ +{ + "properties": [ + { + "type": 4, + "key": "MainCamera.cam_x", + "value": "0.7", + "range": { + "x": -5.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "MainCamera.cam_y", + "value": "6", + "range": { + "x": 5.0, + "y": 10.0 + } + }, + { + "type": 4, + "key": "MainCamera.key_movement", + "value": "0.1", + "range": { + "x": 0.05000000074505806, + "y": 0.5 + } + }, + { + "type": 2, + "key": "iceVFX.lifetime", + "value": "5", + "range": { + "x": 1.0, + "y": 10.0 + } + }, + { + "type": 2, + "key": "iceVFX.ground_ice_spawn_rate", + "value": "0", + "range": { + "x": 0.0, + "y": 60000.0 + } + }, + { + "type": 2, + "key": "iceVFX.ground_flake_spawn_rate", + "value": "86", + "range": { + "x": 0.0, + "y": 10000.0 + } + }, + { + "type": 2, + "key": "iceVFX.flying_flake_spawn_rate", + "value": "1000", + "range": { + "x": 100.0, + "y": 3000.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_frost_size", + "value": "0.3", + "range": { + "x": 0.10000000149011612, + "y": 0.800000011920929 + } + }, + { + "type": 4, + "key": "iceVFX.max_frost_size", + "value": "0.5", + "range": { + "x": 0.30000001192092898, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_spike_size", + "value": "0.337", + "range": { + "x": 0.009999999776482582, + "y": 0.5 + } + }, + { + "type": 4, + "key": "iceVFX.max_spike_size", + "value": "0.689", + "range": { + "x": 0.10000000149011612, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_flake_size", + "value": "0.6406204", + "range": { + "x": 0.0, + "y": 3.0 + } + }, + { + "type": 4, + "key": "iceVFX.max_flake_size", + "value": "1.250328", + "range": { + "x": 0.5, + "y": 3.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_flying_flake_size", + "value": "0", + "range": { + "x": 0.0, + "y": 0.10000000149011612 + } + }, + { + "type": 4, + "key": "iceVFX.max_flying_flake_size", + "value": "0.1", + "range": { + "x": 0.05000000074505806, + "y": 0.30000001192092898 + } + }, + { + "type": 4, + "key": "iceVFX.ground_post_alpha", + "value": "0", + "range": { + "x": -1.0, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.flake_alpha", + "value": "1", + "range": { + "x": 0.0, + "y": 1.0 + } + }, + { + "type": 3, + "key": "SceneController.debugMode", + "value": "False", + "range": { + "x": 0.0, + "y": 0.0 + } + }, + { + "type": 4, + "key": "SceneController.Emitter_x", + "value": "3.5", + "range": { + "x": 0.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "SceneController.Target_x", + "value": "-3", + "range": { + "x": -5.0, + "y": 0.0 + } + }, + { + "type": 4, + "key": "SceneController.growing_speed", + "value": "0.008", + "range": { + "x": 0.0, + "y": 0.05000000074505806 + } + }, + { + "type": 2, + "key": "SceneController.delay_sec", + "value": "2", + "range": { + "x": 0.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "PostProcess.post_exposure", + "value": "1.240333", + "range": { + "x": -2.0, + "y": 2.0 + } + }, + { + "type": 4, + "key": "PostProcess.contrast", + "value": "100", + "range": { + "x": -100.0, + "y": 100.0 + } + }, + { + "type": 4, + "key": "PostProcess.saturation", + "value": "60.31277", + "range": { + "x": -100.0, + "y": 100.0 + } + }, + { + "type": 4, + "key": "PostProcess.bloom_intensity", + "value": "1", + "range": { + "x": 0.0, + "y": 3.0 + } + }, + { + "type": 4, + "key": "PostProcess.bloom_threshold", + "value": "0.6", + "range": { + "x": 0.0, + "y": 1.0 + } + }, + { + "type": 4, + "key": "PostProcess.vignette_intensity", + "value": "0.3", + "range": { + "x": 0.0, + "y": 1.0 + } + } + ] +} \ No newline at end of file diff --git a/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml b/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml index b8b5c05..e40559c 100644 --- a/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml +++ b/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml @@ -1,20 +1,20 @@ - 169.093368530 - 204.093383789 + 116.093368530 + 45.093383789 - 268.906646729 - 203.093383789 + 438.906646729 + 33.000000000 - 279.906616211 - 294.906646729 + 434.906616211 + 363.906646729 - 168.093368530 - 293.906616211 + 133.093368530 + 326.906616211 diff --git a/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml b/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml index f9ba333..4382756 100644 --- a/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml +++ b/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml @@ -7,8 +7,8 @@ 20 1 1 - -5, -5, 0.408163 - 5, 5, 1.63265 + -5, -5, 0.489796 + 5, 5, 3.59184 5 0.2 diff --git a/01_ForstCoronation/ofxKinectV2TouchApp/data/settings.xml b/01_ForstCoronation/ofxKinectV2TouchApp/data/settings.xml index 37ba83e..6a7fc38 100644 --- a/01_ForstCoronation/ofxKinectV2TouchApp/data/settings.xml +++ b/01_ForstCoronation/ofxKinectV2TouchApp/data/settings.xml @@ -24,7 +24,7 @@ 127.0.0.1 - 12345 + 3333 false false @@ -80,7 +80,7 @@ - ofxKinectV2TouchApp + false diff --git a/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml b/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml index f7853be..aad8be5 100644 --- a/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -1,13 +1,13 @@ -0 +1 0 1 -1 -1 +0 +0 1 0 60 -1143.000000000 -62.000000000 +234.000000000 +112.000000000 1280.000000000 745.000000000 @@ -36,19 +36,19 @@ 0.000000000 0.000000000 - 0.002929688 - -0.497395903 + 0.002148234 + -0.497786552 1.000000000 0.000000000 1.000488281 - -0.500651121 + -0.501044810 0.000000000 0.333333343 - 0.002929688 + 0.002408855 0.001302082 diff --git a/01_ForstCoronation/ucProjectionMappingUI/data/settings/spout_settings.xml b/01_ForstCoronation/ucProjectionMappingUI/data/settings/spout_settings.xml index 84dce78..3384dd0 100644 --- a/01_ForstCoronation/ucProjectionMappingUI/data/settings/spout_settings.xml +++ b/01_ForstCoronation/ucProjectionMappingUI/data/settings/spout_settings.xml @@ -1,3 +1,3 @@ - AntManSender + UnitySpout diff --git a/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/settings_config.json b/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/settings_config.json new file mode 100644 index 0000000..04fabb5 --- /dev/null +++ b/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/settings_config.json @@ -0,0 +1,22 @@ +{ + "properties": [ + { + "type": 2, + "key": "Misc.language", + "value": "1", + "range": { + "x": 0.0, + "y": 7.0 + } + }, + { + "type": 3, + "key": "Misc.isTaiwanNo1", + "value": "False", + "range": { + "x": 0.0, + "y": 0.0 + } + } + ] +} \ No newline at end of file diff --git a/04_IceSlide/ofxKinectV2TouchApp/data/corners.xml b/04_IceSlide/ofxKinectV2TouchApp/data/corners.xml index b8b5c05..f89f9ae 100644 --- a/04_IceSlide/ofxKinectV2TouchApp/data/corners.xml +++ b/04_IceSlide/ofxKinectV2TouchApp/data/corners.xml @@ -1,20 +1,20 @@ - 169.093368530 - 204.093383789 + 54.093368530 + 136.093383789 - 268.906646729 - 203.093383789 + 445.906646729 + 143.093383789 - 279.906616211 - 294.906646729 + 443.906616211 + 316.906646729 - 168.093368530 - 293.906616211 + 51.093368530 + 319.906616211 diff --git a/04_IceSlide/ofxKinectV2TouchApp/data/kinect2.xml b/04_IceSlide/ofxKinectV2TouchApp/data/kinect2.xml index f9ba333..4d99d57 100644 --- a/04_IceSlide/ofxKinectV2TouchApp/data/kinect2.xml +++ b/04_IceSlide/ofxKinectV2TouchApp/data/kinect2.xml @@ -4,11 +4,11 @@ 0 256 256 - 20 + 49.555 1 1 - -5, -5, 0.408163 - 5, 5, 1.63265 + -5, -5, 0.163265 + 5, 5, 2.12245 5 0.2 diff --git a/04_IceSlide/ofxKinectV2TouchApp/data/settings.xml b/04_IceSlide/ofxKinectV2TouchApp/data/settings.xml index 37ba83e..251766a 100644 --- a/04_IceSlide/ofxKinectV2TouchApp/data/settings.xml +++ b/04_IceSlide/ofxKinectV2TouchApp/data/settings.xml @@ -2,7 +2,7 @@ 37 - 21 + 20 320 640 @@ -24,7 +24,7 @@ 127.0.0.1 - 12345 + 3333 false false @@ -80,7 +80,7 @@ - ofxKinectV2TouchApp + false diff --git a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml index 1c80c45..05e29df 100644 --- a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -2,19 +2,19 @@ 0 0 1 -0 +1 1 0 60 -2177.000000000 -126.000000000 +1124.000000000 +226.000000000 1280.000000000 960.000000000 0.000000000 0.000000000 - 0.333333343 + 1.000000000 1.000000000 0.000000000 @@ -36,124 +36,26 @@ 0.000000000 0.000000000 - 0.000694444 - 0.012500000 + 0.023958333 + 0.055833332 1.000000000 0.000000000 - 0.328645825 - 0.002500000 + 0.945312500 + 0.105833337 0.000000000 1.000000000 - 0.000347221 - 0.996666789 + 0.020833334 + 0.814166665 1.000000000 1.000000000 - 0.328993082 - 0.970833361 - - - - - - 0.333333343 - 0.000000000 - 0.333333343 - 1.000000000 - - 0.000000000 - 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 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.338020831 - 0.007500000 - - - 1.000000000 - 0.000000000 - 0.664409697 - 0.012499994 - - - 0.000000000 - 1.000000000 - 0.338715285 - 0.959166646 - - - 1.000000000 - 1.000000000 - 0.661631942 - 0.933333337 - - - - - - 0.666666687 - 0.000000000 - 0.333333313 - 1.000000000 - - 0.000000000 - 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 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.673263907 - 0.010000000 - - - 1.000000000 - 0.000000000 - 0.995312512 - 0.005833333 - - - 0.000000000 - 1.000000000 - 0.671701372 - 0.984166682 - - - 1.000000000 - 1.000000000 - 0.997742951 - 0.959166646 + 0.937500000 + 0.794166684 diff --git a/04_IceSlide/ucProjectionMappingUI/data/settings/spout_settings.xml b/04_IceSlide/ucProjectionMappingUI/data/settings/spout_settings.xml index 0a0adff..2cb5624 100644 --- a/04_IceSlide/ucProjectionMappingUI/data/settings/spout_settings.xml +++ b/04_IceSlide/ucProjectionMappingUI/data/settings/spout_settings.xml @@ -1,3 +1,3 @@ - Spout Camera + Main diff --git a/05_BallPool/UnityBuild-19050-05_BallPool/Material/.gitkeep b/05_BallPool/UnityBuild-19050-05_BallPool/Material/.gitkeep deleted file mode 100644 index 0e8c54b..0000000 --- a/05_BallPool/UnityBuild-19050-05_BallPool/Material/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -#gitkeep file diff --git a/05_BallPool/ofxCCVApp/data/settings.xml b/05_BallPool/ofxCCVApp/data/settings.xml index 6538280..f3f7374 100644 --- a/05_BallPool/ofxCCVApp/data/settings.xml +++ b/05_BallPool/ofxCCVApp/data/settings.xml @@ -1,8 +1,8 @@ - 187 - 36 + 741 + 37 396 781 @@ -36,9 +36,9 @@ 1 - + 8 - 121 + 86 false @@ -51,7 +51,7 @@ 0 0 - + false false @@ -61,12 +61,12 @@ true - 12 + 6 true - 21 - 6 + 39 + 2 true diff --git a/05_BallPool/ofxCCVApp/imgui.ini b/05_BallPool/ofxCCVApp/imgui.ini index 3b47927..7930ff0 100644 --- a/05_BallPool/ofxCCVApp/imgui.ini +++ b/05_BallPool/ofxCCVApp/imgui.ini @@ -4,7 +4,7 @@ Size=400,400 Collapsed=0 [Window][Settings] -Pos=-111,13 +Pos=741,37 Size=396,781 Collapsed=0 diff --git a/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml b/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml index 1c80c45..94f4428 100644 --- a/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -6,16 +6,16 @@ 1 0 60 -2177.000000000 -126.000000000 +185.000000000 +145.000000000 1280.000000000 960.000000000 - 0.000000000 + 0.221157864 0.000000000 - 0.333333343 - 1.000000000 + 0.329446077 + 0.329446077 0.000000000 0.000000000 @@ -36,124 +36,26 @@ 0.000000000 0.000000000 - 0.000694444 - 0.012500000 + 0.057291668 + 0.014166667 1.000000000 0.000000000 - 0.328645825 - 0.002500000 + 0.906250000 + 0.006666667 0.000000000 1.000000000 - 0.000347221 - 0.996666789 + 0.088541664 + 0.834999979 1.000000000 1.000000000 - 0.328993082 - 0.970833361 - - - - - - 0.333333343 - 0.000000000 - 0.333333343 - 1.000000000 - - 0.000000000 - 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 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.338020831 - 0.007500000 - - - 1.000000000 - 0.000000000 - 0.664409697 - 0.012499994 - - - 0.000000000 - 1.000000000 - 0.338715285 - 0.959166646 - - - 1.000000000 - 1.000000000 - 0.661631942 - 0.933333337 - - - - - - 0.666666687 - 0.000000000 - 0.333333313 - 1.000000000 - - 0.000000000 - 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 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.673263907 - 0.010000000 - - - 1.000000000 - 0.000000000 - 0.995312512 - 0.005833333 - - - 0.000000000 - 1.000000000 - 0.671701372 - 0.984166682 - - - 1.000000000 - 1.000000000 - 0.997742951 - 0.959166646 + 0.887499988 + 0.826666653 diff --git a/05_BallPool/ucProjectionMappingUI/data/settings/spout_settings.xml b/05_BallPool/ucProjectionMappingUI/data/settings/spout_settings.xml index 0a0adff..415ab8c 100644 --- a/05_BallPool/ucProjectionMappingUI/data/settings/spout_settings.xml +++ b/05_BallPool/ucProjectionMappingUI/data/settings/spout_settings.xml @@ -1,3 +1,3 @@ - Spout Camera + Spout Sender diff --git a/05_BallPool/ucURGCalibration/data/settings.xml b/05_BallPool/ucURGCalibration/data/settings.xml index 3a649eb..0201ebb 100644 --- a/05_BallPool/ucURGCalibration/data/settings.xml +++ b/05_BallPool/ucURGCalibration/data/settings.xml @@ -1,5 +1,5 @@ - 897.959, 163.265 + 490, 328 0, 0 diff --git a/05_BallPool/ucURGCalibration/data/settings/urg_0.xml b/05_BallPool/ucURGCalibration/data/settings/urg_0.xml index b14240c..07e1d5e 100644 --- a/05_BallPool/ucURGCalibration/data/settings/urg_0.xml +++ b/05_BallPool/ucURGCalibration/data/settings/urg_0.xml @@ -1,9 +1,9 @@
- 192.168.0.10 + 192.168.234.151 10940 - -135 - 135 + -90.9184 + 89.5408 5 0.3 30 @@ -19,8 +19,8 @@ 0, 0, 0, 1, 1 - 641 - 159 + 490 + 328 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 f12788c..773d0b2 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 @@ - 1429.108276367 - 2288.440429688 + 392.306030273 + -2830.184326172 - 1429.107910156 - -2914.256835938 + 326.922851563 + 2167.005615234 - -112.085693359 - -2876.894531250 + 3222.492919922 + 2307.114257813 - -93.405029297 - 2307.121337891 + 3250.513427734 + -3045.017578125 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 @@ true true - 60.9183 - + 59.9775 + 60 true false - 1024 - 768 + 977 + 603 - 1024 - 768 + 1920 + 1080 - true + false false true - true + false 0 0 @@ -41,12 +41,12 @@ 255 - - false + + true EasyVideoPlayer - movie/demo.avi + ../../Material/6-SylphOlaf_hap_sound.avi false true 1 @@ -54,9 +54,24 @@ false + + 0 + 0 + + + false + + 0 + 0 + + + 0 + 0 + + - - sound/demo.mp3 + + true true 1 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..673185d 100644 --- a/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -6,15 +6,15 @@ 1 0 60 -2177.000000000 -126.000000000 +248.000000000 +135.000000000 1280.000000000 960.000000000 0.000000000 0.000000000 - 0.333333343 + 1.000000000 1.000000000 0.000000000 @@ -36,124 +36,26 @@ 0.000000000 0.000000000 - 0.000694444 - 0.012500000 + 0.045312501 + 0.003333333 1.000000000 0.000000000 - 0.328645825 - 0.002500000 - - - 0.000000000 - 1.000000000 - 0.000347221 - 0.996666789 - - - 1.000000000 - 1.000000000 - 0.328993082 - 0.970833361 - - - - - - 0.333333343 - 0.000000000 - 0.333333343 - 1.000000000 - - 0.000000000 - 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 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.338020831 - 0.007500000 - - - 1.000000000 - 0.000000000 - 0.664409697 - 0.012499994 - - - 0.000000000 - 1.000000000 - 0.338715285 - 0.959166646 - - - 1.000000000 - 1.000000000 - 0.661631942 - 0.933333337 - - - - - - 0.666666687 - 0.000000000 - 0.333333313 - 1.000000000 - - 0.000000000 - 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 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.673263907 + 0.960937560 0.010000000 - - 1.000000000 - 0.000000000 - 0.995312512 - 0.005833333 - 0.000000000 1.000000000 - 0.671701372 - 0.984166682 + 0.041666668 + 0.988333464 1.000000000 1.000000000 - 0.997742951 - 0.959166646 + 0.951562226 + 0.982500017 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 Camera + EasyVideoPlayer diff --git a/07_EnchantedForest/OSC2UltraControl/FreeImage.dll b/07_EnchantedForest/OSC2UltraControl/FreeImage.dll new file mode 100644 index 0000000..ddf9120 Binary files /dev/null and b/07_EnchantedForest/OSC2UltraControl/FreeImage.dll differ diff --git a/07_EnchantedForest/OSC2UltraControl/OSC2UltraControl.exe b/07_EnchantedForest/OSC2UltraControl/OSC2UltraControl.exe new file mode 100644 index 0000000..0ce0f0c Binary files /dev/null and b/07_EnchantedForest/OSC2UltraControl/OSC2UltraControl.exe differ diff --git a/07_EnchantedForest/OSC2UltraControl/data/Test.xml b/07_EnchantedForest/OSC2UltraControl/data/Test.xml new file mode 100644 index 0000000..31f1f36 --- /dev/null +++ b/07_EnchantedForest/OSC2UltraControl/data/Test.xml @@ -0,0 +1,23 @@ + + + + + 0 + 0 + 640 + 480 + + false + false + true + true + true + + 0.211 + + 0 + 133 + 0 + 0 + + diff --git a/07_EnchantedForest/OSC2UltraControl/fmodex64.dll b/07_EnchantedForest/OSC2UltraControl/fmodex64.dll new file mode 100644 index 0000000..c8fe2bf Binary files /dev/null and b/07_EnchantedForest/OSC2UltraControl/fmodex64.dll differ diff --git a/07_EnchantedForest/OSC2UltraControl/fmodexL64.dll b/07_EnchantedForest/OSC2UltraControl/fmodexL64.dll new file mode 100644 index 0000000..b4412cf Binary files /dev/null and b/07_EnchantedForest/OSC2UltraControl/fmodexL64.dll differ diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/FreeImage.dll b/07_EnchantedForest/ofxUltracontrol2DMX/FreeImage.dll new file mode 100644 index 0000000..ddf9120 Binary files /dev/null and b/07_EnchantedForest/ofxUltracontrol2DMX/FreeImage.dll differ diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/Ultra Control to DMX.xml b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/Ultra Control to DMX.xml new file mode 100644 index 0000000..eef07c5 --- /dev/null +++ b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/Ultra Control to DMX.xml @@ -0,0 +1,140 @@ + + + + + 0 + 0 + 640 + 480 + + false + false + true + true + true + + ³q°T³s±µ°ð (COM1) + + + 0 + 0 + 0 + 0 + 79 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/giant.xml b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/giant.xml new file mode 100644 index 0000000..03e5137 --- /dev/null +++ b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/giant.xml @@ -0,0 +1,4 @@ + + 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120 + OUTPUT + \ No newline at end of file diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/settings.xml b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/settings.xml new file mode 100644 index 0000000..6115074 --- /dev/null +++ b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/settings.xml @@ -0,0 +1,4 @@ + + 1,2,3,4 + OUTPUT + \ No newline at end of file diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/fmodex64.dll b/07_EnchantedForest/ofxUltracontrol2DMX/fmodex64.dll new file mode 100644 index 0000000..c8fe2bf Binary files /dev/null and b/07_EnchantedForest/ofxUltracontrol2DMX/fmodex64.dll differ diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/fmodexL64.dll b/07_EnchantedForest/ofxUltracontrol2DMX/fmodexL64.dll new file mode 100644 index 0000000..b4412cf Binary files /dev/null and b/07_EnchantedForest/ofxUltracontrol2DMX/fmodexL64.dll differ diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/imgui.ini b/07_EnchantedForest/ofxUltracontrol2DMX/imgui.ini new file mode 100644 index 0000000..ce51c6a --- /dev/null +++ b/07_EnchantedForest/ofxUltracontrol2DMX/imgui.ini @@ -0,0 +1,10 @@ +[Window][Debug##Default] +Pos=60,60 +Size=400,400 +Collapsed=0 + +[Window][Ultra Control to DMX] +Pos=0,0 +Size=640,480 +Collapsed=0 + diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/ofxUltracontrol2DMX.exe b/07_EnchantedForest/ofxUltracontrol2DMX/ofxUltracontrol2DMX.exe new file mode 100644 index 0000000..a147d43 Binary files /dev/null and b/07_EnchantedForest/ofxUltracontrol2DMX/ofxUltracontrol2DMX.exe differ 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/Build/settings.json b/08_DarkSea/UnityBuild-19050-08_DarkSea/Build/settings.json new file mode 100644 index 0000000..941880e --- /dev/null +++ b/08_DarkSea/UnityBuild-19050-08_DarkSea/Build/settings.json @@ -0,0 +1,85 @@ +{ + "properties": [ + { + "type": 4, + "key": "StatManager.fade_sec", + "value": "0.1", + "range": { + "x": 0.10000000149011612, + "y": 3.0 + } + }, + { + "type": 2, + "key": "StatManager.loop_to_trigger", + "value": "2", + "range": { + "x": 1.0, + "y": 10.0 + } + }, + { + "type": 3, + "key": "StatManager.use_horse_sound", + "value": "True", + "range": { + "x": 0.0, + "y": 0.0 + } + }, + { + "type": 3, + "key": "TUIO_Event.VisualizeTouches", + "value": "False", + "range": { + "x": 0.0, + "y": 0.0 + } + }, + { + "type": 2, + "key": "TUIO_Event.frame_gap", + "value": "6", + "range": { + "x": 1.0, + "y": 30.0 + } + }, + { + "type": 2, + "key": "TUIO_Event.delta_threshold", + "value": "50", + "range": { + "x": 50.0, + "y": 300.0 + } + }, + { + "type": 2, + "key": "TUIO_Event.snow_size", + "value": "768", + "range": { + "x": 128.0, + "y": 1024.0 + } + }, + { + "type": 4, + "key": "TUIO_Event.img_fade_speed", + "value": "0.07501704", + "range": { + "x": 0.009999999776482582, + "y": 0.10000000149011612 + } + }, + { + "type": 4, + "key": "TUIO_Event.img_wait_sec", + "value": "0.3322196", + "range": { + "x": 0.009999999776482582, + "y": 5.0 + } + } + ] +} \ No newline at end of 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 diff --git a/_Startup/01_ForstCoronation_1.bat b/_Startup/01_ForstCoronation_1.bat index 34e932a..d9166d1 100644 --- a/_Startup/01_ForstCoronation_1.bat +++ b/_Startup/01_ForstCoronation_1.bat @@ -4,6 +4,6 @@ set device=01_ForstCoronation timeout /t 8 start "" "%root%\%device%\ofxKinectV2TouchApp\ofxKinectV2TouchApp.exe" timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-01_ForstCoronation\Build\..." +start "" "%root%\%device%\UnityBuild-19050-01_ForstCoronation\Build\FrostCoronation.exe" timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" diff --git a/_Startup/03_RoyalGallery_Navigator.bat b/_Startup/03_RoyalGallery_Navigator.bat index c3327de..cb91528 100644 --- a/_Startup/03_RoyalGallery_Navigator.bat +++ b/_Startup/03_RoyalGallery_Navigator.bat @@ -7,5 +7,5 @@ start "" "PrinterController.exe" timeout /t 8 cd "%root%\%device%\UnityBuild-19050-03_RoyalGallery_Navigator\Build\" -start "" "19050-03_RoyalGallery_Navigator.exe" +CALL "19050-03_RoyalGallery_Navigator.exe" diff --git a/_Startup/03_RoyalGallery_Portrait.bat b/_Startup/03_RoyalGallery_Portrait.bat index 4a85940..18a2bba 100644 --- a/_Startup/03_RoyalGallery_Portrait.bat +++ b/_Startup/03_RoyalGallery_Portrait.bat @@ -1,4 +1,5 @@ set root=C:\UC\Project-19050-Frozen2\_Deploy_PC set device=03_RoyalGallery timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-03_RoyalGallery_Portrait\Build\19050-03_RoyalGallery_Portrait.exe" +CD "%root%\%device%\UnityBuild-19050-03_RoyalGallery_Portrait\Build\" +CALL "19050-03_RoyalGallery_Portrait.exe" diff --git a/_Startup/04_IceSlide.bat b/_Startup/04_IceSlide.bat index e00632c..ec2051d 100644 --- a/_Startup/04_IceSlide.bat +++ b/_Startup/04_IceSlide.bat @@ -3,6 +3,6 @@ set device=04_IceSlide timeout /t 8 start "" "%root%\%device%\ofxKinectV2TouchApp\ofxKinectV2TouchApp.exe" timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-04_IceSlide\Build\..." +start "" "%root%\%device%\UnityBuild-19050-04_IceSlide\Build\19050-04-IceSlide" timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" diff --git a/_Startup/05_BallPool.bat b/_Startup/05_BallPool.bat index 16ca232..930ac55 100644 --- a/_Startup/05_BallPool.bat +++ b/_Startup/05_BallPool.bat @@ -5,6 +5,7 @@ start "" "%root%\%device%\ucURGCalibration\ucURGCalibration.exe" timeout /t 8 start "" "%root%\%device%\ofxCCVApp\ofxCCVApp.exe" timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-05_BallPool\Build\..." +CD "%root%\%device%\UnityBuild-19050-05_BallPool\Build" +start "" "Unity_2018_Frozen.exe" timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" diff --git a/_Startup/08_DarkSea.bat b/_Startup/08_DarkSea.bat index 1a37994..6d21255 100644 --- a/_Startup/08_DarkSea.bat +++ b/_Startup/08_DarkSea.bat @@ -1,10 +1,11 @@ set root=C:\UC\Project-19050-Frozen2\_Deploy_PC +set root_fast=E:\UC\Project-19050-Frozen2\_Deploy_PC set device=08_DarkSea timeout /t 8 start "" "%root%\%device%\ucURGCalibration\ucURGCalibration.exe" timeout /t 8 start "" "%root%\%device%\ofxCCVApp\ofxCCVApp.exe" timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-08_DarkSea\Build\..." +start "" "%root_fast%\%device%\UnityBuild-19050-08_DarkSea\Build\..." timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" diff --git a/_Utils/create_auto_shutdown.bat b/_Utils/create_auto_shutdown.bat index 215a81e..043df81 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 23:00 +SCHTASKS /CREATE /SC DAILY /TN "auto_shutdown" /TR "SHUTDOWN /P /F" /ST 22:00 PAUSE