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/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml index 7baa79f..05e29df 100644 --- a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -2,7 +2,7 @@ 0 0 1 -0 +1 1 0 60 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/ucProjectionMappingUI/data/settings/homo_setting.xml b/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml index f8f1cf5..673185d 100644 --- a/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -42,8 +42,8 @@ 1.000000000 0.000000000 - 0.961458325 - 0.010833334 + 0.960937560 + 0.010000000 0.000000000 @@ -54,8 +54,8 @@ 1.000000000 1.000000000 - 0.951041460 - 0.986666679 + 0.951562226 + 0.982500017 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/_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/09_TheUnknown.bat b/_Startup/09_TheUnknown.bat new file mode 100644 index 0000000..fd23bc4 --- /dev/null +++ b/_Startup/09_TheUnknown.bat @@ -0,0 +1,6 @@ +set root=C:\UC\Project-19050-Frozen2\_Deploy_PC +set device=09_TheUnknown +timeout /t 8 +CD "C:\Users\UltraCombos\Desktop" +start "" "unknown.act" + diff --git a/_Startup/10_ElsaQueen.bat b/_Startup/10_ElsaQueen.bat new file mode 100644 index 0000000..9ec348b --- /dev/null +++ b/_Startup/10_ElsaQueen.bat @@ -0,0 +1,6 @@ +set root=C:\UC\Project-19050-Frozen2\_Deploy_PC +set device=10_ElsaQueen +timeout /t 8 +CD "C:\Users\UltraCombos\Desktop" +start "" "Elsa Queen.act" +