Skip to content

Commit 9c5303a

Browse files
Xottab-DUTYXottab-DUTY
committed
Fix plugins
Enable compilation for mp_configs_verifyer and mp_screenshots_info
1 parent e50333c commit 9c5303a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1599
-1182
lines changed

‎src/editors/ECore/Editor/EditMesh.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ void CEditableMesh::Clear()
5959

6060
xr_free(m_Vertices);
6161
xr_free(m_Faces);
62-
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
63-
xr_delete(*vm_it);
62+
for (auto& vm_it : m_VMaps)
63+
xr_delete(vm_it);
6464
m_VMaps.clear();
6565
m_SurfFaces.clear();
66-
for (VMRefsIt ref_it = m_VMRefs.begin(); ref_it != m_VMRefs.end(); ref_it++)
67-
xr_free(ref_it->pts);
66+
for (auto& ref_it : m_VMRefs)
67+
xr_free(ref_it.pts);
6868
m_VMRefs.clear();
6969
}
7070

@@ -415,12 +415,12 @@ void CEditableMesh::GenerateAdjacency()
415415
CSurface* CEditableMesh::GetSurfaceByFaceID(u32 fid)
416416
{
417417
R_ASSERT(fid < m_FaceCount);
418-
for (SurfFacesPairIt sp_it = m_SurfFaces.begin(); sp_it != m_SurfFaces.end(); sp_it++)
418+
for (auto& it : m_SurfFaces)
419419
{
420-
IntVec& face_lst = sp_it->second;
420+
IntVec& face_lst = it.second;
421421
IntIt f_it = std::lower_bound(face_lst.begin(), face_lst.end(), (int)fid);
422-
if ((f_it != face_lst.end()) && (*f_it == (int)fid))
423-
return sp_it->first;
422+
if (f_it != face_lst.end() && *f_it == (int)fid)
423+
return it.first;
424424
//. if (std::find(face_lst.begin(),face_lst.end(),fid)!=face_lst.end()) return sp_it->first;
425425
}
426426
return 0;
@@ -449,30 +449,30 @@ void CEditableMesh::GetFacePT(u32 fid, const Fvector* pt[3])
449449
int CEditableMesh::GetFaceCount(bool bMatch2Sided, bool bIgnoreOCC)
450450
{
451451
int f_cnt = 0;
452-
for (SurfFacesPairIt sp_it = m_SurfFaces.begin(); sp_it != m_SurfFaces.end(); sp_it++)
452+
for (auto& it : m_SurfFaces)
453453
{
454-
CSurface* S = sp_it->first;
454+
CSurface* S = it.first;
455455
if (S->m_GameMtlName == "materials\\occ" && bIgnoreOCC)
456456
continue;
457457

458458
if (bMatch2Sided)
459459
{
460460
if (S->m_Flags.is(CSurface::sf2Sided))
461-
f_cnt += sp_it->second.size() * 2;
461+
f_cnt += it.second.size() * 2;
462462
else
463-
f_cnt += sp_it->second.size();
463+
f_cnt += it.second.size();
464464
}
465465
else
466466
{
467-
f_cnt += sp_it->second.size();
467+
f_cnt += it.second.size();
468468
}
469469
}
470470
return f_cnt;
471471
}
472472

473473
float CEditableMesh::CalculateSurfaceArea(CSurface* surf, bool bMatch2Sided)
474474
{
475-
SurfFacesPairIt sp_it = m_SurfFaces.find(surf);
475+
auto sp_it = m_SurfFaces.find(surf);
476476
if (sp_it == m_SurfFaces.end())
477477
return 0;
478478
float area = 0;
@@ -492,7 +492,7 @@ float CEditableMesh::CalculateSurfaceArea(CSurface* surf, bool bMatch2Sided)
492492

493493
float CEditableMesh::CalculateSurfacePixelArea(CSurface* surf, bool bMatch2Sided)
494494
{
495-
SurfFacesPairIt sp_it = m_SurfFaces.find(surf);
495+
auto sp_it = m_SurfFaces.find(surf);
496496
if (sp_it == m_SurfFaces.end())
497497
return 0;
498498
float area = 0;
@@ -514,7 +514,7 @@ float CEditableMesh::CalculateSurfacePixelArea(CSurface* surf, bool bMatch2Sided
514514

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

542542
int CEditableMesh::FindVMapByName(VMapVec& vmaps, const char* name, u8 t, bool polymap)
543543
{
544-
for (VMapIt vm_it = vmaps.begin(); vm_it != vmaps.end(); vm_it++)
544+
for (auto vm_it = vmaps.begin(); vm_it != vmaps.end(); vm_it++)
545545
{
546-
if (((*vm_it)->type == t) && (xr_stricmp((*vm_it)->name.c_str(), name) == 0) && (polymap == (*vm_it)->polymap))
546+
if ((*vm_it)->type == t && xr_stricmp((*vm_it)->name.c_str(), name) == 0 && polymap == (*vm_it)->polymap)
547547
return vm_it - vmaps.begin();
548548
}
549549
return -1;

‎src/editors/ECore/Editor/EditMeshIO.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,39 +59,39 @@ void CEditableMesh::SaveMesh(IWriter& F)
5959

6060
F.open_chunk(EMESH_CHUNK_VMREFS);
6161
F.w_u32(m_VMRefs.size());
62-
for (VMRefsIt r_it = m_VMRefs.begin(); r_it != m_VMRefs.end(); r_it++)
62+
for (auto& it : m_VMRefs)
6363
{
64-
int sz = r_it->count;
64+
int sz = it.count;
6565
VERIFY(sz <= 255);
6666
F.w_u8((u8)sz);
67-
F.w(r_it->pts, sizeof(st_VMapPt) * sz);
67+
F.w(it.pts, sizeof(st_VMapPt) * sz);
6868
}
6969
F.close_chunk();
7070

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

8282
F.open_chunk(EMESH_CHUNK_VMAPS_2);
8383
F.w_u32(m_VMaps.size());
84-
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
84+
for (auto& it : m_VMaps)
8585
{
86-
F.w_stringZ((*vm_it)->name);
87-
F.w_u8((*vm_it)->dim);
88-
F.w_u8((u8)(*vm_it)->polymap);
89-
F.w_u8((*vm_it)->type);
90-
F.w_u32((*vm_it)->size());
91-
F.w((*vm_it)->getVMdata(), (*vm_it)->VMdatasize());
92-
F.w((*vm_it)->getVIdata(), (*vm_it)->VIdatasize());
93-
if ((*vm_it)->polymap)
94-
F.w((*vm_it)->getPIdata(), (*vm_it)->PIdatasize());
86+
F.w_stringZ(it->name);
87+
F.w_u8(it->dim);
88+
F.w_u8(it->polymap);
89+
F.w_u8(it->type);
90+
F.w_u32(it->size());
91+
F.w(it->getVMdata(), it->VMdatasize());
92+
F.w(it->getVIdata(), it->VIdatasize());
93+
if (it->polymap)
94+
F.w(it->getPIdata(), it->PIdatasize());
9595
}
9696
F.close_chunk();
9797
}
@@ -103,7 +103,7 @@ bool CEditableMesh::LoadMesh(IReader& F)
103103
R_ASSERT(F.r_chunk(EMESH_CHUNK_VERSION, &version));
104104
if (version != EMESH_CURRENT_VERSION)
105105
{
106-
ELog.DlgMsg(mtError, "CEditableMesh: unsuported file version. Mesh can't load.");
106+
ELog.DlgMsg(mtError, "CEditableMesh: unsupported file version. Mesh can't load.");
107107
return false;
108108
}
109109

@@ -146,11 +146,11 @@ bool CEditableMesh::LoadMesh(IReader& F)
146146
R_ASSERT(F.find_chunk(EMESH_CHUNK_VMREFS));
147147
m_VMRefs.resize(F.r_u32());
148148
int sz_vmpt = sizeof(st_VMapPt);
149-
for (VMRefsIt r_it = m_VMRefs.begin(); r_it != m_VMRefs.end(); r_it++)
149+
for (auto& it : m_VMRefs)
150150
{
151-
r_it->count = F.r_u8();
152-
r_it->pts = xr_alloc<st_VMapPt>(r_it->count);
153-
F.r(r_it->pts, sz_vmpt * r_it->count);
151+
it.count = F.r_u8();
152+
it.pts = xr_alloc<st_VMapPt>(it.count);
153+
F.r(it.pts, sz_vmpt * it.count);
154154
}
155155

156156
R_ASSERT(F.find_chunk(EMESH_CHUNK_SFACE));
@@ -176,7 +176,7 @@ bool CEditableMesh::LoadMesh(IReader& F)
176176
if (F.find_chunk(EMESH_CHUNK_VMAPS_2))
177177
{
178178
m_VMaps.resize(F.r_u32());
179-
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
179+
for (auto vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); ++vm_it)
180180
{
181181
*vm_it = new st_VMap();
182182
F.r_stringZ((*vm_it)->name);
@@ -195,7 +195,7 @@ bool CEditableMesh::LoadMesh(IReader& F)
195195
if (F.find_chunk(EMESH_CHUNK_VMAPS_1))
196196
{
197197
m_VMaps.resize(F.r_u32());
198-
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
198+
for (auto vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); ++vm_it)
199199
{
200200
*vm_it = new st_VMap();
201201
F.r_stringZ((*vm_it)->name);
@@ -209,7 +209,7 @@ bool CEditableMesh::LoadMesh(IReader& F)
209209
{
210210
R_ASSERT(F.find_chunk(EMESH_CHUNK_VMAPS_0));
211211
m_VMaps.resize(F.r_u32());
212-
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
212+
for (auto vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); ++vm_it)
213213
{
214214
*vm_it = new st_VMap();
215215
F.r_stringZ((*vm_it)->name);

‎src/editors/ECore/Editor/EditMeshModify.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ void CEditableMesh::RebuildVMaps()
6363
// refs copy to new
6464
{
6565
nVMRefs.resize(m_VMRefs.size());
66-
for (VMRefsIt o_it = m_VMRefs.begin(), n_it = nVMRefs.begin(); o_it != m_VMRefs.end(); o_it++, n_it++)
66+
for (auto& it : m_VMRefs)
6767
{
68-
n_it->count = o_it->count;
69-
n_it->pts = xr_alloc<st_VMapPt>(n_it->count);
68+
it.count = it.count;
69+
it.pts = xr_alloc<st_VMapPt>(it.count);
7070
}
7171
}
7272

@@ -155,14 +155,14 @@ void CEditableMesh::RebuildVMaps()
155155
}
156156
}
157157
}
158-
for (VMapIt vm_it = m_VMaps.begin(); vm_it != m_VMaps.end(); vm_it++)
159-
xr_delete(*vm_it);
158+
for (auto& it : m_VMaps)
159+
xr_delete(it);
160160

161161
m_VMaps.clear();
162162
m_VMaps = nVMaps;
163163
// clear refs
164-
for (VMRefsIt ref_it = m_VMRefs.begin(); ref_it != m_VMRefs.end(); ref_it++)
165-
xr_free(ref_it->pts);
164+
for (auto& it : m_VMRefs)
165+
xr_free(it.pts);
166166
m_VMRefs.clear();
167167
m_VMRefs = nVMRefs;
168168
}
@@ -315,9 +315,9 @@ void CEditableMesh::OptimizeMesh(BOOL NoOpt)
315315
{
316316
if (faces_mark[dk])
317317
{
318-
for (SurfFacesPairIt plp_it = m_SurfFaces.begin(); plp_it != m_SurfFaces.end(); ++plp_it)
318+
for (auto it : m_SurfFaces)
319319
{
320-
IntVec& pol_lst = plp_it->second;
320+
IntVec& pol_lst = it.second;
321321
for (int k = 0; k < int(pol_lst.size()); ++k)
322322
{
323323
int& f = pol_lst[k];

‎src/editors/ECore/Editor/EditObject.h‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ struct SXRShaderData;
3131
struct ogf_desc;
3232
class CCustomObject;
3333

34+
namespace KinematicsABT
35+
{
36+
struct additional_bone_transform;
37+
}
38+
3439
#ifndef _EDITOR
3540
class PropValue;
3641
#define ref_shader LPVOID
@@ -324,8 +329,8 @@ class ECORE_API CEditableObject :
324329
IC int BonePartCount() { return m_BoneParts.size(); }
325330
IC BPIt BonePart(CBone* B);
326331

327-
IC BoneIt FirstBone() { return m_Bones.begin(); }
328-
IC BoneIt LastBone() { return m_Bones.end(); }
332+
auto FirstBone() { return m_Bones.begin(); }
333+
auto LastBone() { return m_Bones.end(); }
329334
IC BoneVec& Bones() { return m_Bones; }
330335
IC int BoneCount() const { return m_Bones.size(); }
331336
shared_str BoneNameByID(int id);
@@ -452,7 +457,7 @@ class ECORE_API CEditableObject :
452457
bool ContainsMesh(const CEditableMesh* m);
453458
CSurface* FindSurfaceByName(LPCSTR surf_name, int* s_id = 0);
454459
int FindBoneByNameIdx(LPCSTR name);
455-
BoneIt FindBoneByNameIt(LPCSTR name);
460+
auto FindBoneByNameIt(LPCSTR name);
456461
CBone* FindBoneByName(LPCSTR name);
457462
int GetSelectedBones(BoneVec& sel_bones);
458463
u16 GetBoneIndexByWMap(LPCSTR wm_name);
@@ -574,7 +579,7 @@ class ECORE_API CEditableObject :
574579
virtual u64 LL_GetBonesVisible() { return u64(-1); }
575580
virtual void LL_SetBonesVisible(u64 mask) { VERIFY(false); }
576581

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

580585
// Main functionality

0 commit comments

Comments
 (0)