Merge pull request #192 from naivisoftware/shylight_sequencer_update

Shylight sequencer update
napframework · Jun 15, 2022 · fe7cec6 · fe7cec6
2 parents 315d78d + cfdae0c
commit fe7cec6
Show file tree

Hide file tree

Showing 17 changed files with 431 additions and 281 deletions.
diff --git a/demos/sequencer/data/default.json b/demos/sequencer/data/default.json
@@ -139,7 +139,8 @@
             "mID": "SequenceEditorGUI",
             "Sequence Editor": "SequenceEditor",
             "Render Window": "SequencerWindow",
-            "Draw Full Window": true
+            "Draw Full Window": true,
+            "Hide Marker Labels": false
         },
         {
             "Type": "nap::SequencePlayer",

diff --git a/modules/naprender/src/renderservice.cpp b/modules/naprender/src/renderservice.cpp
@@ -1480,8 +1480,10 @@ namespace nap
 		{
 			auto it = mDisplays.emplace_back(Display(i));
 			nap::Logger::info(it.toString());
-			if (!errorState.check(it.isValid(), "Display %d: unable to extract required information", i))
+			if (!errorState.check(it.isValid(), "Display: %d, unable to extract required information"))
+			{
 				return false;
+			}
 		}
 
 		// Initialize shader compiler

diff --git a/modules/naprender/src/renderwindow.cpp b/modules/naprender/src/renderwindow.cpp
@@ -586,6 +586,12 @@ namespace nap
 	}
 
 
+	void RenderWindow::setTitle(std::string newTitle)
+	{
+		SDL::setWindowTitle(mSDLWindow, newTitle);
+	}
+
+
 	void RenderWindow::setFullscreen(bool value)
 	{
 		SDL::setFullscreen(mSDLWindow, value);

diff --git a/modules/naprender/src/renderwindow.h b/modules/naprender/src/renderwindow.h
@@ -136,6 +136,11 @@ namespace nap
 		 */
 		const std::string& getTitle() const										{ return mTitle; }
 
+		/**
+		 *	Sets the window title
+		 */
+		void setTitle(std::string newTitle);
+
 		/**
 		 *	@return if the window is resizable
 		 */