Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

375 fix compiler warnings #382

Merged
merged 6 commits into from
Sep 18, 2022
Merged

375 fix compiler warnings #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
627c81c
Resolve Compiler Warning
datacrystals Sep 18, 2022
0c9157b
Resolve Compiler Warning
datacrystals Sep 18, 2022
968b9f0
Resolve Compiler Warning
datacrystals Sep 18, 2022
5bbd69d
Resolve Compiler Warning
datacrystals Sep 18, 2022
b1b0bea
Resolve Compiler Warning
datacrystals Sep 18, 2022
1f48fc1
Resolve Compiler Warning
datacrystals Sep 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);

}
Expand All @@ -489,7 +488,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;
Expand Down
3 changes: 1 addition & 2 deletions Source/Core/Loader/ERS_ModelLoader/ERS_CLASS_ModelLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);


/**
Expand Down
7 changes: 2 additions & 5 deletions Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <ERS_FUNCTION_Legacy_PreprocessTextureInfo.h>


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);

Expand Down Expand Up @@ -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
)
Expand All @@ -56,7 +53,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;
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_Legacy_PreprocessTextureInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);



Expand Down Expand Up @@ -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);
ERS_STRUCT_Mesh ERS_LEGACY_FUNCTION_ProcessMesh(aiMesh *Mesh, const aiScene *Scene);
4 changes: 2 additions & 2 deletions Source/Core/Loader/ERS_ModelLoader/ERS_FUNCTION_ModelMetadataDecoderManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down