Additional Viewer Enhancements

common/CMakeLists.txt

@@ -23,6 +23,8 @@ 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}/on-chip-calib.h"
         "${CMAKE_CURRENT_LIST_DIR}/on-chip-calib.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/decompress-huffman.h"

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;

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 be77db800142110b35d1cc7f12dfc77e75ed9c8a)
-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)
 

common/fw/firmware-version.h

@@ -5,5 +5,4 @@
 
 #define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.12.3.0"
 #define SR3XX_RECOMMENDED_FIRMWARE_VERSION "3.26.1.0"
-#define D4XX_RC_FIRMWARE_VERSION "5.12.3.0"
 #define T26X_FIRMWARE_VERSION "0.2.0.951"

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"

common/model-views.cpp

@@ -27,6 +27,9 @@
 #include <imgui_internal.h>
 #include <time.h>
 
+#include "imgui-fonts-karla.hpp"
+#include "imgui-fonts-fontawesome.hpp"
+
 #include "os.h"
 
 #include "metadata-helper.h"
@@ -140,9 +143,8 @@ namespace rs2
 
         const int OVERSAMPLE = config_file::instance().get(configurations::performance::font_oversample);
 
-        static const ImWchar icons_ranges[] = { 0xf000, 0xf3ff, 0 }; // will not be copied by AddFont* so keep in scope.
+        static const ImWchar icons_ranges[] = { 0xf000, 0xf999, 0 }; // will not be copied by AddFont* so keep in scope.
 
-                                                                     // Load 14px size fonts
         {
             ImFontConfig config_words;
             config_words.OversampleV = OVERSAMPLE;
@@ -170,6 +172,7 @@ namespace rs2
             config_glyphs.OversampleH = OVERSAMPLE;
             font_18 = io.Fonts->AddFontFromMemoryCompressedTTF(font_awesome_compressed_data,
                 font_awesome_compressed_size, 20.f, &config_glyphs, icons_ranges);
+
         }
 
         style.WindowRounding = 0.0f;
@@ -3327,11 +3330,16 @@ namespace rs2
                         {
                             auto n = std::make_shared<fw_update_notification_model>(
                                 msg.str(), manager, false);
-                            viewer.not_model.add_notification(n);
+                            n->delay_id = "dfu." + name.second;
+                            n->enable_complex_dismiss = true;
+                            if (!n->is_delayed())
+                            {
+                                viewer.not_model.add_notification(n);
 
-                            fw_update_required = true;
+                                fw_update_required = true;
 
-                            related_notifications.push_back(n);
+                                related_notifications.push_back(n);
+                            }
                         }
                     }
                 }
@@ -3643,6 +3651,8 @@ namespace rs2
                     default: break;
                 }
 
+                pc->set_option(RS2_OPTION_FILTER_MAGNITUDE, 
+                    viewer.occlusion_invalidation ? 2.f : 1.f);
                 res.push_back(pc->calculate(depth));
             }
             if(auto texture = viewer.get_3d_texture_source(filtered))

common/model-views.h

@@ -19,8 +19,6 @@
 #include <array>
 #include <unordered_map>
 
-#include "imgui-fonts-karla.hpp"
-#include "imgui-fonts-fontawesome.hpp"
 #include "../third-party/json.hpp"
 #include "objects-in-frame.h"
 #include "processing-block-model.h"
@@ -163,6 +161,7 @@ namespace rs2
             static const char* settings_tab        { "viewer_model.settings_tab" };
             static const char* sdk_version         { "viewer_model.sdk_version" };
             static const char* last_calib_notice   { "viewer_model.last_calib_notice" };
+            static const char* is_measuring        { "viewer_model.is_measuring" };
 
             static const char* log_to_console      { "viewer_model.log_to_console" };
             static const char* log_to_file         { "viewer_model.log_to_file" };
@@ -172,6 +171,7 @@ namespace rs2
             static const char* show_map_ruler      { "viewer_model.show_map_ruler" };
             static const char* show_stream_details { "viewer_model.show_stream_details" };
             static const char* metric_system       { "viewer_model.metric_system" };
