From 77167bb78be834eb051ee916da619aed0746b849 Mon Sep 17 00:00:00 2001 From: nitrocaster Date: Fri, 15 Jan 2016 20:02:43 +0300 Subject: [PATCH] Fix plugins compilation. --- src/editors/ECore/Editor/EditMesh.h | 26 +++++++++---------- src/editors/ECore/Editor/EditObjectImport.cpp | 3 ++- .../Editor/ExportObjectOGFCalculateTB.cpp | 6 ++--- .../Editor/ExportSkeletonCalculateTB.cpp | 6 ++--- src/plugins/Maya/Export/MayaExport.cpp | 6 ++--- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/editors/ECore/Editor/EditMesh.h b/src/editors/ECore/Editor/EditMesh.h index fb894f22591..cea4f49d93e 100644 --- a/src/editors/ECore/Editor/EditMesh.h +++ b/src/editors/ECore/Editor/EditMesh.h @@ -199,22 +199,22 @@ class CSector; #endif class ECORE_API CEditableMesh{ - friendclass MeshExpUtility; - friendclass CEditableObject; - friendclass CSectorItem; - friendclass CSector; - friendclass CPortalUtils; - friendclass SceneBuilder; - friendclass CExportSkeleton; - friendclass CExportObjectOGF; - friendclass TfrmEditLibrary; - friendclass CExporter; - friendclass CXRayObjectExport; - friendclass CXRaySkinExport; + friend class MeshExpUtility; + friend class CEditableObject; + friend class CSectorItem; + friend class CSector; + friend class CPortalUtils; + friend class SceneBuilder; + friend class CExportSkeleton; + friend class CExportObjectOGF; + friend class TfrmEditLibrary; + friend class CExporter; + friend class CXRayObjectExport; + friend class CXRaySkinExport; shared_str m_Name; - CEditableObject*m_Parent; + CEditableObject *m_Parent; void GenerateCFModel(); void GenerateRenderBuffers(); diff --git a/src/editors/ECore/Editor/EditObjectImport.cpp b/src/editors/ECore/Editor/EditObjectImport.cpp index b55cdb923cd..6ed4f3be468 100644 --- a/src/editors/ECore/Editor/EditObjectImport.cpp +++ b/src/editors/ECore/Editor/EditObjectImport.cpp @@ -12,7 +12,8 @@ extern "C" { -#include "utils/LWO/lwo2.h" }; +#include "utils/LWO/lwo2.h" +}; #ifdef _EDITOR #include "Layers/xrRender/ResourceManager.h" diff --git a/src/editors/ECore/Editor/ExportObjectOGFCalculateTB.cpp b/src/editors/ECore/Editor/ExportObjectOGFCalculateTB.cpp index d8a5233a529..594cede4d22 100644 --- a/src/editors/ECore/Editor/ExportObjectOGFCalculateTB.cpp +++ b/src/editors/ECore/Editor/ExportObjectOGFCalculateTB.cpp @@ -105,7 +105,7 @@ void CObjectOGFCollectorPacked::CalculateTB() NVMeshMender::DontWeightNormalsByFaceSize // weigh vertex normals by the triangle's size )) { - Debug.fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str()); + xrDebug::Fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str()); } // Bind declarators @@ -178,8 +178,8 @@ void CObjectOGFCollectorPacked::CalculateTB() ) ) { - Debug.fatal ( DEBUG_INFO, "NVMeshMender failed " ); - //Debug.fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str()); + xrDebug::Fatal ( DEBUG_INFO, "NVMeshMender failed " ); + //xrDebug::Fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str()); } retrive_data_from_mender_otput( m_Verts, m_Faces, mender_in_out_verts, mender_in_out_indices, mender_mapping_out_to_in_vert ); diff --git a/src/editors/ECore/Editor/ExportSkeletonCalculateTB.cpp b/src/editors/ECore/Editor/ExportSkeletonCalculateTB.cpp index 42815bc4b12..b7be950ec78 100644 --- a/src/editors/ECore/Editor/ExportSkeletonCalculateTB.cpp +++ b/src/editors/ECore/Editor/ExportSkeletonCalculateTB.cpp @@ -116,7 +116,7 @@ void CExportSkeleton::SSplit::CalculateTB() NVMeshMender::DontWeightNormalsByFaceSize // weigh vertex normals by the triangle's size )) { - Debug.fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str()); + xrDebug::Fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str()); } // verify @@ -275,8 +275,8 @@ void CExportSkeleton::SSplit::CalculateTB () ) ) { - Debug.fatal ( DEBUG_INFO, "NVMeshMender failed " ); - //Debug.fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str()); + xrDebug::Fatal ( DEBUG_INFO, "NVMeshMender failed " ); + //xrDebug::Fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str()); } retrive_data_from_mender_otput( m_Verts, m_Faces, mender_in_out_verts, mender_in_out_indices, mender_mapping_out_to_in_vert ); diff --git a/src/plugins/Maya/Export/MayaExport.cpp b/src/plugins/Maya/Export/MayaExport.cpp index 0c1388005b8..c350ad309d9 100644 --- a/src/plugins/Maya/Export/MayaExport.cpp +++ b/src/plugins/Maya/Export/MayaExport.cpp @@ -451,7 +451,7 @@ MStatus CXRayObjectExport::ExportPart(CEditableObject* O, MDagPath& mdagPath, MO // out face material int iTexture = texMap[meshPoly.index()]; if (iTexture<0) - Debug.fatal(DEBUG_INFO,"Can't find material for polygon: %d",meshPoly.index()); + xrDebug::Fatal(DEBUG_INFO,"Can't find material for polygon: %d",meshPoly.index()); SXRShaderData& D= xr_data[iTexture]; int compIdx = meshPoly.index(); @@ -521,9 +521,9 @@ LPCSTR CXRayObjectExport::getMaterialName(MDagPath & mdagPath, int cid, int obje lastMaterials = currentMaterials; int mLength = mArray.length(); - if (mLength==0) Debug.fatal(DEBUG_INFO,"Object '%s' has polygon '%d' without material.",0,cid); + if (mLength==0) xrDebug::Fatal(DEBUG_INFO,"Object '%s' has polygon '%d' without material.",0,cid); if (mLength>1){ - Debug.fatal(DEBUG_INFO,"Object '%s' has polygon '%d' with more than one material.",0,cid); + xrDebug::Fatal(DEBUG_INFO,"Object '%s' has polygon '%d' with more than one material.",0,cid); } }else{ xr_delete(currentMaterials);