diff --git a/Cargo.lock b/Cargo.lock index d7f1863ae6..4457c91841 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,9 +168,6 @@ dependencies = [ name = "cc" version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "cexpr" @@ -311,7 +308,6 @@ dependencies = [ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "nalgebra 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "nalgebra-glm 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "opencv 0.33.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "sdl2 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "tobj 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -880,14 +876,6 @@ name = "itoa" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "jobserver" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "jpeg-decoder" version = "0.1.20" @@ -1148,29 +1136,6 @@ dependencies = [ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "num-complex" version = "0.2.4" @@ -1205,7 +1170,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1269,28 +1233,6 @@ name = "object" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "once_cell" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "opencv" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.59 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.76 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "once_cell 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ordered-float" version = "1.1.0" @@ -1923,11 +1865,6 @@ name = "unicode-xid" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "vcpkg" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "vec_map" version = "0.8.2" @@ -2243,7 +2180,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum instant 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485" "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" "checksum itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" -"checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" "checksum jpeg-decoder 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum khronos_api 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "037ab472c33f67b5fbd3e9163a2645319e5356fcd355efa6d4eb7fff4bbcb554" @@ -2274,8 +2210,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -"checksum num 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -"checksum num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" "checksum num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" "checksum num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" "checksum num-iter 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" @@ -2287,8 +2221,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" "checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" "checksum object 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" -"checksum once_cell 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" -"checksum opencv 0.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5cd5fef83914ebd149b0db276bf7b31e4be0a5c8df4c26aff219ca5ca6549e11" "checksum ordered-float 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3741934be594d77de1c8461ebcbbe866f585ea616a9753aa78f2bdc69f0e4579" "checksum os_str_bytes 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2ac6fe3538f701e339953a3ebbe4f39941aababa8a3f6964635b24ab526daeac" "checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" @@ -2369,7 +2301,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -"checksum vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" "checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" "checksum version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" diff --git a/Cargo.toml b/Cargo.toml index 0e48af0955..1fd6e1f1ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,6 @@ libc = "0.2.68" log = "0.4.11" nalgebra = "0.21.1" # linear algebra and matrices, fantastic docs nalgebra-glm = "0.7.0" # computer graphics-friendly nalgebra, inspired by C++'s glm -opencv = "0.33.1" rand = "0.7.3" sdl2 = "0.33" # for imgui-opengl-renderer tobj = { version = "1.0", features = ["log"] }# Another obj loader (using older version to match `tobj_viewer` binary/crate) diff --git a/README.md b/README.md index 81c2c729fc..36e3d17224 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Install the following packages on Linux: * clang * cmake -* libopencv-dev * libsdl2-dev * libxcb-xfixes0-dev * GLFW build requirements: @@ -20,6 +19,26 @@ Install the following packages on Linux: * libxinerama-dev * libxrandr-dev +Ubuntu 18.04 Installation +------------------------- + +Configure the Microsoft PPA: + +``` +curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - +sudo apt-add-repository https://packages.microsoft.com/ubuntu/18.04/prod +sudo apt-get update +``` + +Install packages: + +``` +sudo apt install k4a-tools +sudo apt install libk4a1.1-dev +``` + + + Ubuntu 20.04 LTS Support ------------------------ diff --git a/src/image_debug.rs b/src/image_debug.rs index 5cb3b5bfc3..498302838b 100644 --- a/src/image_debug.rs +++ b/src/image_debug.rs @@ -13,7 +13,7 @@ use image::Rgba; use image::RgbaImage; use image::error::{ImageFormatHint, UnsupportedError}; use image::flat::{FlatSamples, SampleLayout}; -use opencv::prelude::*; +//use opencv::prelude::*; use std::mem::size_of; use std::slice; diff --git a/src/kinect/sensor_control.rs b/src/kinect/sensor_control.rs index a765e7f7a4..5cd90288a9 100644 --- a/src/kinect/sensor_control.rs +++ b/src/kinect/sensor_control.rs @@ -1,7 +1,7 @@ use crate::image_debug::depth_to_image; use crate::kinect::k4a_sys_wrapper::{Capture, Device}; use image::DynamicImage; -use opencv::prelude::*; +//use opencv::prelude::*; use std::sync::Arc; use std::sync::Mutex; diff --git a/src/main.rs b/src/main.rs index 04507379c1..58d32d6965 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,6 @@ extern crate imgui_sdl2; extern crate imgui_winit_support; extern crate k4a_sys; extern crate libc; -extern crate opencv; extern crate rand; extern crate sdl2; extern crate tobj; @@ -29,8 +28,6 @@ extern crate gltf; use std::sync::Arc; use std::{thread, env}; -use opencv::prelude::*; - use anyhow::Result as AnyhowResult; use anyhow::bail; use kinect::k4a_sys_wrapper::{Device, Calibration};