From 019a76efb80934b4b8c0419a246ecd9923bb6aa0 Mon Sep 17 00:00:00 2001 From: Jackson Fields Date: Tue, 27 Jun 2017 17:00:46 -0700 Subject: [PATCH] Update documentation to reference OpenCV 3.2 --- SpectatorView/Calibration/README.md | 4 ++-- SpectatorView/Compositor/README.md | 8 ++++---- SpectatorView/README.md | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SpectatorView/Calibration/README.md b/SpectatorView/Calibration/README.md index 9c83706a..f1813f68 100644 --- a/SpectatorView/Calibration/README.md +++ b/SpectatorView/Calibration/README.md @@ -13,8 +13,8 @@ Open the Calibration sln with Visual Studio under Calibration\Calibration.sln ![compositor sln](../DocumentationImages/calibration_sln.png) -### OpenCV 3.1 -+ Download and install OpenCV 3.1 from here: http://opencv.org/downloads.html +### OpenCV 3.2 ++ Download and install OpenCV 3.2 from here: http://opencv.org/downloads.html + Extract OpenCV anywhere on your computer. + Update the OpenCV_vc14 user macro in dependencies.props with the corresponding path on your computer. + Restart Visual Studio if the Calibration or Compositor sln's are open. diff --git a/SpectatorView/Compositor/README.md b/SpectatorView/Compositor/README.md index bcf28a92..201dd27f 100644 --- a/SpectatorView/Compositor/README.md +++ b/SpectatorView/Compositor/README.md @@ -19,9 +19,9 @@ If you are using a Blackmagic capture card, you will need to install the SDK and + Update the DeckLink_inc user macro in dependencies.props with the corresponding path on your computer. + Restart Visual Studio if the Calibration or Compositor sln's are open. -### OpenCV 3.1 -If you are not using a black magic capture card, you will need to install Open CV to get color frames from a different capture device. -+ Download and install OpenCV 3.1 from here: http://opencv.org/downloads.html +### OpenCV 3.2 +If you are not using a capture card with an included FrameProvider, you will need to install Open CV to get color frames from a different capture device. ++ Download and install OpenCV 3.2 from here: http://opencv.org/downloads.html + Extract OpenCV anywhere on your computer. + Update the OpenCV_vc14 user macro in dependencies.props with the corresponding path on your computer. + Restart Visual Studio if the Calibration or Compositor sln's are open. @@ -37,7 +37,7 @@ If you are not using a black magic capture card, you will need to install Open C #### If you are using a different capture card that does not run on BlackMagic's DeckLink SDK: + First try using the OpenCV FrameProvider: - + **NOTE:** This will require an x64 build of Unity unless you built your own x86 OpenCV 3.1 binaries + + **NOTE:** This will require an x64 build of Unity unless you built your own x86 OpenCV 3.2 binaries + In CompositorShared.h in the SharedHeaders project, change **USE_OPENCV** to TRUE, change the other FrameProvider preprocessor definitions to FALSE. + In OpenCVFrameProvider.h, change **CAMERA_ID** to be the index of the capture device you are using. + If that did not work and your capture card has an SDK, use that: diff --git a/SpectatorView/README.md b/SpectatorView/README.md index 1f677f87..52d3e52a 100644 --- a/SpectatorView/README.md +++ b/SpectatorView/README.md @@ -49,8 +49,8 @@ Make sure the materials you get are compatible with your existing camera. + If using an Elgato capture card. + [Elgato Filters](https://github.com/elgatosf/gamecapture) + If using an Elgato capture card. -+ [OpenCV 3.1](http://opencv.org/downloads.html) - + Download and install OpenCV **3.1** ++ [OpenCV 3.2](http://opencv.org/downloads.html) + + Download and install OpenCV **3.2** + [Canon SDK](https://www.usa.canon.com/internet/portal/us/home/explore/solutions-services/digital-camera-sdk-information) (Optional) + If you are using a Canon camera and have access to the Canon EDSDK, you can tether your camera to your PC to take higher resolution images. + [Unity3D](https://unity3d.com/unity/beta/) @@ -63,8 +63,8 @@ The following dependencies require a manual download and a Visual Studio user ma ![Dependencies](./DocumentationImages/dependencies.png) -### OpenCV 3.1 -+ Download and install OpenCV **3.1** from [here](http://opencv.org/downloads.html). +### OpenCV 3.2 ++ Download and install OpenCV **3.2** from [here](http://opencv.org/downloads.html). + Extract OpenCV anywhere on your computer. + Update the OpenCV_vc14 user macro in dependencies.props with the corresponding path on your computer. + Restart Visual Studio if the Calibration or Compositor sln's are open.