Merge remote-tracking branch 'origin/beta'

CMakeLists.txt

@@ -79,6 +79,7 @@ if(UNIX)
     else()
         add_definitions(-DLINUX)
 #        add_definitions(-DUSE_GST_OPENGL_SYNC_HANDLER)
+#        add_definitions(-DUSE_GL_BUFFER_SUBDATA)
 
         # CPACK
         set(CPACK_SYSTEM_NAME "${CMAKE_HOST_SYSTEM_NAME}")

src/Mixer.cpp

@@ -250,17 +250,21 @@ void Mixer::update()
         }
     }
 
-    // update views
-    mixing_.update(dt_);
-    geometry_.update(dt_);
-    layer_.update(dt_);
-    appearance_.update(dt_);
-    transition_.update(dt_);
-    displays_.update(dt_);
-
-    // deep update was performed
-    if  (View::need_deep_update_ > 0)
+    // update all views for deep update
+    if (View::need_deep_update_ > 0) {
+        mixing_.update(dt_);
+        geometry_.update(dt_);
+        layer_.update(dt_);
+        appearance_.update(dt_);
+        transition_.update(dt_);
+        displays_.update(dt_);
+
+        // deep update was performed
         --View::need_deep_update_;
+    }
+    // update only current view otherwise
+    else
+        current_view_->update(dt_);
 }
 
 void Mixer::draw()

src/RenderingManager.cpp

@@ -955,9 +955,9 @@ bool RenderingWindow::init(int index, GLFWwindow *share)
     glfwWindowHint(GLFW_AUTO_ICONIFY, GLFW_FALSE);
 
     // restore decoration state
-    if (master_ != NULL && !winset.decorated) {
-        glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
-        glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
+    if (master_ != NULL) {
+        glfwWindowHint(GLFW_RESIZABLE, winset.decorated ? GLFW_TRUE : GLFW_FALSE);
+        glfwWindowHint(GLFW_DECORATED, winset.decorated ? GLFW_TRUE : GLFW_FALSE);
     }
 
     // create the window

src/SourceCallback.cpp

@@ -450,11 +450,12 @@ void SetDepth::update(Source *s, float dt)
         if ( progress > duration_ ) {
             // apply depth to target
             s->group(View::LAYER)->translation_.z = target_;
-            // ensure reordering of view
-            ++View::need_deep_update_;
             // done
             status_ = FINISHED;
         }
+
+        // ensure reordering of sources in view
+        ++View::need_deep_update_;
     }
 }
 

src/UserInterfaceManager.cpp

@@ -1133,7 +1133,7 @@ void UserInterface::showMenuWindows()
     ImGui::Separator();
 
     // Enter / exit Fullscreen
-    if (Rendering::manager().mainWindow().isFullscreen()){
+    if (Settings::application.windows[0].fullscreen){
         if (ImGui::MenuItem( ICON_FA_COMPRESS_ALT "   Exit Fullscreen", SHORTCUT_FULLSCREEN ))
             Rendering::manager().mainWindow().toggleFullscreen();
     }