Build: Updated 'bsf' version

Source/EditorCore/Build/BsPlatformInfo.cpp

@@ -14,9 +14,6 @@ namespace bs
 #endif
 	{ }
 
-	PlatformInfo::~PlatformInfo()
-	{ }
-
 	RTTITypeBase* PlatformInfo::getRTTIStatic()
 	{
 		return PlatformInfoRTTI::instance();
@@ -27,9 +24,6 @@ namespace bs
 		return PlatformInfo::getRTTIStatic();
 	}
 
-	WinPlatformInfo::WinPlatformInfo()
-	{ }
-
 	RTTITypeBase* WinPlatformInfo::getRTTIStatic()
 	{
 		return WinPlatformInfoRTTI::instance();

Source/EditorCore/Build/BsPlatformInfo.h

@@ -23,7 +23,7 @@ namespace bs
 	struct BS_ED_EXPORT PlatformInfo : public IReflectable
 	{
 		PlatformInfo();
-		virtual ~PlatformInfo();
+		virtual ~PlatformInfo() = default;
 
 		PlatformType type; /**< Type of platform this object contains data for. */
 		String defines; /**< A set of semicolon separated defines to use when compiling scripts for this platform. */
@@ -45,7 +45,7 @@ namespace bs
 	/** Contains Windows specific per-platform information used primarily for build purposes. */
 	struct BS_ED_EXPORT WinPlatformInfo : public PlatformInfo
 	{
-		WinPlatformInfo();
+		WinPlatformInfo() = default;
 
 		ResourceHandle<Texture> icon;
 		WString titlebarText;

Source/EditorCore/Private/RTTI/BsDockManagerLayoutRTTI.h

@@ -82,7 +82,7 @@ namespace bs
 
 		static BitLength toMemory(const bs::DockManagerLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
+			return rtti_write_with_size_header(stream, data, compress, [&data, &stream]()
 			{
 				BitLength size = 0;
 				size += rtti_write(data.isLeaf, stream);
@@ -125,10 +125,10 @@ namespace bs
 			return size;
 		}
 
-		static BitLength getSize(const bs::DockManagerLayout::Entry& data, bool compress)	
+		static BitLength getSize(const bs::DockManagerLayout::Entry& data, const RTTIFieldInfo& fieldInfo, bool compress)	
 		{ 
-			BitLength dataSize = rtti_size(data.isLeaf) + rtti_size(data.horizontalSplit) + 
-				rtti_size(data.splitPosition) + rtti_size(data.widgetNames) + sizeof(uint32_t);
+			BitLength dataSize = rtti_size(data.isLeaf) + rtti_size(data.horizontalSplit) +
+				rtti_size(data.splitPosition) + rtti_size(data.widgetNames);
 
 			if(!data.isLeaf)
 			{
@@ -136,6 +136,7 @@ namespace bs
 				dataSize += rtti_size(*data.children[1]);
 			}
 
+			rtti_add_header_size(dataSize, compress);
 			return dataSize;
 		}	
 	}; 

Source/EditorCore/Private/RTTI/BsEditorSettingsRTTI.h

@@ -70,7 +70,7 @@ namespace bs
 
 		static BitLength toMemory(const RecentProject& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
+			return rtti_write_with_size_header(stream, data, compress, [&data, &stream]()
 			{
 				BitLength size = 0;
 				size += rtti_write(data.path, stream);
@@ -91,9 +91,12 @@ namespace bs
 			return size;
 		}
 
-		static BitLength getSize(const RecentProject& data, bool compress)
+		static BitLength getSize(const RecentProject& data, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			return rtti_size(data.path) + rtti_size(data.accessTimestamp) + sizeof(uint32_t);
+			BitLength dataSize = rtti_size(data.path) + rtti_size(data.accessTimestamp);
+
+			rtti_add_header_size(dataSize, compress);
+			return dataSize;
 		}
 	};
 

Source/EditorCore/Private/RTTI/BsEditorWidgetLayoutRTTI.h

@@ -64,7 +64,7 @@ namespace bs
 
 		static BitLength toMemory(const bs::EditorWidgetLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
+			return rtti_write_with_size_header(stream, data, compress, [&data, &stream]()
 			{
 				BitLength size = 0;
 				size += rtti_write(data.widgetNames, stream);
@@ -93,10 +93,13 @@ namespace bs
 			return size;
 		}
 
-		static BitLength getSize(const bs::EditorWidgetLayout::Entry& data, bool compress)	
+		static BitLength getSize(const bs::EditorWidgetLayout::Entry& data, const RTTIFieldInfo& fieldInfo, bool compress)	
 		{ 
-			return rtti_size(data.widgetNames) + rtti_size(data.isDocked) + rtti_size(data.x) + 
-				rtti_size(data.y) + rtti_size(data.width) + rtti_size(data.height) + sizeof(uint32_t);
+			BitLength dataSize = rtti_size(data.widgetNames) + rtti_size(data.isDocked) + rtti_size(data.x) +
+				rtti_size(data.y) + rtti_size(data.width) + rtti_size(data.height);
+
+			rtti_add_header_size(dataSize, compress);
+			return dataSize;
 		}	
 	}; 
 

Source/EditorCore/Private/RTTI/BsProjectLibraryEntriesRTTI.h

@@ -57,7 +57,7 @@ namespace bs
 
 		static BitLength toMemory(const ProjectLibrary::FileEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
+			return rtti_write_with_size_header(stream, data, compress, [&data, &stream]()
 			{
 				BitLength size = 0;
 
@@ -96,12 +96,15 @@ namespace bs
 			return size;
 		}
 
-		static BitLength getSize(const ProjectLibrary::FileEntry& data, bool compress)	
+		static BitLength getSize(const ProjectLibrary::FileEntry& data, const RTTIFieldInfo& fieldInfo, bool compress)	
 		{ 
 			WString elemName = UTF8::toWide(data.elementName);
 
-			return rtti_size(data.type) + rtti_size(data.path) + 
-				rtti_size(elemName) + rtti_size(data.lastUpdateTime) + sizeof(uint32_t);
+			BitLength dataSize = rtti_size(data.type) + rtti_size(data.path) +
+				rtti_size(elemName) + rtti_size(data.lastUpdateTime);
+
+			rtti_add_header_size(dataSize, compress);
+			return dataSize;
 		}	
 	}; 
 
@@ -111,7 +114,7 @@ namespace bs
 
 		static BitLength toMemory(const ProjectLibrary::DirectoryEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
+			return rtti_write_with_size_header(stream, data, compress, [&data, &stream]()
 			{
 				BitLength size = 0;
 
@@ -191,13 +194,11 @@ namespace bs
 			return size;
 		}
 
-		static BitLength getSize(const ProjectLibrary::DirectoryEntry& data, bool compress)
+		static BitLength getSize(const ProjectLibrary::DirectoryEntry& data, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
 			WString elemName = UTF8::toWide(data.elementName);
 			BitLength dataSize = rtti_size(data.type) + rtti_size(data.path) + rtti_size(elemName) + sizeof(uint32_t);
 
-			dataSize += sizeof(uint32_t);
-
 			for(auto& child : data.mChildren)
 			{
 				if(child->type == ProjectLibrary::LibraryEntryType::File)
@@ -212,6 +213,7 @@ namespace bs
 				}
 			}
 
+			rtti_add_header_size(dataSize, compress);
 			return dataSize;
 		}	
 	};

Source/EditorCore/Private/RTTI/BsSettingsRTTI.h

@@ -33,7 +33,7 @@ namespace bs
 		/** @copydoc RTTIPlainType::toMemory */
 		static BitLength toMemory(const TSettingsValue<T>& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
+			return rtti_write_with_size_header(stream, data, compress, [&data, &stream]()
 			{
 				BitLength size = 0;
 				size += rtti_write(data.key, stream);
@@ -56,12 +56,13 @@ namespace bs
 		}
 
 		/** @copydoc RTTIPlainType::getSize */
-		static BitLength getSize(const TSettingsValue<T>& data, bool compress)
+		static BitLength getSize(const TSettingsValue<T>& data, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			BitLength dataSize = sizeof(uint32_t);
+			BitLength dataSize;
 			dataSize += rtti_size(data.key);
 			dataSize += rtti_size(data.value);
 
+			rtti_add_header_size(dataSize, compress);
 			return dataSize;
 		}
 	};

Source/EditorCore/Scene/BsSerializedSceneObject.cpp

@@ -87,7 +87,8 @@ namespace bs
 		BinarySerializer serializer;
 		mSerializedObject->seek(0);
 		SPtr<SceneObject> restored = std::static_pointer_cast<SceneObject>(
-			serializer.decode(mSerializedObject, (UINT32)mSerializedObject->size(), &serzContext));
+			serializer.decode(mSerializedObject, (UINT32)mSerializedObject->size(), 
+			BinarySerializerFlag::None, &serzContext));
 
 		EditorUtility::restoreIds(restored->getHandle(), mSceneObjectProxy);
 		restored->setParent(parent);