Merge pull request #6423 from dorodnic/mouse_picking2

Additional Viewer Enhancements
IntelRealSense · Jun 1, 2020 · 690df61 · 690df61
2 parents d364c1b + 69f98bc
commit 690df61
Show file tree

Hide file tree

Showing 39 changed files with 6,711 additions and 3,190 deletions.
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -23,6 +23,10 @@ set(COMMON_SRC
         "${CMAKE_CURRENT_LIST_DIR}/fw-update-helper.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/metadata-helper.h"
         "${CMAKE_CURRENT_LIST_DIR}/metadata-helper.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/skybox.h"
+        "${CMAKE_CURRENT_LIST_DIR}/skybox.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/measurement.h"
+        "${CMAKE_CURRENT_LIST_DIR}/measurement.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/on-chip-calib.h"
         "${CMAKE_CURRENT_LIST_DIR}/on-chip-calib.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/decompress-huffman.h"

diff --git a/common/fw-update-helper.cpp b/common/fw-update-helper.cpp
@@ -15,14 +15,11 @@
 
 #ifdef INTERNAL_FW
 #include "common/fw/D4XX_FW_Image.h"
-#include "common/fw/D4XX_RC_Image.h"
 #include "common/fw/SR3XX_FW_Image.h"
 #else
 #define FW_D4XX_FW_IMAGE_VERSION ""
-#define FW_D4XX_RC_IMAGE_VERSION ""
 #define FW_SR3XX_FW_IMAGE_VERSION ""
 const char* fw_get_D4XX_FW_Image(int) { return NULL; }
-const char* fw_get_D4XX_RC_Image(int) { return NULL; }
 const char* fw_get_SR3XX_FW_Image(int) { return NULL; }
 #endif // INTERNAL_FW
 
@@ -56,8 +53,7 @@ namespace rs2
     {
         bool allow_rc_firmware = config_file::instance().get_or_default(configurations::update::allow_rc_firmware, false);
 
-        if (product_line == RS2_PRODUCT_LINE_D400 && allow_rc_firmware) return FW_D4XX_RC_IMAGE_VERSION;
-        else if (product_line == RS2_PRODUCT_LINE_D400) return FW_D4XX_FW_IMAGE_VERSION;
+        if (product_line == RS2_PRODUCT_LINE_D400) return FW_D4XX_FW_IMAGE_VERSION;
         //else if (product_line == RS2_PRODUCT_LINE_SR300) return FW_SR3XX_FW_IMAGE_VERSION;
         else return "";
     }
@@ -76,14 +72,6 @@ namespace rs2
             rv[RS2_PRODUCT_LINE_D400] = vec;
         }
 
-        if (strlen(FW_D4XX_RC_IMAGE_VERSION) && allow_rc_firmware)
-        {
-            int size = 0;
-            auto hex = fw_get_D4XX_RC_Image(size);
-            auto vec = std::vector<uint8_t>(hex, hex + size);
-            rv[RS2_PRODUCT_LINE_D400] = vec;
-        }
-
         if (strlen(FW_SR3XX_FW_IMAGE_VERSION))
         {
             int size = 0;

diff --git a/common/fw/CMakeLists.txt b/common/fw/CMakeLists.txt
@@ -11,12 +11,6 @@ message(STATUS "Fetching recommended firmwares:")
 set(REALSENSE_FIRMWARE_URL "http://realsense-hw-public.s3.amazonaws.com" CACHE STRING
     "URL to download firmware binaries from")
 
-string(REGEX MATCH "D4XX_RC_FIRMWARE_VERSION \"([0-9]+.[0-9]+.[0-9]+.[0-9]+)\"" _ ${ver})
-set(D4XX_RC_VERSION ${CMAKE_MATCH_1})
-message(STATUS "D4XX_RC_VERSION: ${D4XX_RC_VERSION}")
-set(D4XX_RC_SHA1 f3a488ea7f07a630a335f024fa9fec662a84c8ed)
-set(D4XX_RC_URL "${REALSENSE_FIRMWARE_URL}/Releases/RS4xx/FW")
-
 string(REGEX MATCH "D4XX_RECOMMENDED_FIRMWARE_VERSION \"([0-9]+.[0-9]+.[0-9]+.[0-9]+)\"" _ ${ver})
 set(D4XX_FW_VERSION ${CMAKE_MATCH_1})
 message(STATUS "D4XX_FW_VERSION: ${D4XX_FW_VERSION}")
@@ -78,7 +72,6 @@ function(target_binary url version sha1 symbol ext)
 endfunction()
 
 target_binary( "${D4XX_FW_URL}"  "${D4XX_FW_VERSION}"  "${D4XX_FW_SHA1}" D4XX_FW_Image .bin)
-target_binary( "${D4XX_RC_URL}"  "${D4XX_RC_VERSION}"  "${D4XX_RC_SHA1}" D4XX_RC_Image .bin)
 target_binary( "${SR3XX_FW_URL}"  "${SR3XX_FW_VERSION}"  "${SR3XX_FW_SHA1}" SR3XX_FW_Image .bin)
 target_binary( "${T26X_FW_URL}"  "${T26X_FW_VERSION}"  "${T26X_FW_SHA1}" target .mvcmd)
 

diff --git a/common/fw/firmware-version.h b/common/fw/firmware-version.h
@@ -5,5 +5,4 @@
 
 #define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.12.5.0"
 #define SR3XX_RECOMMENDED_FIRMWARE_VERSION "3.26.1.0"
-#define D4XX_RC_FIRMWARE_VERSION "5.12.5.0"
 #define T26X_FIRMWARE_VERSION "0.2.0.951"
diff --git a/common/fw/fw.rc b/common/fw/fw.rc
@@ -1,4 +1,3 @@
 #include "D4XX_FW_Image.rc"
-#include "D4XX_RC_Image.rc"
 #include "SR3XX_FW_Image.rc"
 #include "target.rc"