Browse Source

Build: Updated 'bsf' version

BearishSun 6 years ago
parent
commit
6657d00e4b

+ 6 - 6
Source/EditorCore/Private/RTTI/BsDockManagerLayoutRTTI.h

@@ -80,9 +80,9 @@ namespace bs
 	{	
 		enum { id = bs::TID_DockManagerLayoutEntry }; enum { hasDynamicSize = 1 };
 
-		static uint32_t toMemory(const bs::DockManagerLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength toMemory(const bs::DockManagerLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			return rtti_write_with_size_header(stream, [&data, &stream]()
+			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
 				uint32_t size = 0;
 				size += rtti_write(data.isLeaf, stream);
@@ -100,10 +100,10 @@ namespace bs
 			});
 		}
 
-		static uint32_t fromMemory(bs::DockManagerLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength fromMemory(bs::DockManagerLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			uint32_t size = 0;
-			rtti_read(size, stream);
+			BitLength size;
+			rtti_read_size_header(stream, compress, size);
 
 			rtti_read(data.isLeaf, stream);
 			rtti_read(data.horizontalSplit, stream);
@@ -125,7 +125,7 @@ namespace bs
 			return size;
 		}
 
-		static uint32_t getSize(const bs::DockManagerLayout::Entry& data)	
+		static BitLength getSize(const bs::DockManagerLayout::Entry& data, bool compress)	
 		{ 
 			uint64_t dataSize = sizeof(uint32_t) + rtti_size(data.isLeaf) + rtti_size(data.horizontalSplit) + 
 				rtti_size(data.splitPosition) + rtti_size(data.widgetNames);

+ 7 - 6
Source/EditorCore/Private/RTTI/BsEditorSettingsRTTI.h

@@ -68,9 +68,9 @@ namespace bs
 	{
 		enum { id = TID_RecentProject }; enum { hasDynamicSize = 1 };
 
-		static uint32_t toMemory(const RecentProject& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength toMemory(const RecentProject& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			return rtti_write_with_size_header(stream, [&data, &stream]()
+			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
 				uint32_t size = 0;
 				size += rtti_write(data.path, stream);
@@ -80,17 +80,18 @@ namespace bs
 			});
 		}
 
-		static uint32_t fromMemory(RecentProject& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength fromMemory(RecentProject& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			uint32_t size = 0;
-			rtti_read(size, stream);
+			BitLength size;
+			rtti_read_size_header(stream, compress, size);
+
 			rtti_read(data.path, stream);
 			rtti_read(data.accessTimestamp, stream);
 
 			return size;
 		}
 
-		static uint32_t getSize(const RecentProject& data)
+		static BitLength getSize(const RecentProject& data, bool compress)
 		{
 			uint64_t dataSize = sizeof(uint32_t) + rtti_size(data.path) + rtti_size(data.accessTimestamp);
 

+ 7 - 6
Source/EditorCore/Private/RTTI/BsEditorWidgetLayoutRTTI.h

@@ -62,9 +62,9 @@ namespace bs
 	{	
 		enum { id = bs::TID_EditorWidgetLayoutEntry }; enum { hasDynamicSize = 1 };
 
-		static uint32_t toMemory(const bs::EditorWidgetLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength toMemory(const bs::EditorWidgetLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			return rtti_write_with_size_header(stream, [&data, &stream]()
+			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
 				uint32_t size = 0;
 				size += rtti_write(data.widgetNames, stream);
@@ -78,10 +78,11 @@ namespace bs
 			});
 		}
 
-		static uint32_t fromMemory(bs::EditorWidgetLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength fromMemory(bs::EditorWidgetLayout::Entry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			uint32_t size = 0;
-			rtti_read(size, stream);
+			BitLength size;
+			rtti_read_size_header(stream, compress, size);
+
 			rtti_read(data.widgetNames, stream);
 			rtti_read(data.isDocked, stream);
 			rtti_read(data.x, stream);
@@ -92,7 +93,7 @@ namespace bs
 			return size;
 		}
 
-		static uint32_t getSize(const bs::EditorWidgetLayout::Entry& data)	
+		static BitLength getSize(const bs::EditorWidgetLayout::Entry& data, bool compress)	
 		{ 
 			uint64_t dataSize = sizeof(uint32_t) + rtti_size(data.widgetNames) + rtti_size(data.isDocked) + 
 				rtti_size(data.x) + rtti_size(data.y) + rtti_size(data.width) + rtti_size(data.height);

+ 12 - 12
Source/EditorCore/Private/RTTI/BsProjectLibraryEntriesRTTI.h

@@ -55,9 +55,9 @@ namespace bs
 	{	
 		enum { id = TID_ProjectLibraryResEntry }; enum { hasDynamicSize = 1 };
 
-		static uint32_t toMemory(const ProjectLibrary::FileEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength toMemory(const ProjectLibrary::FileEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			return rtti_write_with_size_header(stream, [&data, &stream]()
+			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
 				uint32_t size = 0;
 
@@ -75,10 +75,10 @@ namespace bs
 			});
 		}
 
-		static uint32_t fromMemory(ProjectLibrary::FileEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength fromMemory(ProjectLibrary::FileEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			uint32_t size = 0;
-			rtti_read(size, stream);
+			BitLength size;
+			rtti_read_size_header(stream, compress, size);
 
 			uint32_t type;
 			rtti_read(type, stream);
@@ -96,7 +96,7 @@ namespace bs
 			return size;
 		}
 
-		static uint32_t getSize(const ProjectLibrary::FileEntry& data)	
+		static BitLength getSize(const ProjectLibrary::FileEntry& data, bool compress)	
 		{ 
 			WString elemName = UTF8::toWide(data.elementName);
 
@@ -118,9 +118,9 @@ namespace bs
 	{	
 		enum { id = TID_ProjectLibraryDirEntry }; enum { hasDynamicSize = 1 };
 
-		static uint32_t toMemory(const ProjectLibrary::DirectoryEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength toMemory(const ProjectLibrary::DirectoryEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{ 
-			return rtti_write_with_size_header(stream, [&data, &stream]()
+			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
 				uint32_t size = 0;
 
@@ -152,10 +152,10 @@ namespace bs
 			});
 		}
 
-		static uint32_t fromMemory(ProjectLibrary::DirectoryEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength fromMemory(ProjectLibrary::DirectoryEntry& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			uint32_t size = 0;
-			rtti_read(size, stream);
+			BitLength size;
+			rtti_read_size_header(stream, compress, size);
 
 			rtti_read(data.type, stream);
 			rtti_read(data.path, stream);
@@ -200,7 +200,7 @@ namespace bs
 			return size;
 		}
 
-		static uint32_t getSize(const ProjectLibrary::DirectoryEntry& data)
+		static BitLength getSize(const ProjectLibrary::DirectoryEntry& data, bool compress)
 		{ 
 			WString elemName = UTF8::toWide(data.elementName);
 			uint64_t dataSize = sizeof(uint32_t) + rtti_size(data.type) + rtti_size(data.path) + 

+ 7 - 6
Source/EditorCore/Private/RTTI/BsSettingsRTTI.h

@@ -31,9 +31,9 @@ namespace bs
 		enum { id = TID_SettingsValue }; enum { hasDynamicSize = 1 };
 
 		/** @copydoc RTTIPlainType::toMemory */
-		static uint32_t toMemory(const TSettingsValue<T>& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength toMemory(const TSettingsValue<T>& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			return rtti_write_with_size_header(stream, [&data, &stream]()
+			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
 				uint32_t size = 0;
 				size += rtti_write(data.key, stream);
@@ -44,10 +44,11 @@ namespace bs
 		}
 
 		/** @copydoc RTTIPlainType::fromMemory */
-		static uint32_t fromMemory(TSettingsValue<T>& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
+		static BitLength fromMemory(TSettingsValue<T>& data, Bitstream& stream, const RTTIFieldInfo& fieldInfo, bool compress)
 		{
-			uint32_t size = 0;
-			rtti_read(size, stream);
+			BitLength size;
+			rtti_read_size_header(stream, compress, size);
+
 			rtti_read(data.key, stream);
 			rtti_read(data.value, stream);
 
@@ -55,7 +56,7 @@ namespace bs
 		}
 
 		/** @copydoc RTTIPlainType::getSize */
-		static uint32_t getSize(const TSettingsValue<T>& data)
+		static BitLength getSize(const TSettingsValue<T>& data, bool compress)
 		{
 			uint64_t dataSize = sizeof(uint32_t);
 			dataSize += rtti_size(data.key);