Version 2.2.1, fixed rendering bug, minor changes

CMakeLists.txt

@@ -10,7 +10,7 @@ set(NCINE_APP_DESCRIPTION "Open-source reimplementation of Jazz Jackrabbit 2")
 set(NCINE_APP_DESCRIPTION_FULL "Jazz² Resurrection is reimplementation of the game Jazz Jackrabbit 2 released in 1998. Supports various versions of the game (Shareware Demo, Holiday Hare '98, The Secret Files and Christmas Chronicles). Also, it partially supports some features of JJ2+ extension and MLLE.\n\nFurther information can be found here: http://deat.tk/jazz2/")
 set(NCINE_APP_VENDOR "Dan R.")
 set(NCINE_REVERSE_DNS "jazz2.resurrection")
-set(NCINE_VERSION "2.2.0")
+set(NCINE_VERSION "2.2.1")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 get_filename_component(PARENT_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)

Sources/Common.h

@@ -8,7 +8,7 @@
 #	define NCINE_APP_NAME "Jazz² Resurrection"
 #endif
 #if !defined(NCINE_VERSION)
-#	define NCINE_VERSION "2.2.0"
+#	define NCINE_VERSION "2.2.1"
 #endif
 #if !defined(NCINE_LINUX_PACKAGE)
 #	define NCINE_LINUX_PACKAGE NCINE_APP_NAME

Sources/Jazz2.vcxproj.filters

@@ -1329,9 +1329,6 @@
     <ClInclude Include="$(ExtensionLibraryPath)\Containers\Tags.h">
       <Filter>Header Files\Shared\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="$(ExtensionLibraryPath)\Containers\DateTime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Jazz2\Multiplayer\NetworkManager.h">
       <Filter>Header Files\Jazz2\Multiplayer</Filter>
     </ClInclude>
@@ -1386,12 +1383,15 @@
     <ClInclude Include="Jazz2\Multiplayer\Reason.h">
       <Filter>Header Files\Jazz2\Multiplayer</Filter>
     </ClInclude>
-    <ClInclude Include="Jazz2\Multiplayer\ConnectionResult.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(ExtensionLibraryPath)\Base\Unaligned.h">
       <Filter>Header Files\Shared\Base</Filter>
     </ClInclude>
+    <ClInclude Include="Jazz2\Multiplayer\ConnectionResult.h">
+      <Filter>Header Files\Jazz2\Multiplayer</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ExtensionLibraryPath)\Containers\DateTime.h">
+      <Filter>Header Files\Shared\Containers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp">
@@ -2301,7 +2301,7 @@
       <Filter>Source Files\Jazz2</Filter>
     </ClCompile>
     <ClCompile Include="Jazz2\Multiplayer\ConnectionResult.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Jazz2\Multiplayer</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>

Sources/Jazz2/LevelHandler.cpp

@@ -1754,6 +1754,7 @@ namespace Jazz2
 			return command;
 		} else {
 			std::unique_ptr<RenderCommand>& command = _renderCommands.emplace_back(std::make_unique<RenderCommand>());
+			_renderCommandsCount++;
 			command->material().setShader(_owner->_lightingShader);
 			command->material().setBlendingEnabled(true);
 			command->material().setBlendingFactors(GL_SRC_ALPHA, GL_ONE);

Sources/Jazz2/Tiles/TileMap.cpp

@@ -801,6 +801,7 @@ namespace Jazz2::Tiles
 			_renderCommandsCount++;
 		} else {
 			command = _renderCommands.emplace_back(std::make_unique<RenderCommand>()).get();
+			_renderCommandsCount++;
 			command->material().setBlendingEnabled(true);
 		}
 

Sources/Jazz2/UI/Canvas.cpp

@@ -118,6 +118,7 @@ namespace Jazz2::UI
 		} else {
 			std::unique_ptr<RenderCommand>& command = _renderCommands.emplace_back(std::make_unique<RenderCommand>());
 			command->material().setBlendingEnabled(true);
+			_renderCommandsCount++;
 			return command.get();
 		}
 	}

Sources/Main.cpp

@@ -206,7 +206,7 @@ void GameEventHandler::OnInit()
 #if defined(WITH_THREADS) && !defined(DEATH_TARGET_EMSCRIPTEN)
 	// If threading support is enabled, refresh cache during intro cinematics and don't allow skip until it's completed
 	Thread thread([](void* arg) {
-		Thread::SetSelfName("Parallel initialization");
+		Thread::SetCurrentName("Parallel initialization");
 
 		auto handler = static_cast<GameEventHandler*>(arg);
 #	if (defined(DEATH_TARGET_WINDOWS) && !defined(DEATH_TARGET_WINDOWS_RT)) || defined(DEATH_TARGET_UNIX)

Sources/Resources.rc

@@ -4,8 +4,8 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2, 2, 0, 0
- PRODUCTVERSION 2, 2, 0, 0
+ FILEVERSION 2, 2, 1, 0
+ PRODUCTVERSION 2, 2, 1, 0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -21,12 +21,12 @@ VS_VERSION_INFO VERSIONINFO
 		BLOCK "000004b0"
 		{
 			VALUE "CompanyName", "Dan R."
-			VALUE "FileVersion", "2.2.0.0"
+			VALUE "FileVersion", "2.2.1.0"
 			VALUE "InternalName", "Jazz2"
 			VALUE "LegalCopyright", "© 2016-2023 Dan R."
 			VALUE "OriginalFilename", "Jazz2.exe"
 			VALUE "ProductName", "Jazz² Resurrection"
-			VALUE "ProductVersion", "2.2.0.0"
+			VALUE "ProductVersion", "2.2.1.0"
 			VALUE "FileDescription", "Jazz² Resurrection: Open-source reimplementation of Jazz Jackrabbit 2"
 		}
 	}

Sources/nCine/Graphics/RenderBatcher.cpp

@@ -170,9 +170,9 @@ namespace nCine
 				batchingWithIndices = true;
 			}
 
-			// Don't request more bytes than an instances block can hold (also protects against big `RenderingSettings::maxBatchSize` values)
+			// Don't request more bytes than a UBO can hold
 			const unsigned long currentSize = nonBlockUniformsSize + nonInstancesBlocksSize + instancesBlockSize;
-			if (currentSize + singleInstanceBlockSize > instancesBlock->size()) {
+			if (currentSize + singleInstanceBlockSize > UboMaxSize) {
 				break;
 			}
 

Sources/nCine/Threading/PosixThread.cpp

@@ -178,7 +178,7 @@ namespace nCine
 #endif
 	}
 
-	void Thread::SetSelfName(const char* name)
+	void Thread::SetCurrentName(const char* name)
 	{
 #if defined(WITH_TRACY)
 		tracy::SetThreadName(name);

Sources/nCine/Threading/Thread.h

@@ -126,7 +126,7 @@ namespace nCine
 		void SetName(const char* name);
 
 		/** @brief Sets the calling thread name (not supported on Emscripten and Switch) */
-		static void SetSelfName(const char* name);
+		static void SetCurrentName(const char* name);
 
 #if !defined(DEATH_TARGET_SWITCH)
 		/** @brief Gets the thread priority */

Sources/nCine/Threading/WindowsThread.cpp

@@ -158,7 +158,7 @@ namespace nCine
 		}
 	}
 
-	void Thread::SetSelfName(const char* name)
+	void Thread::SetCurrentName(const char* name)
 	{
 #if defined(WITH_TRACY)
 		tracy::SetThreadName(name);