Skip to content

Commit

Permalink
Fix plugins
Browse files Browse the repository at this point in the history 
Enable compilation for mp_configs_verifyer and mp_screenshots_info
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Jan 30, 2018
1 parent e50333c commit 9c5303a
Show file tree
Hide file tree
Showing 48 changed files with 1,599 additions and 1,182 deletions.
36 changes: 18 additions & 18 deletions src/editors/ECore/Editor/EditMesh.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ void CEditableMesh::Clear()

xr_free(m_Vertices);
xr_free(m_Faces);
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
xr_delete(*vm_it);
for (auto& vm_it : m_VMaps)
xr_delete(vm_it);
m_VMaps.clear();
m_SurfFaces.clear();
for (VMRefsIt ref_it = m_VMRefs.begin(); ref_it != m_VMRefs.end(); ref_it++)
xr_free(ref_it->pts);
for (auto& ref_it : m_VMRefs)
xr_free(ref_it.pts);
m_VMRefs.clear();
}

Expand Down Expand Up @@ -415,12 +415,12 @@ void CEditableMesh::GenerateAdjacency()
CSurface* CEditableMesh::GetSurfaceByFaceID(u32 fid)
{
R_ASSERT(fid < m_FaceCount);
for (SurfFacesPairIt sp_it = m_SurfFaces.begin(); sp_it != m_SurfFaces.end(); sp_it++)
for (auto& it : m_SurfFaces)
{
IntVec& face_lst = sp_it->second;
IntVec& face_lst = it.second;
IntIt f_it = std::lower_bound(face_lst.begin(), face_lst.end(), (int)fid);
if ((f_it != face_lst.end()) && (*f_it == (int)fid))
return sp_it->first;
if (f_it != face_lst.end() && *f_it == (int)fid)
return it.first;
//. if (std::find(face_lst.begin(),face_lst.end(),fid)!=face_lst.end()) return sp_it->first;
}
return 0;
Expand Down Expand Up @@ -449,30 +449,30 @@ void CEditableMesh::GetFacePT(u32 fid, const Fvector* pt[3])
int CEditableMesh::GetFaceCount(bool bMatch2Sided, bool bIgnoreOCC)
{
int f_cnt = 0;
for (SurfFacesPairIt sp_it = m_SurfFaces.begin(); sp_it != m_SurfFaces.end(); sp_it++)
for (auto& it : m_SurfFaces)
{
CSurface* S = sp_it->first;
CSurface* S = it.first;
if (S->m_GameMtlName == "materials\\occ" && bIgnoreOCC)
continue;

if (bMatch2Sided)
{
if (S->m_Flags.is(CSurface::sf2Sided))
f_cnt += sp_it->second.size() * 2;
f_cnt += it.second.size() * 2;
else
f_cnt += sp_it->second.size();
f_cnt += it.second.size();
}
else
{
f_cnt += sp_it->second.size();
f_cnt += it.second.size();
}
}
return f_cnt;
}

float CEditableMesh::CalculateSurfaceArea(CSurface* surf, bool bMatch2Sided)
{
SurfFacesPairIt sp_it = m_SurfFaces.find(surf);
auto sp_it = m_SurfFaces.find(surf);
if (sp_it == m_SurfFaces.end())
return 0;
float area = 0;
Expand All @@ -492,7 +492,7 @@ float CEditableMesh::CalculateSurfaceArea(CSurface* surf, bool bMatch2Sided)

float CEditableMesh::CalculateSurfacePixelArea(CSurface* surf, bool bMatch2Sided)
{
SurfFacesPairIt sp_it = m_SurfFaces.find(surf);
auto sp_it = m_SurfFaces.find(surf);
if (sp_it == m_SurfFaces.end())
return 0;
float area = 0;
Expand All @@ -514,7 +514,7 @@ float CEditableMesh::CalculateSurfacePixelArea(CSurface* surf, bool bMatch2Sided

int CEditableMesh::GetSurfFaceCount(CSurface* surf, bool bMatch2Sided)
{
SurfFacesPairIt sp_it = m_SurfFaces.find(surf);
auto sp_it = m_SurfFaces.find(surf);
if (sp_it == m_SurfFaces.end())
return 0;
int f_cnt = sp_it->second.size();
Expand All @@ -541,9 +541,9 @@ void CEditableMesh::DumpAdjacency()

int CEditableMesh::FindVMapByName(VMapVec& vmaps, const char* name, u8 t, bool polymap)
{
for (VMapIt vm_it = vmaps.begin(); vm_it != vmaps.end(); vm_it++)
for (auto vm_it = vmaps.begin(); vm_it != vmaps.end(); vm_it++)
{
if (((*vm_it)->type == t) && (xr_stricmp((*vm_it)->name.c_str(), name) == 0) && (polymap == (*vm_it)->polymap))
if ((*vm_it)->type == t && xr_stricmp((*vm_it)->name.c_str(), name) == 0 && polymap == (*vm_it)->polymap)
return vm_it - vmaps.begin();
}
return -1;
Expand Down
48 changes: 24 additions & 24 deletions src/editors/ECore/Editor/EditMeshIO.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,39 +59,39 @@ void CEditableMesh::SaveMesh(IWriter& F)

F.open_chunk(EMESH_CHUNK_VMREFS);
F.w_u32(m_VMRefs.size());
for (VMRefsIt r_it = m_VMRefs.begin(); r_it != m_VMRefs.end(); r_it++)
for (auto& it : m_VMRefs)
{
int sz = r_it->count;
int sz = it.count;
VERIFY(sz <= 255);
F.w_u8((u8)sz);
F.w(r_it->pts, sizeof(st_VMapPt) * sz);
F.w(it.pts, sizeof(st_VMapPt) * sz);
}
F.close_chunk();

F.open_chunk(EMESH_CHUNK_SFACE);
F.w_u16((u16)m_SurfFaces.size()); /* surface polygon count*/
for (SurfFacesPairIt plp_it = m_SurfFaces.begin(); plp_it != m_SurfFaces.end(); plp_it++)
for (auto& it : m_SurfFaces)
{
F.w_stringZ(plp_it->first->_Name()); /* surface name*/
IntVec& pol_lst = plp_it->second;
F.w_stringZ(it.first->_Name()); /* surface name*/
IntVec& pol_lst = it.second;
F.w_u32(pol_lst.size()); /* surface-polygon indices*/
F.w(&*pol_lst.begin(), sizeof(int) * pol_lst.size());
}
F.close_chunk();

F.open_chunk(EMESH_CHUNK_VMAPS_2);
F.w_u32(m_VMaps.size());
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
for (auto& it : m_VMaps)
{
F.w_stringZ((*vm_it)->name);
F.w_u8((*vm_it)->dim);
F.w_u8((u8)(*vm_it)->polymap);
F.w_u8((*vm_it)->type);
F.w_u32((*vm_it)->size());
F.w((*vm_it)->getVMdata(), (*vm_it)->VMdatasize());
F.w((*vm_it)->getVIdata(), (*vm_it)->VIdatasize());
if ((*vm_it)->polymap)
F.w((*vm_it)->getPIdata(), (*vm_it)->PIdatasize());
F.w_stringZ(it->name);
F.w_u8(it->dim);
F.w_u8(it->polymap);
F.w_u8(it->type);
F.w_u32(it->size());
F.w(it->getVMdata(), it->VMdatasize());
F.w(it->getVIdata(), it->VIdatasize());
if (it->polymap)
F.w(it->getPIdata(), it->PIdatasize());
}
F.close_chunk();
}
Expand All @@ -103,7 +103,7 @@ bool CEditableMesh::LoadMesh(IReader& F)
R_ASSERT(F.r_chunk(EMESH_CHUNK_VERSION, &version));
if (version != EMESH_CURRENT_VERSION)
{
ELog.DlgMsg(mtError, "CEditableMesh: unsuported file version. Mesh can't load.");
ELog.DlgMsg(mtError, "CEditableMesh: unsupported file version. Mesh can't load.");
return false;
}

Expand Down Expand Up @@ -146,11 +146,11 @@ bool CEditableMesh::LoadMesh(IReader& F)
R_ASSERT(F.find_chunk(EMESH_CHUNK_VMREFS));
m_VMRefs.resize(F.r_u32());
int sz_vmpt = sizeof(st_VMapPt);
for (VMRefsIt r_it = m_VMRefs.begin(); r_it != m_VMRefs.end(); r_it++)
for (auto& it : m_VMRefs)
{
r_it->count = F.r_u8();
r_it->pts = xr_alloc<st_VMapPt>(r_it->count);
F.r(r_it->pts, sz_vmpt * r_it->count);
it.count = F.r_u8();
it.pts = xr_alloc<st_VMapPt>(it.count);
F.r(it.pts, sz_vmpt * it.count);
}

R_ASSERT(F.find_chunk(EMESH_CHUNK_SFACE));
Expand All @@ -176,7 +176,7 @@ bool CEditableMesh::LoadMesh(IReader& F)
if (F.find_chunk(EMESH_CHUNK_VMAPS_2))
{
m_VMaps.resize(F.r_u32());
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
for (auto vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); ++vm_it)
{
*vm_it = new st_VMap();
F.r_stringZ((*vm_it)->name);
Expand All @@ -195,7 +195,7 @@ bool CEditableMesh::LoadMesh(IReader& F)
if (F.find_chunk(EMESH_CHUNK_VMAPS_1))
{
m_VMaps.resize(F.r_u32());
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
for (auto vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); ++vm_it)
{
*vm_it = new st_VMap();
F.r_stringZ((*vm_it)->name);
Expand All @@ -209,7 +209,7 @@ bool CEditableMesh::LoadMesh(IReader& F)
{
R_ASSERT(F.find_chunk(EMESH_CHUNK_VMAPS_0));
m_VMaps.resize(F.r_u32());
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
for (auto vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); ++vm_it)
{
*vm_it = new st_VMap();
F.r_stringZ((*vm_it)->name);
Expand Down
18 changes: 9 additions & 9 deletions src/editors/ECore/Editor/EditMeshModify.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ void CEditableMesh::RebuildVMaps()
// refs copy to new
{
nVMRefs.resize(m_VMRefs.size());
for (VMRefsIt o_it = m_VMRefs.begin(), n_it = nVMRefs.begin(); o_it != m_VMRefs.end(); o_it++, n_it++)
for (auto& it : m_VMRefs)
{
n_it->count = o_it->count;
n_it->pts = xr_alloc<st_VMapPt>(n_it->count);
it.count = it.count;
it.pts = xr_alloc<st_VMapPt>(it.count);
}
}

Expand Down Expand Up @@ -155,14 +155,14 @@ void CEditableMesh::RebuildVMaps()
}
}
}
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
xr_delete(*vm_it);
for (auto& it : m_VMaps)
xr_delete(it);

m_VMaps.clear();
m_VMaps = nVMaps;
// clear refs
for (VMRefsIt ref_it = m_VMRefs.begin(); ref_it != m_VMRefs.end(); ref_it++)
xr_free(ref_it->pts);
for (auto& it : m_VMRefs)
xr_free(it.pts);
m_VMRefs.clear();
m_VMRefs = nVMRefs;
}
Expand Down Expand Up @@ -315,9 +315,9 @@ void CEditableMesh::OptimizeMesh(BOOL NoOpt)
{
if (faces_mark[dk])
{
for (SurfFacesPairIt plp_it = m_SurfFaces.begin(); plp_it != m_SurfFaces.end(); ++plp_it)
for (auto it : m_SurfFaces)
{
IntVec& pol_lst = plp_it->second;
IntVec& pol_lst = it.second;
for (int k = 0; k < int(pol_lst.size()); ++k)
{
int& f = pol_lst[k];
Expand Down
13 changes: 9 additions & 4 deletions src/editors/ECore/Editor/EditObject.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ struct SXRShaderData;
struct ogf_desc;
class CCustomObject;

namespace KinematicsABT
{
struct additional_bone_transform;
}

#ifndef _EDITOR
class PropValue;
#define ref_shader LPVOID
Expand Down Expand Up @@ -324,8 +329,8 @@ class ECORE_API CEditableObject :
IC int BonePartCount() { return m_BoneParts.size(); }
IC BPIt BonePart(CBone* B);

IC BoneIt FirstBone() { return m_Bones.begin(); }
IC BoneIt LastBone() { return m_Bones.end(); }
auto FirstBone() { return m_Bones.begin(); }
auto LastBone() { return m_Bones.end(); }
IC BoneVec& Bones() { return m_Bones; }
IC int BoneCount() const { return m_Bones.size(); }
shared_str BoneNameByID(int id);
Expand Down Expand Up @@ -452,7 +457,7 @@ class ECORE_API CEditableObject :
bool ContainsMesh(const CEditableMesh* m);
CSurface* FindSurfaceByName(LPCSTR surf_name, int* s_id = 0);
int FindBoneByNameIdx(LPCSTR name);
BoneIt FindBoneByNameIt(LPCSTR name);
auto FindBoneByNameIt(LPCSTR name);
CBone* FindBoneByName(LPCSTR name);
int GetSelectedBones(BoneVec& sel_bones);
u16 GetBoneIndexByWMap(LPCSTR wm_name);
Expand Down Expand Up @@ -574,7 +579,7 @@ class ECORE_API CEditableObject :
virtual u64 LL_GetBonesVisible() { return u64(-1); }
virtual void LL_SetBonesVisible(u64 mask) { VERIFY(false); }

virtual void LL_AddTransformToBone(KinematicsABT::additional_bone_transform& offset){}; //--#SM+#--
virtual void LL_AddTransformToBone(KinematicsABT::additional_bone_transform& offset) {} //--#SM+#--
virtual void LL_ClearAdditionalTransform(u16 bone_id){}; //--#SM+#--

// Main functionality
Expand Down
Loading

0 comments on commit 9c5303a

Please sign in to comment.