Merge branch 'release-0.7.12'

Author: paperManu

.gitlab-ci.yml

@@ -5,7 +5,7 @@ variables:
 
 before_script: 
   - apt update -qq
-  - apt install -y curl wget build-essential git-core zip cmake automake libtool clang libxrandr-dev libxi-dev libglm-dev libgsl0-dev libatlas3-base libzmq3-dev libsnappy-dev libgphoto2-dev libxinerama-dev libxcursor-dev python3-dev portaudio19-dev yasm libgl1-mesa-dev
+  - apt install -y curl wget build-essential git-core zip cmake automake libtool libxrandr-dev libxi-dev libgsl0-dev libatlas3-base libgphoto2-dev libxinerama-dev libxcursor-dev python3-dev portaudio19-dev yasm libgl1-mesa-dev python
   - git submodule update --init
   - ./make_deps.sh
   - rm -rf build && mkdir build && cd build

CMakeLists.txt

@@ -20,7 +20,7 @@
 cmake_minimum_required(VERSION 3.2)
 project(
     splash 
-    VERSION 0.7.10
+    VERSION 0.7.12
     LANGUAGES C CXX
 )
 
@@ -46,7 +46,6 @@ set(ENV{PKG_CONFIG_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/external/third_parties/lib
 find_package(PkgConfig REQUIRED)
 
 # Mandatory dependencies
-pkg_search_module(SNAPPY REQUIRED snappy)
 pkg_search_module(GSL REQUIRED gsl)
 pkg_search_module(ZMQ REQUIRED libzmq)
 pkg_check_modules(FFMPEG REQUIRED libavformat libavcodec libavutil libswscale)
@@ -127,6 +126,7 @@ set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
 add_subdirectory(external/glfw)
+add_subdirectory(external/snappy)
 
 #
 # Sources
@@ -167,21 +167,7 @@ if(UNIX AND NOT APPLE) # Package creation on Linux
     set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")
     set(CPACK_DEBIAN_PROJECT_HOMEPAGE "https://gitlab.com/sat-metalab/splash/wiki")
     set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
-    set(CPACK_DEBIAN_PACKAGE_DEPENDS "libatlas3-base,
-                                      libboost-system1.58.0,
-                                      libgphoto2-6,
-                                      libgsl2,
-                                      libopencv-core2.4v5,
-                                      libopencv-highgui2.4v5,
-                                      libopencv-imgproc2.4v5,
-                                      libopencv-video2.4v5,
-                                      libxrandr2,
-                                      libxi6,
-                                      libxinerama1,
-                                      libxcursor1,
-                                      libzmq5,
-                                      libportaudio2,
-                                      zip")
+    set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
     set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR} <[email protected]>")
     set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Splash is a free (as in GPL) modular mapping software. Provided that the user creates a 3D model with UV mapping of the projection surface, Splash will take care of calibrating the videoprojectors (intrinsic and extrinsic parameters, blending), and feed them with the input video sources. Splash can handle multiple inputs, mapped on multiple 3D models, and has been tested with up to eight outputs on two graphic cards. It currently runs on a single computer but support for multiple computers mapping together is planned.")
     set(CPACK_DEBIAN_PACKAGE_SECTION "video")

NEWS.md

@@ -1,6 +1,23 @@
 Splash release notes
 ===================
 
+Splash 0.7.12 (2018-01-05)
+--------------------------
+New features:
+- Added support for named values, and a mediaInfo attribute to Images
+
+Improvements:
+- Added Python as a dependency for CI
+- Bundled GL FBOs into the Framebuffer class
+- Added get_size() method to Python sink
+- Added splash.get_interpreter_name() to Python
+- Updated ZMQ and Hap
+
+Bugs fixed:
+- Fixed blending when a virtual probe is in use, with multiple GPUs
+- Fixed a GPU leak in ProfilerGL
+- Fixed issue with command line args
+
 Splash 0.7.10 (2017-12-04)
 -------------------------
 New features:

addons/blender/splash/__init__.py

@@ -20,7 +20,7 @@
 bl_info = {
     "name": "Splash output",
     "author": "Emmanuel Durand",
-    "version": (0, 7, 10),
+    "version": (0, 7, 12),
     "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.7.10
+Version=0.7.12
 Name=Splash
 Exec=splash
 Type=Application

external/build_snappy.sh

@@ -40,6 +40,7 @@
 
 #include "./attribute.h"
 #include "./coretypes.h"
+#include "./framebuffer.h"
 #include "./geometry.h"
 #include "./image.h"
 #include "./object.h"
@@ -120,7 +121,13 @@ class Camera : public BaseObject
      * \brief Get the output texture for this camera
      * \return Return a pointer to the output textures
      */
-    std::shared_ptr<Texture_Image> getTexture() const { return _outColorTexture; }
+    std::shared_ptr<Texture_Image> getTexture() const
+    {
+        if (_outFbo)
+            return _outFbo->getColorTexture();
+        else
+            return {nullptr};
+    }
 
     /**
      * \brief Try to link the given BaseObject to this object
@@ -204,25 +211,8 @@ class Camera : public BaseObject
      */
     bool setCalibrationPoint(const Values& screenPoint);
 
-    /**
-     * \brief Set the output framebuffer
-     */
-    void setupFBO();
-
-    /**
-     * \brief Set the resolution of this camera
-     * \param width Width of the output textures
-     * \param height Height of the output textures
-     */
-    void setOutputSize(int width, int height);
-
   private:
-    GLuint _msFbo{0};
-    GLuint _outFbo{0};
-    std::unique_ptr<Texture_Image> _msDepthTexture{nullptr};
-    std::unique_ptr<Texture_Image> _msColorTexture{nullptr};
-    std::unique_ptr<Texture_Image> _outDepthTexture{nullptr};
-    std::shared_ptr<Texture_Image> _outColorTexture{nullptr};
+    std::unique_ptr<Framebuffer> _msFbo{nullptr}, _outFbo{nullptr};
     std::vector<std::weak_ptr<Object>> _objects;
 
     // Rendering parameters
@@ -231,7 +221,6 @@ class Camera : public BaseObject
     bool _showCameraCount{false};
     bool _hidden{false};
     bool _flashBG{false};
-    bool _automaticResize{true};
     bool _render16bits{true};
     int _multisample{0};
     bool _updateColorDepth{false}; // Set to true if the _render16bits has been updated
@@ -316,11 +305,6 @@ class Camera : public BaseObject
      */
     void sendCalibrationPointsToObjects();
 
-    /**
-     * \brief Update the color depth for all textures
-     */
-    void updateColorDepth();
-
     /**
      * \brief Register new functors to modify attributes
      */