Merge branch 'release-0.6.6'

Author: paperManu

CMakeLists.txt

@@ -20,7 +20,7 @@
 cmake_minimum_required(VERSION 3.2)
 project(
     splash 
-    VERSION 0.6.4
+    VERSION 0.6.6
     LANGUAGES C CXX
 )
 
@@ -97,6 +97,10 @@ elseif(APPLE)
     set(HAVE_OSX 1)
 endif()
 
+if (DEBUG_OPENGL EQUAL 1)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUGGL")
+endif()
+
 if (DATAPATH_SDK_PATH)
     if (IS_DIRECTORY "${DATAPATH_SDK_PATH}/include" AND IS_DIRECTORY "${DATAPATH_SDK_PATH}/utils")
         set(HAVE_DATAPATH 1)
@@ -211,6 +215,7 @@ info_cfg_option(SHMDATA_VERSION)
 info_cfg_option(PYTHONLIBS_VERSION_STRING)
 info_cfg_option(DATAPATH_SDK_PATH)
 info_cfg_option(DOXYGEN_FOUND)
+info_cfg_option(DEBUG_OPENGL)
 
 info_cfg_text("")
 message("${_config_msg}")

NEWS.md

@@ -1,6 +1,18 @@
 Splash release notes
 ===================
 
+Splash 0.6.6 (2017-04-28)
+-------------------------
+Improvements:
+- Converted to OpenGL 4.5
+- Improved the file selector
+- Sinks now use framerate as a parameter (instead of period), shmdata sinks fill the caps with this parameter
+- Moving mouse over a window which does not hold the GUI does not move the mouse on the GUI window anymore
+
+Bug fixed:
+- Fixed warp jittery movement. Still some undesired visual glitches when editing warps
+- Fixed window fullscreen behavior
+
 Splash 0.6.4 (2017-04-13)
 -------------------------
 New features:

addons/blender/splash/__init__.py

@@ -20,7 +20,7 @@
 bl_info = {
     "name": "Splash output",
     "author": "Emmanuel Durand",
-    "version": (0, 6, 4),
+    "version": (0, 6, 6),
     "blender": (2, 72, 0),
     "location": "3D View > Toolbox, File > Export",
     "description": "Utility tools to connect Blender to the Splash videomapper",

data/config/splash-launcher.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.6.4
+Version=0.6.6
 Name=Splash
 Exec=splash
 Type=Application

include/base_object.h

@@ -73,7 +73,11 @@ class BaseObject
     /**
      * \brief Constructor.
      */
-    BaseObject(): _root(nullptr) { init(); }
+    BaseObject()
+        : _root(nullptr)
+    {
+        init();
+    }
 
     /**
      * \brief Constructor.
@@ -305,11 +309,12 @@ class BaseObject
     bool _savable{true}; //!< True if the object should be saved
 
   protected:
-    unsigned long _id{0};               //!< Internal ID of the object
-    std::string _type{"baseobject"};    //!< Internal type
-    Category _category{Category::MISC}; //!< Object category, updated by the factory
-    std::string _remoteType{""};        //!< When the object root is a Scene, this is the type of the corresponding object in the World
-    std::string _name{""};              //!< Object name
+    unsigned long _id{0};                //!< Internal ID of the object
+    std::string _type{"baseobject"};     //!< Internal type
+    Category _category{Category::MISC};  //!< Object category, updated by the factory
+    std::string _remoteType{""};         //!< When the object root is a Scene, this is the type of the corresponding object in the World
+    std::string _name{""};               //!< Object name
+    std::vector<BaseObject*> _parents{}; //!< Objects parents
 
     Priority _renderingPriority{Priority::NO_RENDER}; //!< Rendering priority, if negative the object won't be rendered
     int _priorityShift{0};                            //!< Shift applied to rendering priority
@@ -347,6 +352,18 @@ class BaseObject
     AttributeFunctor& addAttribute(
         const std::string& name, const std::function<bool(const Values&)>& set, const std::function<const Values()>& get, const std::vector<char>& types = {});
 
+    /**
+     * Inform that the given object is a parent
+     * \param obj Parent object
+     */
+    void linkToParent(BaseObject* obj);
+
+    /**
+     * Remove the given object as a parent
+     * \param obj Parent object
+     */
+    void unlinkFromParent(BaseObject* obj);
+
     /**
      * \brief Register new attributes
      */

include/camera.h

@@ -119,10 +119,10 @@ class Camera : public BaseObject
     void drawModelOnce(const std::string& modelName, const glm::dmat4& rtMatrix);
 
     /**
-     * \brief Get the output textures for this camera
-     * \return Return a vector of pointers to the output textures
+     * \brief Get the output texture for this camera
+     * \return Return a pointer to the output textures
      */
-    std::vector<std::shared_ptr<Texture_Image>> getTextures() const { return _outTextures; }
+    std::shared_ptr<Texture_Image> getTexture() const { return _outTexture; }
 
     /**
      * \brief Check whether the camera is initialized
@@ -213,10 +213,9 @@ class Camera : public BaseObject
     bool setCalibrationPoint(const Values& screenPoint);
 
     /**
-     * \brief Set the number of output buffers for this camera
-     * \param nbr Number of outputs
+     * \brief Set the output framebuffer
      */
-    void setOutputNbr(int nbr);
+    void setupFBO();
 
     /**
      * \brief Set the resolution of this camera
@@ -231,7 +230,7 @@ class Camera : public BaseObject
 
     GLuint _fbo{0};
     std::shared_ptr<Texture_Image> _depthTexture;
-    std::vector<std::shared_ptr<Texture_Image>> _outTextures;
+    std::shared_ptr<Texture_Image> _outTexture;
     std::vector<std::weak_ptr<Object>> _objects;
 
     // Rendering parameters

include/controller_gui.h

@@ -190,7 +190,7 @@ class Gui : public ControllerObject
 
     GLuint _fbo{0};
     std::shared_ptr<Texture_Image> _depthTexture;
-    std::shared_ptr<Texture> _outTexture;
+    std::shared_ptr<Texture_Image> _outTexture;
     float _width{512}, _height{512};
     int _initialGuiPos[2]{16, 16}; //!< Gui position at startup
 
@@ -215,6 +215,7 @@ class Gui : public ControllerObject
     // Gui related attributes
     std::string _configurationPath;
     std::string _projectPath;
+    bool _mouseHoveringWindow{false};
     bool _isVisible{false};
     bool _flashBG{false}; // Set to true if the BG is set to all white for all outputs
     bool _wireframe{false};

include/coretypes.h

@@ -35,6 +35,7 @@
 #define SPLASH_FILE_PROJECT "splashProject"
 
 #include <ostream>
+#include <execinfo.h>
 
 #include "./gl_window.h"
 #include "./log.h"

include/mesh_bezierPatch.h

@@ -88,6 +88,7 @@ class Mesh_BezierPatch : public Mesh
 
     Patch _patch{};
     int _patchResolution{64};
+    std::mutex _patchMutex{};
 
     bool _patchUpdated{true};
     MeshContainer _bezierControl;

include/sink.h

@@ -75,6 +75,8 @@ class Sink : public BaseObject
     void render() override;
 
   protected:
+    uint32_t _framerate{30}; //!< Maximum framerate
+
     /**
      * \brief Register new functors to modify attributes
      */
@@ -87,7 +89,6 @@ class Sink : public BaseObject
     std::mutex _lockPixels;
 
     bool _opened{false}; //!< If true, the sink lets frames through
-    uint32_t _period{0}; //!< Minimum time between consecutive frames
 
     uint64_t _lastFrameTiming{0};
     uint32_t _pboCount{3};