Merge branch 'releasing/0.9.8'

paperManu · paperManu · commit fa2a845b8d3f · 2021-12-13T13:39:05.000-05:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -38,21 +38,26 @@ test:20.04:
     #
     # Test using bundled libs
     - ./make_deps.sh
-    - rm -rf build && mkdir build && cd build
+    - rm -rf build && mkdir build
+    - pushd build
     - cmake -DBUILD_GENERIC_ARCH=ON -DCMAKE_INSTALL_PREFIX=/usr ..
     - make -j$(nproc)
     - make test
-    - ./src/splash ../data/share/splash/splash.json
-    - cd ..
+    - ./src/splash --child --prefix unittest &
+    - ./src/splash --doNotSpawn --prefix unittest ../data/share/splash/splash.json
+    - popd
     #
     # Test using system libs
     - DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libglfw3-dev libglm-dev
       libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libsnappy-dev libzmq3-dev libzmqpp-dev
-    - rm -rf build && mkdir build && cd build
+    - rm -rf build && mkdir build
+    - pushd build
     - cmake -DBUILD_GENERIC_ARCH=ON -DUSE_SYSTEM_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr ..
     - make -j$(nproc)
     - make test
-    - ./src/splash ../data/share/splash/splash.json
+    - ./src/splash --child --prefix unittest &
+    - ./src/splash --doNotSpawn --prefix unittest ../data/share/splash/splash.json
+    - popd
   except:
     - website
 
diff --git a/Authors.md b/Authors.md
@@ -6,4 +6,4 @@
 * Sergio Jiménez Herena
 * Pascal Huerst
 * Josh Beckwith
-* eviau
+* Edith Viau
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@
 cmake_minimum_required(VERSION 3.12)
 project(
     splash
-    VERSION 0.9.6
+    VERSION 0.9.8
     LANGUAGES C CXX
 )
 
diff --git a/News.md b/News.md
@@ -1,6 +1,13 @@
 Splash release notes
 ====================
 
+Splash 0.9.8 (2021-12-13)
+-------------------------
+Bugs fixed:
+* Fixed link not being connected with Scene not spawned
+* Fixed CI random timeout
+* Fixed blending not applied on Scenes other than the main one
+
 Splash 0.9.6 (2021-12-01)
 -------------------------
 Bugs fixed:
