From 20a8be83756f34212e9d0084d77e69cc6038d896 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 15 Aug 2020 01:32:13 -0400 Subject: [PATCH] much easier to see now... --- src/core_types.rs | 27 +++++++++++++++++++++++++ src/graphics_imgui.rs | 2 +- src/point_cloud/point_cloud_renderer.rs | 4 +--- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/core_types.rs b/src/core_types.rs index 29c1cc27c1..5ccb918b8f 100644 --- a/src/core_types.rs +++ b/src/core_types.rs @@ -18,6 +18,24 @@ impl RgbaF32 { alpha: 1.0, } } + + pub fn rgb(r: f32, g: f32, b: f32) -> Self { + Self { + red: r, + green: g, + blue: b, + alpha: 1.0, + } + } + + pub fn gray(gray: f32) -> Self { + Self { + red: gray, + green: gray, + blue: gray, + alpha: 1.0, + } + } } #[cfg(test)] @@ -32,4 +50,13 @@ mod test { assert_eq!(black.blue, 0.0f32); assert_eq!(black.alpha, 1.0f32); } + + #[test] + pub fn test_gray() { + let gray = RgbaF32::gray(0.5); + assert_eq!(gray.red, 0.5f32); + assert_eq!(gray.green, 0.5f32); + assert_eq!(gray.blue, 0.5f32); + assert_eq!(gray.alpha, 1.0f32); + } } diff --git a/src/graphics_imgui.rs b/src/graphics_imgui.rs index 7e29b7fe8d..0df1f78752 100644 --- a/src/graphics_imgui.rs +++ b/src/graphics_imgui.rs @@ -58,7 +58,7 @@ pub fn run(capture_provider: Arc, calibration_data: let colorization_strategy = ColorizationStrategy::Color; - let clear_color = RgbaF32::black(); + let clear_color = RgbaF32::gray(0.5); let mut visualizer = PointCloudVisualizer::new( capture_provider.get_num_cameras(), diff --git a/src/point_cloud/point_cloud_renderer.rs b/src/point_cloud/point_cloud_renderer.rs index 5978f28895..b1913ce077 100644 --- a/src/point_cloud/point_cloud_renderer.rs +++ b/src/point_cloud/point_cloud_renderer.rs @@ -512,9 +512,7 @@ impl PointCloudRenderer { (1, 2) }; - unsafe { - gl::UseProgram(self.shader_program_id); - } + //let (lower_range, upper_range) = (0, 2); //for i in 0 .. self.num_cameras { for i in lower_range .. upper_range {