From 627c81c9c05acbfc3b0a2d8a838bea802aeb3f9e Mon Sep 17 00:00:00 2001 From: datacrystals Date: Sun, 18 Sep 2022 21:52:19 +0000 Subject: [PATCH 1/6] Resolve Compiler Warning --- Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp | 2 +- Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp b/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp index 4d555ef7ac..04b16dc278 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp @@ -489,7 +489,7 @@ void ERS_CLASS_ModelLoader::ProcessNode(ERS_STRUCT_Model* Model, aiNode *Node, c } -ERS_STRUCT_Mesh ERS_CLASS_ModelLoader::ProcessMesh(ERS_STRUCT_Model* Model, unsigned long PreallocVertSize, unsigned long PreallocIndSize, aiMesh *Mesh, const aiScene *Scene) { +ERS_STRUCT_Mesh ERS_CLASS_ModelLoader::ProcessMesh(ERS_STRUCT_Model* Model, unsigned long PreallocVertSize, unsigned long PreallocIndSize, aiMesh *Mesh) { // Create Data Holders ERS_STRUCT_Mesh OutputMesh; diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.h b/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.h index 9ebb1e6cb0..964f101753 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.h +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.h @@ -119,10 +119,9 @@ class ERS_CLASS_ModelLoader { * * @param Model * @param Mesh - * @param Scene * @return ERS_STRUCT_Mesh */ - ERS_STRUCT_Mesh ProcessMesh(ERS_STRUCT_Model* Model, unsigned long PreallocVertSize, unsigned long PerallocIndSize, aiMesh *Mesh, const aiScene *Scene); + ERS_STRUCT_Mesh ProcessMesh(ERS_STRUCT_Model* Model, unsigned long PreallocVertSize, unsigned long PerallocIndSize, aiMesh *Mesh); /** From 0c9157b8fbd3c2fe8779fb2c6a5093122b1d884c Mon Sep 17 00:00:00 2001 From: datacrystals Date: Sun, 18 Sep 2022 21:52:36 +0000 Subject: [PATCH 2/6] Resolve Compiler Warning --- Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp b/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp index 04b16dc278..37be984acd 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp @@ -475,8 +475,7 @@ void ERS_CLASS_ModelLoader::ProcessNode(ERS_STRUCT_Model* Model, aiNode *Node, c Model, (unsigned long)Mesh->mNumVertices, (unsigned long)Mesh->mNumFaces*3, - Mesh, - Scene + Mesh ); } From 968b9f00e81482dc3f6ad588e882f107cee3883c Mon Sep 17 00:00:00 2001 From: datacrystals Date: Sun, 18 Sep 2022 21:53:31 +0000 Subject: [PATCH 3/6] Resolve Compiler Warning --- .../ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp | 2 +- .../ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp index db71586727..498f23429f 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp @@ -56,7 +56,7 @@ void ERS_LEGACY_FUNCTION_ProcessNode(ERS_STRUCT_Model* Model, aiNode *Node, cons } -ERS_STRUCT_Mesh ERS_LEGACY_FUNCTION_ProcessMesh(ERS_STRUCT_Model* Model, unsigned long PreallocVertSize, unsigned long PreallocIndSize, aiMesh *Mesh, const aiScene *Scene) { +ERS_STRUCT_Mesh ERS_LEGACY_FUNCTION_ProcessMesh(aiMesh *Mesh, const aiScene *Scene) { // Create Data Holders ERS_STRUCT_Mesh OutputMesh; diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h index 2382f50408..31ba595f7f 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h @@ -82,4 +82,4 @@ void ERS_LEGACY_FUNCTION_ProcessNode(ERS_STRUCT_Model* Model, aiNode *Node, cons * @param Scene * @return ERS_STRUCT_Mesh */ -ERS_STRUCT_Mesh ERS_LEGACY_FUNCTION_ProcessMesh(ERS_STRUCT_Model* Model, unsigned long PreallocVertSize, unsigned long PerallocIndSize, aiMesh *Mesh, const aiScene *Scene); \ No newline at end of file +ERS_STRUCT_Mesh ERS_LEGACY_FUNCTION_ProcessMesh(aiMesh *Mesh, const aiScene *Scene); \ No newline at end of file From 5bbd69d637c469c43b0d905b5be2dacd2b832bc5 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Sun, 18 Sep 2022 21:53:46 +0000 Subject: [PATCH 4/6] Resolve Compiler Warning --- .../ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp index 498f23429f..8445c7df1b 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp @@ -39,9 +39,6 @@ void ERS_LEGACY_FUNCTION_ProcessNode(ERS_STRUCT_Model* Model, aiNode *Node, cons aiMesh* Mesh = Scene->mMeshes[Node->mMeshes[i]]; Model->Meshes.push_back( ERS_LEGACY_FUNCTION_ProcessMesh( - Model, - (unsigned long)Mesh->mNumVertices, - (unsigned long)Mesh->mNumFaces*3, Mesh, Scene ) From b1b0bea80451ce10bbf3f000ed6c96de4c0063fc Mon Sep 17 00:00:00 2001 From: datacrystals Date: Sun, 18 Sep 2022 21:54:09 +0000 Subject: [PATCH 5/6] Resolve Compiler Warning --- .../ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp | 2 +- .../ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp index 8445c7df1b..1bb89dd15a 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp @@ -5,7 +5,7 @@ #include -void ERS_FUNCTION_Legacy_PreprocessTextureInfo(YAML::Node Metadata, ERS_STRUCT_Model* Model, ERS_STRUCT_SystemUtils* SystemUtils, long AssetID, bool LogEnable) { +void ERS_FUNCTION_Legacy_PreprocessTextureInfo(YAML::Node Metadata, ERS_STRUCT_Model* Model, ERS_STRUCT_SystemUtils* SystemUtils, bool LogEnable) { SystemUtils->Logger_->Log("Using Legacy Model Texture Identification", 4, LogEnable); diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h index 31ba595f7f..b19e7d6017 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h @@ -53,7 +53,7 @@ * @param AssetID * @param LogEnable */ -void ERS_FUNCTION_Legacy_PreprocessTextureInfo(YAML::Node Metadata, ERS_STRUCT_Model* Model, ERS_STRUCT_SystemUtils* SystemUtils, long AssetID, bool LogEnable); +void ERS_FUNCTION_Legacy_PreprocessTextureInfo(YAML::Node Metadata, ERS_STRUCT_Model* Model, ERS_STRUCT_SystemUtils* SystemUtils, bool LogEnable); From 1f48fc1731d3dc774c095b5af59a8c9caf8e0584 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Sun, 18 Sep 2022 21:57:16 +0000 Subject: [PATCH 6/6] Resolve Compiler Warning --- .../ERS_FUNCTION_ModelMetadataDecoderManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_ModelMetadataDecoderManager.cpp b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_ModelMetadataDecoderManager.cpp index 4c12ab56aa..bc993097ab 100644 --- a/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_ModelMetadataDecoderManager.cpp +++ b/Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_ModelMetadataDecoderManager.cpp @@ -18,11 +18,11 @@ bool ERS_FUNCTION_DecodeModelMetadata(YAML::Node Metadata, ERS_STRUCT_Model* Mod bool Status = false; if (FormatVersion == "0.0.0") { SystemUtils->Logger_->Log("Determined Model Metadata Version To Be '0.0.0', Attempting To Decode Model Metadata", 3, LogEnable); - ERS_FUNCTION_Legacy_PreprocessTextureInfo(Metadata, Model, SystemUtils, AssetID, LogEnable); + ERS_FUNCTION_Legacy_PreprocessTextureInfo(Metadata, Model, SystemUtils, LogEnable); Status = ERS_FUNCTION_DecodeModelMetadataV000(Metadata, Model, SystemUtils, AssetID, LogEnable); } else if (FormatVersion == "0.0.1") { SystemUtils->Logger_->Log("Determined Model Metadata Version To Be '0.0.1', Attempting To Decode Model Metadata", 3, LogEnable); - ERS_FUNCTION_Legacy_PreprocessTextureInfo(Metadata, Model, SystemUtils, AssetID, LogEnable); + ERS_FUNCTION_Legacy_PreprocessTextureInfo(Metadata, Model, SystemUtils, LogEnable); Status = ERS_FUNCTION_DecodeModelMetadataV001(Metadata, Model, SystemUtils, AssetID, LogEnable); } else if (FormatVersion == "0.0.2") { SystemUtils->Logger_->Log("Determined Model Metadata Version To Be '0.0.2', Attempting To Decode Model Metadata", 3, LogEnable);