pke: rename Parse to Deserialize

4 files changed, 17 insertions, 17 deletions

diff --git a/src/entities.hpp b/src/entities.hpp
index f76e953..78eb6fa 100644
--- a/src/entities.hpp
+++ b/src/entities.hpp
@@ -35,7 +35,7 @@ struct EntityType : public Entity_Base {
 	pk_ev_cb_id_T pke_ev_cb_id_framebuffer_resized;
 	PkeCallback createInstanceCallback;
 	// PkeCallback serializeInstanceCallback; // TODO
-	// PkeCallback parseInstanceCallback; // TODO
+	// PkeCallback deserializeInstanceCallback; // TODO
 };
 struct EntityTypeHandle : pk_handle {};
 constexpr EntityTypeHandle EntityTypeHandle_MAX = EntityTypeHandle{ pk_handle_MAX_constexpr };
diff --git a/src/game.cpp b/src/game.cpp
index 6283d5c..690292c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -163,7 +163,7 @@ bool FindFirstInstanceHandle(void *handle, void *mapping) {
 	InstMapping *inst_mapping = reinterpret_cast<InstMapping *>(mapping);
 	return inst_mapping->origHandle == *reinterpret_cast<InstanceHandle *>(handle);
 }
-void ParseCamera(PkeLevel *level, std::ifstream &stream) {
+void DeserializeCamera(PkeLevel *level, std::ifstream &stream) {
 	PkeCamera cam{};
 	InstanceHandle instanceHandle = InstanceHandle_MAX;
 	InstanceHandle targetInstanceHandle = InstanceHandle_MAX;
@@ -183,7 +183,7 @@ void ParseCamera(PkeLevel *level, std::ifstream &stream) {
 				instPos.mass = 1.f;
 				instPos.posRot.setIdentity();
 				instPos.scale = btVector3(1.f, 1.f, 1.f);
-				fprintf(stdout, "[ParseCamera] Failed to find instance mapping. Is this an outdated parse?\n");
+				fprintf(stdout, "[DeserializeCamera] Failed to find instance mapping. Is this an outdated parse?\n");
 			} else {
 				instPos = loadFileInstanceMappings[instanceIndex].newInstance;
 			}
@@ -248,7 +248,7 @@ void ParseCamera(PkeLevel *level, std::ifstream &stream) {
 	}
 }
 
-void ParseInstance(Entity_Base *parentEntity, std::ifstream &stream) {
+void DeserializeInstance(Entity_Base *parentEntity, std::ifstream &stream) {
 	CompInstance comp{};
 	InstMapping mapping {
 		.origHandle = InstanceHandle_MAX,
@@ -271,7 +271,7 @@ void ParseInstance(Entity_Base *parentEntity, std::ifstream &stream) {
 			if (strlen(entTypeCode) > 1) {
 				etPtr = EntityType_FindByTypeCode(entTypeCode);
 				if (etPtr == nullptr) {
-					fprintf(stdout, "[Game::ParseInstance] Unknown EntityTypeCode: \"%s\"\n", entTypeCode);
+					fprintf(stdout, "[Game::DeserializeInstance] Unknown EntityTypeCode: \"%s\"\n", entTypeCode);
 					break;
 				}
 			} else if (strlen(entTypeCode) == 1) {
@@ -280,7 +280,7 @@ void ParseInstance(Entity_Base *parentEntity, std::ifstream &stream) {
 					skipEntCreate = true;
 				}
 			} else {
-				fprintf(stdout, "[Game::ParseInstance] Failed to create instance from save file. No EntTypeCode present.\n");
+				fprintf(stdout, "[Game::DeserializeInstance] Failed to create instance from save file. No EntTypeCode present.\n");
 				break;
 			}
 
@@ -290,7 +290,7 @@ void ParseInstance(Entity_Base *parentEntity, std::ifstream &stream) {
 					entity = reinterpret_cast<CreateInst*>(etPtr->createInstanceCallback.func)();
 				} else {
 					entity = EntityType_CreateGenericInstance(etPtr, parentEntity, &comp, &mapping.newInstance);
-					fprintf(stdout ,"[Game::ParseInstance] Debug: entTypeCode '%s' does not have a registered callback func to handle instance creation.\n", entTypeCode);
+					fprintf(stdout ,"[Game::DeserializeInstance] Debug: entTypeCode '%s' does not have a registered callback func to handle instance creation.\n", entTypeCode);
 				}
 				mapping.newEntHandle = entity->handle;
 			}
@@ -487,11 +487,11 @@ void Game_LoadSceneFile(PkeLevel *level, const char *sceneFilePath) {
 
 	while (f.getline(readLine, readLineLength)) {
 		if (strcmp(PKE_FILE_OBJ_INSTANCE, readLine) == 0) {
-			ParseInstance(level, f);
+			DeserializeInstance(level, f);
 			continue;
 		}
 		if (strcmp(PKE_FILE_OBJ_CAMERA, readLine) == 0) {
-			ParseCamera(level, f);
+			DeserializeCamera(level, f);
 			continue;
 		}
 	}
diff --git a/src/plugin-types.hpp b/src/plugin-types.hpp
index 10139b0..319960d 100644
--- a/src/plugin-types.hpp
+++ b/src/plugin-types.hpp
@@ -7,12 +7,12 @@
 constexpr int64_t CallbackSignatureLength = 16;
 using CallbackSignature = char[CallbackSignatureLength];
 
-typedef void (*ParseDelegate)(std::ifstream *stream);
+typedef void (*DeserializeDelegate)(std::ifstream *stream);
 typedef void (*SerializeDelegate)(std::ifstream *stream);
 typedef void (*CollisionDelegate)(const void *entHandleLeft, const void *entHandleRight);
 
 struct PkeEntityTypeInterface {
-	void (*OnParse)(std::ifstream *stream) = nullptr;
+	void (*OnDeserialize)(std::ifstream *stream) = nullptr;
 	void (*OnSerialize)(std::ostringstream *stream, void *obj) = nullptr;
 	void (*OnEntityTypeCollision)(const void *entHandleLeft, const void *entHandleRight) = nullptr;
 	void (*OnEntityInstanceCollision)(const void *entHandleLeft, const void *entHandleRight) = nullptr;
diff --git a/src/project.cpp b/src/project.cpp
index 891e5ea..ce9ba58 100644
--- a/src/project.cpp
+++ b/src/project.cpp
@@ -120,7 +120,7 @@ void Proj_SerializeAsset(std::ofstream &stream, const Asset &asset) {
 }
 
 /*
-void Proj_ParseProjectSettings(std::ifstream &stream) {
+void Proj_DeserializeProjectSettings(std::ifstream &stream) {
 	while (memset(projReadLine, 0, projReadLineLength), stream.getline(projReadLine, projReadLineLength)) {
 		if (strcmp(PKE_PROJ_FILE_OBJ_END, projReadLine) == 0) {
 			return;
@@ -157,7 +157,7 @@ void Proj_ParseProjectSettings(std::ifstream &stream) {
 }
 */
 
-void Proj_ParseEntityType(std::ifstream &stream) {
+void Proj_DeserializeEntityType(std::ifstream &stream) {
 	char collisionSig[CallbackSignatureLength + 1];
 	collisionSig[0] = '\0';
 	char createInstanceSig[CallbackSignatureLength + 1];
@@ -276,7 +276,7 @@ void Proj_ParseEntityType(std::ifstream &stream) {
 	}
 }
 
-void Proj_ParseAssset(std::ifstream &stream) {
+void Proj_DeserializeAssset(std::ifstream &stream) {
 	char keyStr[AssetKeyLength + 1];
 	keyStr[AssetKeyLength] = '\0';
 	char basePath[256];
@@ -322,16 +322,16 @@ void PkeProject_Load(const char *filePath) {
 	while (memset(projReadLine, 0, projReadLineLength), f.getline(projReadLine, projReadLineLength)) {
 		/*
 		if (strcmp(PKE_PROJ_FILE_OBJ_PROJECT_SETTINGS, projReadLine) == 0) {
-			Proj_ParseProjectSettings(f);
+			Proj_DeserializeProjectSettings(f);
 			continue;
 		}
 		*/
 		if (strcmp(PKE_PROJ_FILE_OBJ_ASSET, projReadLine) == 0) {
-			Proj_ParseAssset(f);
+			Proj_DeserializeAssset(f);
 			continue;
 		}
 		if (strcmp(PKE_PROJ_FILE_OBJ_ENTITY_TYPE, projReadLine) == 0) {
-			Proj_ParseEntityType(f);
+			Proj_DeserializeEntityType(f);
 			continue;
 		}
 		if (strcmp(PKE_PROJ_FILE_OBJ_FONT, projReadLine) == 0) {