From 72bc0e4e7a38ce9007c4851a2ad99de82703dc7f Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 10 Feb 2021 23:52:25 -0500 Subject: [PATCH] move old code into _deprecated for close reference (delete later) --- Cargo.toml | 8 -------- src/{ => _deprecated}/assets/mod.rs | 0 src/{ => _deprecated}/assets/obj_loader.rs | 0 src/{ => _deprecated}/assets/positionable_object.rs | 0 src/{ => _deprecated}/assets/renderable_object.rs | 0 .../azure_kinect/capture/device_capturer.rs | 0 .../azure_kinect/capture/fake_device_capturer.rs | 0 src/{ => _deprecated}/azure_kinect/capture/mod.rs | 0 .../azure_kinect/capture/multi_device_capturer.rs | 0 src/{ => _deprecated}/azure_kinect/k4a_sys_wrapper.rs | 0 src/{ => _deprecated}/azure_kinect/mod.rs | 0 src/{ => _deprecated}/azure_kinect/sensor_control.rs | 0 src/{ => _deprecated}/core_types.rs | 0 src/{ => _deprecated}/files/mod.rs | 0 src/{ => _deprecated}/files/read_file_string_contents.rs | 0 .../files/write_to_file_from_byte_ptr.rs | 0 src/{ => _deprecated}/graphics_imgui.rs | 0 src/{ => _deprecated}/gui/enhanced_window.rs | 0 src/{ => _deprecated}/gui/mod.rs | 0 src/{ => _deprecated}/gui/mouse_camera_arcball.rs | 0 src/{ => _deprecated}/image_debug.rs | 0 src/{ => _deprecated}/imgui_support/clip.rs | 0 src/{ => _deprecated}/imgui_support/mod.rs | 0 src/{main_opencv.rs => _deprecated/main_opengl.rs} | 0 src/{ => _deprecated}/main_points.rs | 0 src/{ => _deprecated}/opengl/compile_shader.rs | 0 src/{ => _deprecated}/opengl/debug.rs | 0 src/{ => _deprecated}/opengl/link_program.rs | 0 src/{ => _deprecated}/opengl/load_texture_from_file.rs | 0 src/{ => _deprecated}/opengl/matrices.rs | 0 src/{ => _deprecated}/opengl/mod.rs | 0 src/{ => _deprecated}/opengl/rebinder.rs | 0 src/{ => _deprecated}/opengl/wrapper/attribute.rs | 0 src/{ => _deprecated}/opengl/wrapper/buffer.rs | 0 src/{ => _deprecated}/opengl/wrapper/mod.rs | 0 .../opengl/wrapper/other_misc_wrapper.rs | 0 src/{ => _deprecated}/opengl/wrapper/texture.rs | 0 src/{ => _deprecated}/opengl/wrapper/uniform.rs | 0 src/{ => _deprecated}/opengl/wrapper/vertex_array.rs | 0 src/{ => _deprecated}/point_cloud/debug/capture_proxy.rs | 0 src/{ => _deprecated}/point_cloud/debug/image_proxy.rs | 0 src/{ => _deprecated}/point_cloud/debug/mod.rs | 0 .../point_cloud/gpu_point_cloud_converter.rs | 0 src/{ => _deprecated}/point_cloud/mod.rs | 0 src/{ => _deprecated}/point_cloud/pixel_structs.rs | 0 src/{ => _deprecated}/point_cloud/point_cloud_renderer.rs | 0 .../point_cloud/point_cloud_visualiser.rs | 0 .../point_cloud/shaders/point_cloud_compute_shader.glsl | 0 .../point_cloud/shaders/point_cloud_fragment_shader.glsl | 0 .../point_cloud/shaders/point_cloud_vertex_shader.glsl | 0 .../point_cloud/shaders/simple_vertex_shader.glsl | 0 src/{ => _deprecated}/point_cloud/util.rs | 0 src/{ => _deprecated}/point_cloud/viewer_image.rs | 0 src/{ => _deprecated}/webcam.rs | 0 src/main_zeromq.rs | 4 ++-- 55 files changed, 2 insertions(+), 10 deletions(-) rename src/{ => _deprecated}/assets/mod.rs (100%) rename src/{ => _deprecated}/assets/obj_loader.rs (100%) rename src/{ => _deprecated}/assets/positionable_object.rs (100%) rename src/{ => _deprecated}/assets/renderable_object.rs (100%) rename src/{ => _deprecated}/azure_kinect/capture/device_capturer.rs (100%) rename src/{ => _deprecated}/azure_kinect/capture/fake_device_capturer.rs (100%) rename src/{ => _deprecated}/azure_kinect/capture/mod.rs (100%) rename src/{ => _deprecated}/azure_kinect/capture/multi_device_capturer.rs (100%) rename src/{ => _deprecated}/azure_kinect/k4a_sys_wrapper.rs (100%) rename src/{ => _deprecated}/azure_kinect/mod.rs (100%) rename src/{ => _deprecated}/azure_kinect/sensor_control.rs (100%) rename src/{ => _deprecated}/core_types.rs (100%) rename src/{ => _deprecated}/files/mod.rs (100%) rename src/{ => _deprecated}/files/read_file_string_contents.rs (100%) rename src/{ => _deprecated}/files/write_to_file_from_byte_ptr.rs (100%) rename src/{ => _deprecated}/graphics_imgui.rs (100%) rename src/{ => _deprecated}/gui/enhanced_window.rs (100%) rename src/{ => _deprecated}/gui/mod.rs (100%) rename src/{ => _deprecated}/gui/mouse_camera_arcball.rs (100%) rename src/{ => _deprecated}/image_debug.rs (100%) rename src/{ => _deprecated}/imgui_support/clip.rs (100%) rename src/{ => _deprecated}/imgui_support/mod.rs (100%) rename src/{main_opencv.rs => _deprecated/main_opengl.rs} (100%) rename src/{ => _deprecated}/main_points.rs (100%) rename src/{ => _deprecated}/opengl/compile_shader.rs (100%) rename src/{ => _deprecated}/opengl/debug.rs (100%) rename src/{ => _deprecated}/opengl/link_program.rs (100%) rename src/{ => _deprecated}/opengl/load_texture_from_file.rs (100%) rename src/{ => _deprecated}/opengl/matrices.rs (100%) rename src/{ => _deprecated}/opengl/mod.rs (100%) rename src/{ => _deprecated}/opengl/rebinder.rs (100%) rename src/{ => _deprecated}/opengl/wrapper/attribute.rs (100%) rename src/{ => _deprecated}/opengl/wrapper/buffer.rs (100%) rename src/{ => _deprecated}/opengl/wrapper/mod.rs (100%) rename src/{ => _deprecated}/opengl/wrapper/other_misc_wrapper.rs (100%) rename src/{ => _deprecated}/opengl/wrapper/texture.rs (100%) rename src/{ => _deprecated}/opengl/wrapper/uniform.rs (100%) rename src/{ => _deprecated}/opengl/wrapper/vertex_array.rs (100%) rename src/{ => _deprecated}/point_cloud/debug/capture_proxy.rs (100%) rename src/{ => _deprecated}/point_cloud/debug/image_proxy.rs (100%) rename src/{ => _deprecated}/point_cloud/debug/mod.rs (100%) rename src/{ => _deprecated}/point_cloud/gpu_point_cloud_converter.rs (100%) rename src/{ => _deprecated}/point_cloud/mod.rs (100%) rename src/{ => _deprecated}/point_cloud/pixel_structs.rs (100%) rename src/{ => _deprecated}/point_cloud/point_cloud_renderer.rs (100%) rename src/{ => _deprecated}/point_cloud/point_cloud_visualiser.rs (100%) rename src/{ => _deprecated}/point_cloud/shaders/point_cloud_compute_shader.glsl (100%) rename src/{ => _deprecated}/point_cloud/shaders/point_cloud_fragment_shader.glsl (100%) rename src/{ => _deprecated}/point_cloud/shaders/point_cloud_vertex_shader.glsl (100%) rename src/{ => _deprecated}/point_cloud/shaders/simple_vertex_shader.glsl (100%) rename src/{ => _deprecated}/point_cloud/util.rs (100%) rename src/{ => _deprecated}/point_cloud/viewer_image.rs (100%) rename src/{ => _deprecated}/webcam.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 9b9debcc18..8026f83e67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,14 +5,6 @@ edition = "2018" authors = [ "Brandon Thomas ", "Brandon Thomas " ] -[[bin]] -name = "cloudcam_visualizer" -path = "src/main_opencv.rs" - -[[bin]] -name = "cloudcam_points" -path = "src/main_points.rs" - [[bin]] name = "cloudcam_zeromq" path = "src/main_zeromq.rs" diff --git a/src/assets/mod.rs b/src/_deprecated/assets/mod.rs similarity index 100% rename from src/assets/mod.rs rename to src/_deprecated/assets/mod.rs diff --git a/src/assets/obj_loader.rs b/src/_deprecated/assets/obj_loader.rs similarity index 100% rename from src/assets/obj_loader.rs rename to src/_deprecated/assets/obj_loader.rs diff --git a/src/assets/positionable_object.rs b/src/_deprecated/assets/positionable_object.rs similarity index 100% rename from src/assets/positionable_object.rs rename to src/_deprecated/assets/positionable_object.rs diff --git a/src/assets/renderable_object.rs b/src/_deprecated/assets/renderable_object.rs similarity index 100% rename from src/assets/renderable_object.rs rename to src/_deprecated/assets/renderable_object.rs diff --git a/src/azure_kinect/capture/device_capturer.rs b/src/_deprecated/azure_kinect/capture/device_capturer.rs similarity index 100% rename from src/azure_kinect/capture/device_capturer.rs rename to src/_deprecated/azure_kinect/capture/device_capturer.rs diff --git a/src/azure_kinect/capture/fake_device_capturer.rs b/src/_deprecated/azure_kinect/capture/fake_device_capturer.rs similarity index 100% rename from src/azure_kinect/capture/fake_device_capturer.rs rename to src/_deprecated/azure_kinect/capture/fake_device_capturer.rs diff --git a/src/azure_kinect/capture/mod.rs b/src/_deprecated/azure_kinect/capture/mod.rs similarity index 100% rename from src/azure_kinect/capture/mod.rs rename to src/_deprecated/azure_kinect/capture/mod.rs diff --git a/src/azure_kinect/capture/multi_device_capturer.rs b/src/_deprecated/azure_kinect/capture/multi_device_capturer.rs similarity index 100% rename from src/azure_kinect/capture/multi_device_capturer.rs rename to src/_deprecated/azure_kinect/capture/multi_device_capturer.rs diff --git a/src/azure_kinect/k4a_sys_wrapper.rs b/src/_deprecated/azure_kinect/k4a_sys_wrapper.rs similarity index 100% rename from src/azure_kinect/k4a_sys_wrapper.rs rename to src/_deprecated/azure_kinect/k4a_sys_wrapper.rs diff --git a/src/azure_kinect/mod.rs b/src/_deprecated/azure_kinect/mod.rs similarity index 100% rename from src/azure_kinect/mod.rs rename to src/_deprecated/azure_kinect/mod.rs diff --git a/src/azure_kinect/sensor_control.rs b/src/_deprecated/azure_kinect/sensor_control.rs similarity index 100% rename from src/azure_kinect/sensor_control.rs rename to src/_deprecated/azure_kinect/sensor_control.rs diff --git a/src/core_types.rs b/src/_deprecated/core_types.rs similarity index 100% rename from src/core_types.rs rename to src/_deprecated/core_types.rs diff --git a/src/files/mod.rs b/src/_deprecated/files/mod.rs similarity index 100% rename from src/files/mod.rs rename to src/_deprecated/files/mod.rs diff --git a/src/files/read_file_string_contents.rs b/src/_deprecated/files/read_file_string_contents.rs similarity index 100% rename from src/files/read_file_string_contents.rs rename to src/_deprecated/files/read_file_string_contents.rs diff --git a/src/files/write_to_file_from_byte_ptr.rs b/src/_deprecated/files/write_to_file_from_byte_ptr.rs similarity index 100% rename from src/files/write_to_file_from_byte_ptr.rs rename to src/_deprecated/files/write_to_file_from_byte_ptr.rs diff --git a/src/graphics_imgui.rs b/src/_deprecated/graphics_imgui.rs similarity index 100% rename from src/graphics_imgui.rs rename to src/_deprecated/graphics_imgui.rs diff --git a/src/gui/enhanced_window.rs b/src/_deprecated/gui/enhanced_window.rs similarity index 100% rename from src/gui/enhanced_window.rs rename to src/_deprecated/gui/enhanced_window.rs diff --git a/src/gui/mod.rs b/src/_deprecated/gui/mod.rs similarity index 100% rename from src/gui/mod.rs rename to src/_deprecated/gui/mod.rs diff --git a/src/gui/mouse_camera_arcball.rs b/src/_deprecated/gui/mouse_camera_arcball.rs similarity index 100% rename from src/gui/mouse_camera_arcball.rs rename to src/_deprecated/gui/mouse_camera_arcball.rs diff --git a/src/image_debug.rs b/src/_deprecated/image_debug.rs similarity index 100% rename from src/image_debug.rs rename to src/_deprecated/image_debug.rs diff --git a/src/imgui_support/clip.rs b/src/_deprecated/imgui_support/clip.rs similarity index 100% rename from src/imgui_support/clip.rs rename to src/_deprecated/imgui_support/clip.rs diff --git a/src/imgui_support/mod.rs b/src/_deprecated/imgui_support/mod.rs similarity index 100% rename from src/imgui_support/mod.rs rename to src/_deprecated/imgui_support/mod.rs diff --git a/src/main_opencv.rs b/src/_deprecated/main_opengl.rs similarity index 100% rename from src/main_opencv.rs rename to src/_deprecated/main_opengl.rs diff --git a/src/main_points.rs b/src/_deprecated/main_points.rs similarity index 100% rename from src/main_points.rs rename to src/_deprecated/main_points.rs diff --git a/src/opengl/compile_shader.rs b/src/_deprecated/opengl/compile_shader.rs similarity index 100% rename from src/opengl/compile_shader.rs rename to src/_deprecated/opengl/compile_shader.rs diff --git a/src/opengl/debug.rs b/src/_deprecated/opengl/debug.rs similarity index 100% rename from src/opengl/debug.rs rename to src/_deprecated/opengl/debug.rs diff --git a/src/opengl/link_program.rs b/src/_deprecated/opengl/link_program.rs similarity index 100% rename from src/opengl/link_program.rs rename to src/_deprecated/opengl/link_program.rs diff --git a/src/opengl/load_texture_from_file.rs b/src/_deprecated/opengl/load_texture_from_file.rs similarity index 100% rename from src/opengl/load_texture_from_file.rs rename to src/_deprecated/opengl/load_texture_from_file.rs diff --git a/src/opengl/matrices.rs b/src/_deprecated/opengl/matrices.rs similarity index 100% rename from src/opengl/matrices.rs rename to src/_deprecated/opengl/matrices.rs diff --git a/src/opengl/mod.rs b/src/_deprecated/opengl/mod.rs similarity index 100% rename from src/opengl/mod.rs rename to src/_deprecated/opengl/mod.rs diff --git a/src/opengl/rebinder.rs b/src/_deprecated/opengl/rebinder.rs similarity index 100% rename from src/opengl/rebinder.rs rename to src/_deprecated/opengl/rebinder.rs diff --git a/src/opengl/wrapper/attribute.rs b/src/_deprecated/opengl/wrapper/attribute.rs similarity index 100% rename from src/opengl/wrapper/attribute.rs rename to src/_deprecated/opengl/wrapper/attribute.rs diff --git a/src/opengl/wrapper/buffer.rs b/src/_deprecated/opengl/wrapper/buffer.rs similarity index 100% rename from src/opengl/wrapper/buffer.rs rename to src/_deprecated/opengl/wrapper/buffer.rs diff --git a/src/opengl/wrapper/mod.rs b/src/_deprecated/opengl/wrapper/mod.rs similarity index 100% rename from src/opengl/wrapper/mod.rs rename to src/_deprecated/opengl/wrapper/mod.rs diff --git a/src/opengl/wrapper/other_misc_wrapper.rs b/src/_deprecated/opengl/wrapper/other_misc_wrapper.rs similarity index 100% rename from src/opengl/wrapper/other_misc_wrapper.rs rename to src/_deprecated/opengl/wrapper/other_misc_wrapper.rs diff --git a/src/opengl/wrapper/texture.rs b/src/_deprecated/opengl/wrapper/texture.rs similarity index 100% rename from src/opengl/wrapper/texture.rs rename to src/_deprecated/opengl/wrapper/texture.rs diff --git a/src/opengl/wrapper/uniform.rs b/src/_deprecated/opengl/wrapper/uniform.rs similarity index 100% rename from src/opengl/wrapper/uniform.rs rename to src/_deprecated/opengl/wrapper/uniform.rs diff --git a/src/opengl/wrapper/vertex_array.rs b/src/_deprecated/opengl/wrapper/vertex_array.rs similarity index 100% rename from src/opengl/wrapper/vertex_array.rs rename to src/_deprecated/opengl/wrapper/vertex_array.rs diff --git a/src/point_cloud/debug/capture_proxy.rs b/src/_deprecated/point_cloud/debug/capture_proxy.rs similarity index 100% rename from src/point_cloud/debug/capture_proxy.rs rename to src/_deprecated/point_cloud/debug/capture_proxy.rs diff --git a/src/point_cloud/debug/image_proxy.rs b/src/_deprecated/point_cloud/debug/image_proxy.rs similarity index 100% rename from src/point_cloud/debug/image_proxy.rs rename to src/_deprecated/point_cloud/debug/image_proxy.rs diff --git a/src/point_cloud/debug/mod.rs b/src/_deprecated/point_cloud/debug/mod.rs similarity index 100% rename from src/point_cloud/debug/mod.rs rename to src/_deprecated/point_cloud/debug/mod.rs diff --git a/src/point_cloud/gpu_point_cloud_converter.rs b/src/_deprecated/point_cloud/gpu_point_cloud_converter.rs similarity index 100% rename from src/point_cloud/gpu_point_cloud_converter.rs rename to src/_deprecated/point_cloud/gpu_point_cloud_converter.rs diff --git a/src/point_cloud/mod.rs b/src/_deprecated/point_cloud/mod.rs similarity index 100% rename from src/point_cloud/mod.rs rename to src/_deprecated/point_cloud/mod.rs diff --git a/src/point_cloud/pixel_structs.rs b/src/_deprecated/point_cloud/pixel_structs.rs similarity index 100% rename from src/point_cloud/pixel_structs.rs rename to src/_deprecated/point_cloud/pixel_structs.rs diff --git a/src/point_cloud/point_cloud_renderer.rs b/src/_deprecated/point_cloud/point_cloud_renderer.rs similarity index 100% rename from src/point_cloud/point_cloud_renderer.rs rename to src/_deprecated/point_cloud/point_cloud_renderer.rs diff --git a/src/point_cloud/point_cloud_visualiser.rs b/src/_deprecated/point_cloud/point_cloud_visualiser.rs similarity index 100% rename from src/point_cloud/point_cloud_visualiser.rs rename to src/_deprecated/point_cloud/point_cloud_visualiser.rs diff --git a/src/point_cloud/shaders/point_cloud_compute_shader.glsl b/src/_deprecated/point_cloud/shaders/point_cloud_compute_shader.glsl similarity index 100% rename from src/point_cloud/shaders/point_cloud_compute_shader.glsl rename to src/_deprecated/point_cloud/shaders/point_cloud_compute_shader.glsl diff --git a/src/point_cloud/shaders/point_cloud_fragment_shader.glsl b/src/_deprecated/point_cloud/shaders/point_cloud_fragment_shader.glsl similarity index 100% rename from src/point_cloud/shaders/point_cloud_fragment_shader.glsl rename to src/_deprecated/point_cloud/shaders/point_cloud_fragment_shader.glsl diff --git a/src/point_cloud/shaders/point_cloud_vertex_shader.glsl b/src/_deprecated/point_cloud/shaders/point_cloud_vertex_shader.glsl similarity index 100% rename from src/point_cloud/shaders/point_cloud_vertex_shader.glsl rename to src/_deprecated/point_cloud/shaders/point_cloud_vertex_shader.glsl diff --git a/src/point_cloud/shaders/simple_vertex_shader.glsl b/src/_deprecated/point_cloud/shaders/simple_vertex_shader.glsl similarity index 100% rename from src/point_cloud/shaders/simple_vertex_shader.glsl rename to src/_deprecated/point_cloud/shaders/simple_vertex_shader.glsl diff --git a/src/point_cloud/util.rs b/src/_deprecated/point_cloud/util.rs similarity index 100% rename from src/point_cloud/util.rs rename to src/_deprecated/point_cloud/util.rs diff --git a/src/point_cloud/viewer_image.rs b/src/_deprecated/point_cloud/viewer_image.rs similarity index 100% rename from src/point_cloud/viewer_image.rs rename to src/_deprecated/point_cloud/viewer_image.rs diff --git a/src/webcam.rs b/src/_deprecated/webcam.rs similarity index 100% rename from src/webcam.rs rename to src/_deprecated/webcam.rs diff --git a/src/main_zeromq.rs b/src/main_zeromq.rs index ba3edff221..b5d00e43c8 100644 --- a/src/main_zeromq.rs +++ b/src/main_zeromq.rs @@ -114,8 +114,8 @@ fn main() -> AnyhowResult<()> { config.0.depth_mode = depth_mode_fov; config.0.color_format = k4a_sys::k4a_image_format_t_K4A_IMAGE_FORMAT_COLOR_BGRA32; - config.0.color_resolution = k4a_sys::k4a_color_resolution_t_K4A_COLOR_RESOLUTION_720P; // 1280x721 - //config.0.color_resolution = k4a_sys::k4a_color_resolution_t_K4A_COLOR_RESOLUTION_1080P; // 1920x1080 (this gets truncated.) + //config.0.color_resolution = k4a_sys::k4a_color_resolution_t_K4A_COLOR_RESOLUTION_720P; // 1280x721 + config.0.color_resolution = k4a_sys::k4a_color_resolution_t_K4A_COLOR_RESOLUTION_1080P; // 1920x1080 (this gets truncated.) //config.0.color_resolution = k4a_sys::k4a_color_resolution_t_K4A_COLOR_RESOLUTION_2160P; // 4K, what the original program did let calibration = device.get_calibration(config.0.depth_mode, config.0.color_resolution)?;