Browse Source

Build: Updated 'bsf' version

BearishSun 6 years ago
parent
commit
cac67b7cc3

+ 4 - 11
Source/EditorCore/Private/RTTI/BsDockManagerLayoutRTTI.h

@@ -84,7 +84,7 @@ namespace bs
 		{ 
 			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
-				uint32_t size = 0;
+				BitLength size = 0;
 				size += rtti_write(data.isLeaf, stream);
 				size += rtti_write(data.horizontalSplit, stream);
 				size += rtti_write(data.splitPosition, stream);
@@ -127,8 +127,8 @@ namespace bs
 
 		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);
+			BitLength dataSize = rtti_size(data.isLeaf) + rtti_size(data.horizontalSplit) + 
+				rtti_size(data.splitPosition) + rtti_size(data.widgetNames) + sizeof(uint32_t);
 
 			if(!data.isLeaf)
 			{
@@ -136,14 +136,7 @@ namespace bs
 				dataSize += rtti_size(*data.children[1]);
 			}
 
-#if BS_DEBUG_MODE
-			if(dataSize > std::numeric_limits<uint32_t>::max())
-			{
-				__string_throwDataOverflowException();
-			}
-#endif
-
-			return (uint32_t)dataSize;
+			return dataSize;
 		}	
 	}; 
 

+ 2 - 11
Source/EditorCore/Private/RTTI/BsEditorSettingsRTTI.h

@@ -72,7 +72,7 @@ namespace bs
 		{
 			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
-				uint32_t size = 0;
+				BitLength size = 0;
 				size += rtti_write(data.path, stream);
 				size += rtti_write(data.accessTimestamp, stream);
 
@@ -93,16 +93,7 @@ namespace bs
 
 		static BitLength getSize(const RecentProject& data, bool compress)
 		{
-			uint64_t dataSize = sizeof(uint32_t) + rtti_size(data.path) + rtti_size(data.accessTimestamp);
-
-#if BS_DEBUG_MODE
-			if (dataSize > std::numeric_limits<uint32_t>::max())
-			{
-				__string_throwDataOverflowException();
-			}
-#endif
-
-			return (uint32_t)dataSize;
+			return rtti_size(data.path) + rtti_size(data.accessTimestamp) + sizeof(uint32_t);
 		}
 	};
 

+ 3 - 12
Source/EditorCore/Private/RTTI/BsEditorWidgetLayoutRTTI.h

@@ -66,7 +66,7 @@ namespace bs
 		{ 
 			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
-				uint32_t size = 0;
+				BitLength size = 0;
 				size += rtti_write(data.widgetNames, stream);
 				size += rtti_write(data.isDocked, stream);
 				size += rtti_write(data.x, stream);
@@ -95,17 +95,8 @@ namespace bs
 
 		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);
-
-#if BS_DEBUG_MODE
-			if(dataSize > std::numeric_limits<uint32_t>::max())
-			{
-				__string_throwDataOverflowException();
-			}
-#endif
-
-			return (uint32_t)dataSize;
+			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);
 		}	
 	}; 
 

+ 6 - 23
Source/EditorCore/Private/RTTI/BsProjectLibraryEntriesRTTI.h

@@ -59,7 +59,7 @@ namespace bs
 		{ 
 			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
-				uint32_t size = 0;
+				BitLength size = 0;
 
 				// For compatibility, encoding the name as a wide string
 				WString elemName = UTF8::toWide(data.elementName);
@@ -100,17 +100,8 @@ namespace bs
 		{ 
 			WString elemName = UTF8::toWide(data.elementName);
 
-			uint64_t dataSize = sizeof(uint32_t) + rtti_size(data.type) + rtti_size(data.path) + 
-				rtti_size(elemName) + rtti_size(data.lastUpdateTime);
-
-#if BS_DEBUG_MODE
-			if(dataSize > std::numeric_limits<uint32_t>::max())
-			{
-				__string_throwDataOverflowException();
-			}
-#endif
-
-			return (uint32_t)dataSize;
+			return rtti_size(data.type) + rtti_size(data.path) + 
+				rtti_size(elemName) + rtti_size(data.lastUpdateTime) + sizeof(uint32_t);
 		}	
 	}; 
 
@@ -122,7 +113,7 @@ namespace bs
 		{ 
 			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
-				uint32_t size = 0;
+				BitLength size = 0;
 
 				// For compatibility, encoding the name as a wide string
 				WString elemName = UTF8::toWide(data.elementName);
@@ -203,8 +194,7 @@ namespace bs
 		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) + 
-				rtti_size(elemName);
+			BitLength dataSize = rtti_size(data.type) + rtti_size(data.path) + rtti_size(elemName) + sizeof(uint32_t);
 
 			dataSize += sizeof(uint32_t);
 
@@ -222,14 +212,7 @@ namespace bs
 				}
 			}
 
-#if BS_DEBUG_MODE
-			if(dataSize > std::numeric_limits<uint32_t>::max())
-			{
-				__string_throwDataOverflowException();
-			}
-#endif
-
-			return (uint32_t)dataSize;
+			return dataSize;
 		}	
 	};
 

+ 3 - 5
Source/EditorCore/Private/RTTI/BsSettingsRTTI.h

@@ -35,7 +35,7 @@ namespace bs
 		{
 			return rtti_write_with_size_header(stream, compress, [&data, &stream]()
 			{
-				uint32_t size = 0;
+				BitLength size = 0;
 				size += rtti_write(data.key, stream);
 				size += rtti_write(data.value, stream);
 
@@ -58,13 +58,11 @@ namespace bs
 		/** @copydoc RTTIPlainType::getSize */
 		static BitLength getSize(const TSettingsValue<T>& data, bool compress)
 		{
-			uint64_t dataSize = sizeof(uint32_t);
+			BitLength dataSize = sizeof(uint32_t);
 			dataSize += rtti_size(data.key);
 			dataSize += rtti_size(data.value);
 
-			assert(dataSize <= std::numeric_limits<uint32_t>::max());
-
-			return (uint32_t)dataSize;
+			return dataSize;
 		}
 	};