diff --git a/addons/blender/splash/__init__.py b/addons/blender/splash/__init__.py
@@ -20,7 +20,7 @@
 bl_info = {
     "name": "Splash output",
     "author": "Emmanuel Durand",
-    "version": (0, 9, 6),
+    "version": (0, 9, 8),
     "blender": (2, 80, 0),
     "location": "3D View > Toolbox, File > Export",
     "description": "Utility tools to connect Blender to the Splash videomapper",
diff --git a/data/share/applications/splash.desktop b/data/share/applications/splash.desktop
@@ -4,4 +4,4 @@ Exec=splash
 Type=Application
 Icon=splash.png
 Categories=AudioVideo;Video;Graphics;
-Version=0.9.6
+Version=0.9.8
diff --git a/data/share/metainfo/com.gitlab.sat_metalab.Splash.metainfo.xml b/data/share/metainfo/com.gitlab.sat_metalab.Splash.metainfo.xml
@@ -14,11 +14,12 @@ Splash is a free (as in GPL) modular mapping software. Provided that the user cr
   <url type="homepage">https://sat-metalab.gitlab.io/splash</url>
   <screenshots>
     <screenshot type="default">
-      <image>https://sat-metalab.gitlab.io/splash/mkdocs/images/splash_multiview_gui.jpg</image>
+      <image>https://sat-metalab.gitlab.io/splash/en/_images/splash_multiview_gui.jpg</image>
       <caption>Splash user interface showing a fulldome project</caption>
     </screenshot>
   </screenshots>
   <releases>
+    <release version="0.9.8" date="2021-12-13" />
     <release version="0.9.6" date="2021-12-01" />
     <release version="0.9.4" date="2021-10-22" />
     <release version="0.9.2" date="2021-10-06" />
diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp
@@ -325,10 +325,10 @@ std::vector<std::string> ControllerObject::getObjectsOfType(const std::string& t
 }
 
 /*************/
-void ControllerObject::sendBuffer(const std::string& name, SerializedObject&& buffer) const
+void ControllerObject::sendBuffer(SerializedObject&& buffer) const
 {
     if (_root)
-        _root->sendBuffer(name, std::move(buffer));
+        _root->sendBuffer(std::move(buffer));
 }
 
 /*************/
@@ -391,7 +391,8 @@ void ControllerObject::setObjectsOfType(const std::string& type, const std::stri
     for (const auto& branchName : branchList)
     {
         auto path = "/" + branchName + "/objects";
-        assert(tree->hasBranchAt(path));
+        if (!tree->hasBranchAt(path))
+            continue;
         auto objectList = tree->getBranchListAt(path);
         for (const auto& objectName : objectList)
         {
diff --git a/src/controller/controller.h b/src/controller/controller.h
@@ -184,10 +184,9 @@ class ControllerObject : public GraphObject
 
     /**
      * \brief Send a serialized buffer to the given BufferObject
-     * \param name Object name
      * \param buffer Serialized buffer
      */
-    void sendBuffer(const std::string& name, SerializedObject&& buffer) const;
+    void sendBuffer(SerializedObject&& buffer) const;
 
     /**
      * \brief Set the given configuration-related attribute
diff --git a/src/controller/controller_blender.cpp b/src/controller/controller_blender.cpp
@@ -118,7 +118,7 @@ void Blender::update()
             for (auto& geometry : geometries)
             {
                 auto serializedGeometry = std::dynamic_pointer_cast<Geometry>(geometry)->serialize();
-                sendBuffer(geometry->getName(), std::move(serializedGeometry));
+                sendBuffer(std::move(serializedGeometry));
             }
 
             setObjectAttribute(_name, "blendingUpdated", {});
diff --git a/src/core/root_object.cpp b/src/core/root_object.cpp
@@ -362,16 +362,11 @@ void RootObject::propagatePath(const std::string& path)
 }
 
 /*************/
-void RootObject::sendBuffer(const std::string& name, SerializedObject&& buffer)
+void RootObject::sendBuffer(SerializedObject&& buffer)
 {
     assert(_link);
     assert(_link->isReady());
-
-    const auto size = Serial::getSize(name);
-    std::vector<uint8_t> serialized(size + buffer.size());
-    Serial::serialize(name, serialized);
-    std::copy(buffer._data.cbegin(), buffer._data.cend(), serialized.begin() + size);
-    _link->sendBuffer(SerializedObject(ResizableArray(std::move(serialized))));
+    _link->sendBuffer(std::move(buffer));
 }
 
 /*************/
diff --git a/src/core/root_object.h b/src/core/root_object.h
@@ -200,10 +200,9 @@ class RootObject : public BaseObject
 
     /**
      * Send the given serialized buffer through the link
-     * \param name Destination BufferObject name
      * \param buffer Serialized buffer
      */
-    void sendBuffer(const std::string& name, SerializedObject&& buffer);
+    void sendBuffer(SerializedObject&& buffer);
 
     /**
      * Return a lock object list modifications (addition, deletion)
diff --git a/src/core/world.cpp b/src/core/world.cpp
@@ -295,10 +295,18 @@ bool World::applyConfig()
             sendMessage(Constants::ALL_PEERS, "runInBackground", {_context.hide});
         }
 
-        // Make sure all objects have been created in every Scene, by sending a sync
-        // message
+        // Wait CONNECTION_TIMEOUT seconds maximum for scenes to start. Otherwise we consider
+        // it failed, and we quit
         for (const auto& s : _scenes)
-            sendMessageWithAnswer(s.first, "sync");
+        {
+            auto returnValue = sendMessageWithAnswer(s.first, "sync", {}, Constants::CONNECTION_TIMEOUT * 1'000'000);
+            if (returnValue.empty() || returnValue[1].as<std::string>() != s.first)
+            {
+                Log::get() << Log::ERROR << "World::" << __FUNCTION__ << " - Timeout when trying to sync with scene \"" << s.first << "\" before configuration. Exiting." << Log::endl;
+                _quit = true;
+                return false;
+            }
+        }
 
         // Then we link the objects together
         for (auto& s : _scenes)
@@ -386,10 +394,10 @@ bool World::applyConfig()
     // Send the start message for all scenes
     for (auto& s : _scenes)
     {
-        auto answer = sendMessageWithAnswer(s.first, "start", {}, 2e6);
+        auto answer = sendMessageWithAnswer(s.first, "start", {}, Constants::CONNECTION_TIMEOUT * 1'000'000);
         if (0 == answer.size())
         {
-            Log::get() << Log::ERROR << "World::" << __FUNCTION__ << " - Timeout when trying to connect to scene \"" << s.first << "\". Exiting." << Log::endl;
+            Log::get() << Log::ERROR << "World::" << __FUNCTION__ << " - Timeout when trying to start scene \"" << s.first << "\". Exiting." << Log::endl;
             _quit = true;
             break;
         }
@@ -489,7 +497,7 @@ bool World::addScene(const std::string& sceneName, const std::string& sceneDispl
                 sendMessage(sceneName, "checkSceneRunning");
                 if (std::cv_status::timeout == _childProcessConditionVariable.wait_for(lockChildProcess, std::chrono::milliseconds(100)))
                 {
-                    if (Timer::get().getTime() - startTime < Constants::CONNECTION_TIMEOUT * 1e6)
+                    if (Timer::get().getTime() - startTime < Constants::CONNECTION_TIMEOUT * 1'000'000)
                         continue;
 
                     Log::get() << Log::ERROR << "World::" << __FUNCTION__ << " - Timeout when trying to connect to newly spawned scene \"" << sceneName << "\". Exiting."
@@ -499,6 +507,11 @@ bool World::addScene(const std::string& sceneName, const std::string& sceneDispl
                 }
             }
         }
+        else
+        {
+            // Initialize the communication
+            _link->connectTo(sceneName);
+        }
 
         _scenes[sceneName] = pid;
         if (_masterSceneName.empty())
diff --git a/src/graphics/geometry.cpp b/src/graphics/geometry.cpp
@@ -322,7 +322,7 @@ void Geometry::update()
         }
         else
         {
-            const auto data = reinterpret_cast<float*>(_deserializedMesh->vertices.data());
+            const auto data = reinterpret_cast<char*>(_deserializedMesh->vertices.data());
             _glTemporaryBuffers[0]->setBufferFromVector({data, data + _temporaryVerticesNumber * sizeof(float) * 4});
         }
 
@@ -332,7 +332,7 @@ void Geometry::update()
         }
         else
         {
-            const auto data = reinterpret_cast<float*>(_deserializedMesh->uvs.data());
+            const auto data = reinterpret_cast<char*>(_deserializedMesh->uvs.data());
             _glTemporaryBuffers[1]->setBufferFromVector({data, data + _temporaryVerticesNumber * sizeof(float) * 2});
         }
 
@@ -343,7 +343,7 @@ void Geometry::update()
         }
         else
         {
-            const auto data = reinterpret_cast<float*>(_deserializedMesh->normals.data());
+            const auto data = reinterpret_cast<char*>(_deserializedMesh->normals.data());
             _glTemporaryBuffers[2]->setBufferFromVector({data, data + _temporaryVerticesNumber * sizeof(float) * 4});
         }
 
@@ -353,7 +353,7 @@ void Geometry::update()
         }
         else
         {
-            const auto data = reinterpret_cast<float*>(_deserializedMesh->annexe.data());
+            const auto data = reinterpret_cast<char*>(_deserializedMesh->annexe.data());
             _glTemporaryBuffers[3]->setBufferFromVector({data, data + _temporaryVerticesNumber * sizeof(float) * 4});
         }
 
diff --git a/tools/make_authors_from_git.sh b/tools/make_authors_from_git.sh
@@ -17,6 +17,7 @@ git log --format='%aN' | \
     sed 's/Marie-Eve$/Marie-Eve Dumas/' | \
     sed 's/nicolas/Nicolas Bouillot/' | \
     sed 's/Emamnuel Durand/Emmanuel Durand/' | \
+    sed 's/eviau/Edith Viau/' | \
     grep -v metalab | \
     sort | \
     uniq -c | sort -bgr | \

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`cmake_minimum_required(VERSION 3.12)`
`21`	`21`	`project(`
`22`	`22`	`splash`
`23`		`- VERSION 0.9.6`
	`23`	`+ VERSION 0.9.8`
`24`	`24`	`LANGUAGES C CXX`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -325,10 +325,10 @@ std::vector<std::string> ControllerObject::getObjectsOfType(const std::string& t`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`/*************/`
`328`		`-void ControllerObject::sendBuffer(const std::string& name, SerializedObject&& buffer) const`
	`328`	`+void ControllerObject::sendBuffer(SerializedObject&& buffer) const`
`329`	`329`	`{`
`330`	`330`	`if (_root)`
`331`		`- _root->sendBuffer(name, std::move(buffer));`
	`331`	`+ _root->sendBuffer(std::move(buffer));`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`/*************/`
`@@ -391,7 +391,8 @@ void ControllerObject::setObjectsOfType(const std::string& type, const std::stri`
`391`	`391`	`for (const auto& branchName : branchList)`
`392`	`392`	`{`
`393`	`393`	`auto path = "/" + branchName + "/objects";`
`394`		`- assert(tree->hasBranchAt(path));`
	`394`	`+ if (!tree->hasBranchAt(path))`
	`395`	`+ continue;`
`395`	`396`	`auto objectList = tree->getBranchListAt(path);`
`396`	`397`	`for (const auto& objectName : objectList)`
`397`	`398`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ void Blender::update()`
`118`	`118`	`for (auto& geometry : geometries)`
`119`	`119`	`{`
`120`	`120`	`auto serializedGeometry = std::dynamic_pointer_cast<Geometry>(geometry)->serialize();`
`121`		`- sendBuffer(geometry->getName(), std::move(serializedGeometry));`
	`121`	`+ sendBuffer(std::move(serializedGeometry));`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`setObjectAttribute(_name, "blendingUpdated", {});`