diff --git a/src/main_zeromq.rs b/src/main_zeromq.rs index ff17db8a8e..855e384512 100644 --- a/src/main_zeromq.rs +++ b/src/main_zeromq.rs @@ -4,7 +4,7 @@ #[macro_use] extern crate clap; -mod zeromq; +mod pointcloud; use anyhow::Result as AnyhowResult; use anyhow::anyhow; @@ -15,15 +15,15 @@ use kinect::{Device, DeviceConfiguration, Image}; use std::io::Write; use std::thread; use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use zeromq::color::Color; -use zeromq::cpu_calculate_point_cloud::PointCloudResult; -use zeromq::cpu_calculate_point_cloud::calculate_point_cloud2; -use zeromq::cpu_calculate_point_cloud::calculate_point_cloud3; -use zeromq::cpu_transformation::DepthTransformer; -use zeromq::point::Point; -use zeromq::xy_table::create_xy_table; -use zeromq::xy_table::create_xy_table_from_color_calibration; -use zeromq::xy_table::create_xy_table_from_depth_calibration; +use pointcloud::color::Color; +use pointcloud::cpu_calculate_point_cloud::PointCloudResult; +use pointcloud::cpu_calculate_point_cloud::calculate_point_cloud2; +use pointcloud::cpu_calculate_point_cloud::calculate_point_cloud3; +use pointcloud::cpu_transformation::DepthTransformer; +use pointcloud::point::Point; +use pointcloud::xy_table::create_xy_table; +use pointcloud::xy_table::create_xy_table_from_color_calibration; +use pointcloud::xy_table::create_xy_table_from_depth_calibration; use zmq::{Error, Socket, Context, DONTWAIT}; @@ -41,6 +41,10 @@ const MAX_SEND_POINTS_PER_PACKET : usize = 3000; /// The command line args for the program. #[derive(Clap, Debug, Clone)] pub struct CommandArgs { + /// Number cameras + #[clap(long, default_value = "1")] + pub num_cameras: i32, + /// Render axes #[clap(long, parse(try_from_str = true_or_false), default_value = "false")] pub debug: bool, @@ -100,7 +104,7 @@ fn main() -> AnyhowResult<()> { println!("Opening device..."); thread::sleep(Duration::from_millis(100)); - let device = Device::open(0)?; + let device = Device::open(1)?; let mut config = DeviceConfiguration::init_disable_all(); diff --git a/src/zeromq/color.rs b/src/pointcloud/color.rs similarity index 100% rename from src/zeromq/color.rs rename to src/pointcloud/color.rs diff --git a/src/zeromq/cpu_calculate_point_cloud.rs b/src/pointcloud/cpu_calculate_point_cloud.rs similarity index 98% rename from src/zeromq/cpu_calculate_point_cloud.rs rename to src/pointcloud/cpu_calculate_point_cloud.rs index 1723797c97..c63fc9ab7f 100644 --- a/src/zeromq/cpu_calculate_point_cloud.rs +++ b/src/pointcloud/cpu_calculate_point_cloud.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use crate::AnyhowResult; use crate::CommandArgs; -use crate::zeromq::color::Color; -use crate::zeromq::point::Point; +use crate::pointcloud::color::Color; +use crate::pointcloud::point::Point; use k4a_sys_temp as k4a_sys; use kinect::Image; use kinect::ImageFormat; diff --git a/src/zeromq/cpu_transformation.rs b/src/pointcloud/cpu_transformation.rs similarity index 100% rename from src/zeromq/cpu_transformation.rs rename to src/pointcloud/cpu_transformation.rs diff --git a/src/zeromq/debug.rs b/src/pointcloud/debug.rs similarity index 96% rename from src/zeromq/debug.rs rename to src/pointcloud/debug.rs index 2395ff91a2..a2dfcebb09 100644 --- a/src/zeromq/debug.rs +++ b/src/pointcloud/debug.rs @@ -1,4 +1,4 @@ -use crate::zeromq::point::Point; +use crate::pointcloud::point::Point; use num_traits::Float; /// Print the minima and maxima along each dimension. diff --git a/src/zeromq/message.rs b/src/pointcloud/message.rs similarity index 97% rename from src/zeromq/message.rs rename to src/pointcloud/message.rs index 3c7bdde078..a650ef306a 100644 --- a/src/zeromq/message.rs +++ b/src/pointcloud/message.rs @@ -1,4 +1,4 @@ -use crate::zeromq::point::Point; +use crate::pointcloud::point::Point; use byteorder::{WriteBytesExt, LittleEndian}; use std::io::Write; diff --git a/src/zeromq/mod.rs b/src/pointcloud/mod.rs similarity index 100% rename from src/zeromq/mod.rs rename to src/pointcloud/mod.rs diff --git a/src/zeromq/point.rs b/src/pointcloud/point.rs similarity index 97% rename from src/zeromq/point.rs rename to src/pointcloud/point.rs index 56e6f52bdd..2a3cd42024 100644 --- a/src/zeromq/point.rs +++ b/src/pointcloud/point.rs @@ -1,6 +1,6 @@ use byteorder::{WriteBytesExt, LittleEndian, BigEndian}; use bytes::{BytesMut, BufMut}; -use crate::zeromq::color::Color; +use crate::pointcloud::color::Color; use rand::Rng; use rand::distributions::Uniform; diff --git a/src/zeromq/xy_table.rs b/src/pointcloud/xy_table.rs similarity index 100% rename from src/zeromq/xy_table.rs rename to src/pointcloud/xy_table.rs