Explorar el Código

Build: Updated bsf version

BearishSun hace 7 años
padre
commit
24b44ef072

+ 2 - 3
Source/EditorCore/Testing/BsEditorTestSuite.cpp

@@ -522,9 +522,8 @@ namespace bs
 		newObj->arrObjB[1].strA = "strawberry";
 		newObj->arrObjB[1].strA = "strawberry";
 		newObj->arrObjPtrB[0]->intA = 99100;
 		newObj->arrObjPtrB[0]->intA = 99100;
 
 
-		BinarySerializer bs;
-		SPtr<SerializedObject> orgSerialized = bs._encodeToIntermediate(orgObj.get());
-		SPtr<SerializedObject> newSerialized = bs._encodeToIntermediate(newObj.get());
+		SPtr<SerializedObject> orgSerialized = SerializedObject::create(*orgObj.get());
+		SPtr<SerializedObject> newSerialized = SerializedObject::create(*newObj.get());
 
 
 		IDiff& diffHandler = orgObj->getRTTI()->getDiffHandler();
 		IDiff& diffHandler = orgObj->getRTTI()->getDiffHandler();
 		SPtr<SerializedObject> objDiff = diffHandler.generateDiff(orgSerialized, newSerialized);
 		SPtr<SerializedObject> objDiff = diffHandler.generateDiff(orgSerialized, newSerialized);

+ 4 - 7
Source/Scripting/SBansheeEngine/Serialization/BsManagedDiff.cpp

@@ -13,12 +13,10 @@ namespace bs
 	SPtr<SerializedObject> ManagedDiff::generateDiff(const SPtr<SerializedObject>& orgSerzObj,
 	SPtr<SerializedObject> ManagedDiff::generateDiff(const SPtr<SerializedObject>& orgSerzObj,
 		const SPtr<SerializedObject>& newSerzObj, ObjectMap& objectMap)
 		const SPtr<SerializedObject>& newSerzObj, ObjectMap& objectMap)
 	{
 	{
-		BinarySerializer bs;
-
 		// Need to call GameObjectManager because GameObject handles call it during deserialization, but we don't really need it
 		// Need to call GameObjectManager because GameObject handles call it during deserialization, but we don't really need it
 		GameObjectManager::instance().startDeserialization();
 		GameObjectManager::instance().startDeserialization();
-		SPtr<ManagedSerializableObject> orgObj = std::static_pointer_cast<ManagedSerializableObject>(bs._decodeFromIntermediate(orgSerzObj));
-		SPtr<ManagedSerializableObject> newObj = std::static_pointer_cast<ManagedSerializableObject>(bs._decodeFromIntermediate(newSerzObj));
+		SPtr<ManagedSerializableObject> orgObj = std::static_pointer_cast<ManagedSerializableObject>(orgSerzObj->decode());
+		SPtr<ManagedSerializableObject> newObj = std::static_pointer_cast<ManagedSerializableObject>(newSerzObj->decode());
 		GameObjectManager::instance().endDeserialization();
 		GameObjectManager::instance().endDeserialization();
 
 
 		SPtr<ManagedSerializableDiff> diff = ManagedSerializableDiff::create(orgObj, newObj);
 		SPtr<ManagedSerializableDiff> diff = ManagedSerializableDiff::create(orgObj, newObj);
@@ -33,7 +31,7 @@ namespace bs
 
 
 		SerializedEntry entry;
 		SerializedEntry entry;
 		entry.fieldId = 0;
 		entry.fieldId = 0;
-		entry.serialized = bs._encodeToIntermediate(diff.get());
+		entry.serialized = SerializedObject::create(*diff);
 
 
 		subObject.entries[0] = entry;
 		subObject.entries[0] = entry;
 
 
@@ -45,8 +43,7 @@ namespace bs
 	{
 	{
 		SPtr<SerializedObject> diffObj = std::static_pointer_cast<SerializedObject>(serzDiff->subObjects[0].entries[0].serialized);
 		SPtr<SerializedObject> diffObj = std::static_pointer_cast<SerializedObject>(serzDiff->subObjects[0].entries[0].serialized);
 
 
-		BinarySerializer bs;
-		SPtr<ManagedSerializableDiff> diff = std::static_pointer_cast<ManagedSerializableDiff>(bs._decodeFromIntermediate(diffObj));
+		SPtr<ManagedSerializableDiff> diff = std::static_pointer_cast<ManagedSerializableDiff>(diffObj->decode());
 		
 		
 		if (diff != nullptr)
 		if (diff != nullptr)
 		{
 		{

+ 1 - 1
Source/bsf

@@ -1 +1 @@
-Subproject commit a62a37f220be3737b85626f09e94b5874df04f77
+Subproject commit 1e6d53620375b2cb6b9416268bb70e23cd70a354