+            static const char* shading_mode        { "viewer_model.shading_mode" };
 
             static const char* last_ip             { "viewer_model.last_ip" };
         }
@@ -195,6 +195,8 @@ namespace rs2
             static const char* show_fps            { "performance.show_fps" };
             static const char* vsync               { "performance.vsync" };
             static const char* font_oversample     { "performance.font_oversample.v2" };
+            static const char* show_skybox         { "performance.show_skybox" };
+            static const char* occlusion_invalidation { "performance.occlusion_invalidation" };
         }
         namespace ply
         {
@@ -261,6 +263,8 @@ namespace rs2
         static const textual_icon metadata                 { u8"\uF0AE" };
         static const textual_icon check                    { u8"\uF00C" };
         static const textual_icon mail                     { u8"\uF01C" };
+        static const textual_icon cube                     { u8"\uf1b2" };
+        static const textual_icon measure                  { u8"\uf545" };
     }
 
     class subdevice_model;

common/notifications.cpp

@@ -258,9 +258,52 @@ namespace rs2
         ImGui::SetCursorScreenPos({ float(x + width - 105), float(y + height - 25) });
 
         string id = to_string() << "Dismiss" << "##" << index;
+
+        ImGui::PushStyleColor(ImGuiCol_Text, black);
+        ImGui::PushStyleColor(ImGuiCol_PopupBg, almost_white_bg);
+        ImGui::PushStyleColor(ImGuiCol_HeaderHovered, light_blue);
+        ImGui::PushStyleColor(ImGuiCol_TextSelectedBg, white);
+
+        ImGui::PushFont(win.get_font());
+
+        ImGui::SetNextWindowPos({ float(x + width - 125), float(y + height - 25) });
+        ImGui::SetNextWindowSize({ 120, 70 });
+
+        std::string dismiss_popup = to_string() << "Dismiss Options" << "##" << index;
+        if (ImGui::BeginPopup(dismiss_popup.c_str()))
+        {
+            if (ImGui::Selectable("Just this time"))
+            {
+                dismiss(true);
+            }
+
+            if (ImGui::Selectable("Remind me later"))
+            {
+                delay(7);
+                dismiss(true);
+            }
+
+            if (ImGui::Selectable("Don't show again"))
+            {
+                delay(1000);
+                dismiss(true);
+            }
+
+            ImGui::EndPopup();
+        }
+
+        ImGui::PopFont();
+        ImGui::PopStyleColor(4);
+
         if (ImGui::Button(id.c_str(), { 100, 20 }))
         {
-            dismiss(true);
+            if (enable_complex_dismiss)
+                ImGui::OpenPopup(dismiss_popup.c_str());
+            else dismiss(true);
+        }
+        if (ImGui::IsItemHovered())
+        {
+            win.link_hovered();
         }
     }
 
@@ -1039,4 +1082,24 @@ namespace rs2
             ImGui::SetTooltip("%s", "Enables metadata on connected devices (you may be prompted for administrator privileges)");
         }
     }
+
+    bool notification_model::is_delayed() const
+    {
+        // Make sure we don't spam calibration remainders too often:
+        time_t rawtime;
+        time(&rawtime);
+        std::string str = to_string() << "notifications." << delay_id << ".next";
+        long long next_time = config_file::instance().get_or_default(str.c_str(), (long long)0);
+
+        return rawtime < next_time;
+    }
+
+    void notification_model::delay(int days)
+    {
+        // Make sure we don't spam calibration remainders too often:
+        time_t rawtime;
+        time(&rawtime);
+        std::string str = to_string() << "notifications." << delay_id << ".next";
+        config_file::instance().set(str.c_str(), (long long)(rawtime + days * 60 * 60 * 24));
+    }
 }

common/notifications.h

@@ -80,6 +80,12 @@ namespace rs2
         bool enable_dismiss = true;
         bool enable_expand = true;
         bool enable_click = false;
+        bool enable_complex_dismiss = false;
+
+        std::string delay_id = "";
+
+        bool is_delayed() const;
+        void delay(int days);
 
         float last_x, last_y;
         bool animating = false;