diff --git a/Documentation/InSide_guide_installation_V2.docx b/Documentation/InSide_guide_installation_V2.docx index 1a5a79c555c5dadbfa70002449dfd0423a543003..c6e250ce1cbd75546deccdc2d0a6fc7f7712c9de 100644 Binary files a/Documentation/InSide_guide_installation_V2.docx and b/Documentation/InSide_guide_installation_V2.docx differ diff --git a/Documentation/InSide_guide_installation_V2.pages b/Documentation/InSide_guide_installation_V2.pages index 11158284303d18e03e7eb16ba68a670f337ea5ec..4aa500762260b1b29b19cd64db4078646a97a8af 100755 Binary files a/Documentation/InSide_guide_installation_V2.pages and b/Documentation/InSide_guide_installation_V2.pages differ diff --git a/Documentation/InSide_guide_installation_V2.pdf b/Documentation/InSide_guide_installation_V2.pdf index e3fe22bfad72331728b9f552c826de508bec4d16..359b2c99a193b58b1aa3c745f22da68c5fe2e8b7 100644 Binary files a/Documentation/InSide_guide_installation_V2.pdf and b/Documentation/InSide_guide_installation_V2.pdf differ diff --git a/distribution/Documentation/Presentation_Inside.pdf b/distribution/Documentation/Presentation_Inside.pdf old mode 100755 new mode 100644 diff --git a/distribution/Documentation/mode_emploi_oculus_inside.pdf b/distribution/Documentation/mode_emploi_oculus_inside.pdf old mode 100755 new mode 100644 diff --git a/distribution/Documentation/router_tp-link.md b/distribution/Documentation/router_tp-link.md old mode 100755 new mode 100644 diff --git a/distribution/Images/inside_logo_paysage.jpg b/distribution/Images/inside_logo_paysage.jpg old mode 100755 new mode 100644 diff --git a/distribution/Images/inside_mosaique_hires.jpg b/distribution/Images/inside_mosaique_hires.jpg old mode 100755 new mode 100644 diff --git a/distribution/Images/inside_mosaique_lores.jpg b/distribution/Images/inside_mosaique_lores.jpg old mode 100755 new mode 100644 diff --git a/distribution/InSide_guide_installation.pdf b/distribution/InSide_guide_installation.pdf new file mode 100644 index 0000000000000000000000000000000000000000..359b2c99a193b58b1aa3c745f22da68c5fe2e8b7 Binary files /dev/null and b/distribution/InSide_guide_installation.pdf differ diff --git a/distribution/InSide_installation/INSTALLEUR.bat b/distribution/InSide_installation/INSTALLEUR.bat old mode 100755 new mode 100644 diff --git a/distribution/InSide_installation/Inside_Women_MotionCap.apk b/distribution/InSide_installation/Inside_Women_MotionCap.apk old mode 100755 new mode 100644 diff --git a/distribution/InSide_installation/Inside_Women_MotionCap.main.obb b/distribution/InSide_installation/Inside_Women_MotionCap.main.obb old mode 100755 new mode 100644 diff --git a/distribution/InSide_installation/LINUX_INSTALLEUR.sh b/distribution/InSide_installation/LINUX_INSTALLEUR.sh old mode 100755 new mode 100644 diff --git a/distribution/InSide_launch_and_mirror.bat b/distribution/InSide_launch_and_mirror.bat old mode 100755 new mode 100644 index 7858bae7e971b163a3f2b4e2594accbc9909da9e..cfea78c2e1085daf89dec49d38eea278189aee88 --- a/distribution/InSide_launch_and_mirror.bat +++ b/distribution/InSide_launch_and_mirror.bat @@ -94,6 +94,12 @@ SET DEV=-s %IP% echo %DEV% adb %DEV% shell ip route +:: ASKING FOR FORWARDING AUDIO ON PC, DEFAULT NO +choice /C ON /T 10 /D N /M "Voulez-vous que j'envoie la sortie audio sur le PC ?" +if ERRORLEVEL 1 SET "AUDIO=" +if ERRORLEVEL 2 SET "AUDIO=--no-audio" +echo AUDIO : %AUDIO% + :: START THE GAME adb %DEV% shell am kill-all adb %DEV% shell am force-stop com.inria.inside @@ -107,7 +113,7 @@ PAUSE :: scrcpy-noconsole %DEV% -m 720 -b 4M -n -f -T -c %WIDTH%:%HEIGHT%:%XO%:%YO% :: scrcpy-noconsole %DEV% --tcpip --crop 1832:1920:2000:350 :: scrcpy %DEV% --bit-rate 4M --crop 1600:1050:1935:435 --disable-screensaver --fullscreen --no-control --max-fps 30 -scrcpy %DEV% --bit-rate 4M --crop %WIDTH%:%HEIGHT%:%XO%:%YO% --disable-screensaver --fullscreen --no-control --max-fps 30 +scrcpy %DEV% --video-bit-rate 4M --crop %WIDTH%:%HEIGHT%:%XO%:%YO% %AUDIO% --disable-screensaver --fullscreen --no-control --max-fps 30 :: IF THEY PRESS ALT+F4, IT WILL BE ERRORLEVEL 0, AND THE APP CAN EXIT, OTHERWISE :: IT WILL KEEP TRYING FOREVER, OR UNTIL CTRL+C diff --git a/distribution/Linux/mirror_and_launch.sh b/distribution/Linux/mirror_and_launch.sh old mode 100755 new mode 100644 diff --git a/distribution/TP-Link_configuration.bin b/distribution/TP-Link_configuration.bin deleted file mode 100644 index 40e045b188e2c1dbcc8af74e7f70c6eb64188b83..0000000000000000000000000000000000000000 Binary files a/distribution/TP-Link_configuration.bin and /dev/null differ diff --git a/distribution/scrcpy-win64-v2.1.1/AdbWinApi.dll b/distribution/scrcpy-win64-v2.1.1/AdbWinApi.dll new file mode 100644 index 0000000000000000000000000000000000000000..7abe26cf1d2ab67f0107b19c5fe5a9c4543f90c0 Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/AdbWinApi.dll differ diff --git a/distribution/scrcpy-win64-v2.1.1/AdbWinUsbApi.dll b/distribution/scrcpy-win64-v2.1.1/AdbWinUsbApi.dll new file mode 100644 index 0000000000000000000000000000000000000000..e7a6de1208910df2577ef86bbe536fb23fa5f015 Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/AdbWinUsbApi.dll differ diff --git a/distribution/scrcpy-win64-v2.1.1/SDL2.dll b/distribution/scrcpy-win64-v2.1.1/SDL2.dll new file mode 100644 index 0000000000000000000000000000000000000000..d48b854b200e634ce940777fa92a18ccc6db638b Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/SDL2.dll differ diff --git a/distribution/scrcpy-win64-v2.1.1/adb.exe b/distribution/scrcpy-win64-v2.1.1/adb.exe new file mode 100644 index 0000000000000000000000000000000000000000..eac68f9d0674877e175d542ce2d371e207a68872 Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/adb.exe differ diff --git a/distribution/scrcpy-win64-v2.1.1/avcodec-60.dll b/distribution/scrcpy-win64-v2.1.1/avcodec-60.dll new file mode 100644 index 0000000000000000000000000000000000000000..822b1b8b0f8d9fe224a085074f7f5aa53f7d4dc7 Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/avcodec-60.dll differ diff --git a/distribution/scrcpy-win64-v2.1.1/avformat-60.dll b/distribution/scrcpy-win64-v2.1.1/avformat-60.dll new file mode 100644 index 0000000000000000000000000000000000000000..f82a0353aa5261ea86e7ccf92adb551072dedb3e Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/avformat-60.dll differ diff --git a/distribution/scrcpy-win64-v2.1.1/avutil-58.dll b/distribution/scrcpy-win64-v2.1.1/avutil-58.dll new file mode 100644 index 0000000000000000000000000000000000000000..902f8a24760872f347afe21b3806f70d3b848f6d Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/avutil-58.dll differ diff --git a/distribution/scrcpy-win64-v2.1.1/icon.png b/distribution/scrcpy-win64-v2.1.1/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b96a1aff9b842976bae652c6fc22af7daed8bbf2 Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/icon.png differ diff --git a/distribution/scrcpy-win64-v2.1.1/msys-usb-1.0.dll b/distribution/scrcpy-win64-v2.1.1/msys-usb-1.0.dll new file mode 100644 index 0000000000000000000000000000000000000000..e57576a5bfe3500bd2d691c059b5936072e1b83c Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/msys-usb-1.0.dll differ diff --git a/distribution/scrcpy-win64-v2.1.1/open_a_terminal_here.bat b/distribution/scrcpy-win64-v2.1.1/open_a_terminal_here.bat new file mode 100644 index 0000000000000000000000000000000000000000..24d557f35575815a1bbbc249bb537de39fb8a9fa --- /dev/null +++ b/distribution/scrcpy-win64-v2.1.1/open_a_terminal_here.bat @@ -0,0 +1 @@ +@cmd diff --git a/distribution/scrcpy-win64-v2.1.1/scrcpy-console.bat b/distribution/scrcpy-win64-v2.1.1/scrcpy-console.bat new file mode 100644 index 0000000000000000000000000000000000000000..b90be29a48fe232ad78239f5f22a76d71e2391dc --- /dev/null +++ b/distribution/scrcpy-win64-v2.1.1/scrcpy-console.bat @@ -0,0 +1,4 @@ +@echo off +scrcpy.exe %* +:: if the exit code is >= 1, then pause +if errorlevel 1 pause diff --git a/distribution/scrcpy-win64-v2.1.1/scrcpy-noconsole.vbs b/distribution/scrcpy-win64-v2.1.1/scrcpy-noconsole.vbs new file mode 100644 index 0000000000000000000000000000000000000000..d509ad7f1eab3cbf3e7b0d91d9c9a64fb8501e2c --- /dev/null +++ b/distribution/scrcpy-win64-v2.1.1/scrcpy-noconsole.vbs @@ -0,0 +1,7 @@ +strCommand = "cmd /c scrcpy.exe" + +For Each Arg In WScript.Arguments + strCommand = strCommand & " """ & replace(Arg, """", """""""""") & """" +Next + +CreateObject("Wscript.Shell").Run strCommand, 0, false diff --git a/distribution/scrcpy-win64-v2.1.1/scrcpy-server b/distribution/scrcpy-win64-v2.1.1/scrcpy-server new file mode 100644 index 0000000000000000000000000000000000000000..4acae983150ccf01338c68d7e6e5bfc577937fe1 Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/scrcpy-server differ diff --git a/distribution/scrcpy-win64-v2.1.1/scrcpy.exe b/distribution/scrcpy-win64-v2.1.1/scrcpy.exe new file mode 100644 index 0000000000000000000000000000000000000000..8fd8cef2b5cc92207f7f709a675341bf22478476 Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/scrcpy.exe differ diff --git a/distribution/scrcpy-win64-v2.1.1/swresample-4.dll b/distribution/scrcpy-win64-v2.1.1/swresample-4.dll new file mode 100644 index 0000000000000000000000000000000000000000..727683a65f11d78697181bde2cbfb9b46e6e7130 Binary files /dev/null and b/distribution/scrcpy-win64-v2.1.1/swresample-4.dll differ