edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run scripts/fix_style.py

Browse source
This commit is contained in:
heinrich5991 2022-06-21 15:21:33 +02:00
parent 8c392c9437
commit 923e9acf9c
1 changed files with 49 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/tools/map_replace_area.cpp
View file

@ -25,26 +25,26 @@ struct MapObject // quad pivot or tile layer
float m_pExtendedArea[2][2]; // extended with parallax
};
bool ReplaceArea(IStorage*, const char[][64], const float[][2][2]);
bool OpenMaps(IStorage*, const char[][64], CDataFileReader[], CDataFileWriter&);
void SaveOutputMap(CDataFileReader&, CDataFileWriter&);
bool ReplaceArea(IStorage *, const char[][64], const float[][2][2]);
bool OpenMaps(IStorage *, const char[][64], CDataFileReader[], CDataFileWriter &);
void SaveOutputMap(CDataFileReader &, CDataFileWriter &);
bool CompareLayers(const char[][64], CDataFileReader[]);
void CompareGroups(const char[][64], CDataFileReader[]);
const CMapItemGroup* GetLayerGroup(CDataFileReader&, const int);
const CMapItemGroup *GetLayerGroup(CDataFileReader &, const int);
void ReplaceAreaTiles(CDataFileReader[], const float[][2][2], const CMapItemGroup*[], CMapItemLayer*[]);
void RemoveDestinationTiles(CMapItemLayerTilemap*, CTile*, float[][2]);
void ReplaceDestinationTiles(CMapItemLayerTilemap*[], CTile*[], float[][2][2]);
void ReplaceAreaTiles(CDataFileReader[], const float[][2][2], const CMapItemGroup *[], CMapItemLayer *[]);
void RemoveDestinationTiles(CMapItemLayerTilemap *, CTile *, float[][2]);
void ReplaceDestinationTiles(CMapItemLayerTilemap *[], CTile *[], float[][2][2]);
bool AdaptVisibleAreas(const float[][2][2], const MapObject[], float[][2][2]);
bool AdaptReplaceableAreas(const float[][2][2], const float[][2][2], const MapObject[], float[][2][2]);
void ReplaceAreaQuads(CDataFileReader[], const float[][2][2], const CMapItemGroup*[], CMapItemLayer*[], const int);
bool RemoveDestinationQuads(const float[][2], const CQuad*, const int, const CMapItemGroup*, CQuad*, int&);
bool InsertDestinationQuads(const float[][2][2], const CQuad*, const int, const CMapItemGroup*[], CQuad*, int&);
bool AdaptVisiblePoint(const float [][2][2], const float[][2], const MapObject[], float[]);
void ReplaceAreaQuads(CDataFileReader[], const float[][2][2], const CMapItemGroup *[], CMapItemLayer *[], const int);
bool RemoveDestinationQuads(const float[][2], const CQuad *, const int, const CMapItemGroup *, CQuad *, int &);
bool InsertDestinationQuads(const float[][2][2], const CQuad *, const int, const CMapItemGroup *[], CQuad *, int &);
bool AdaptVisiblePoint(const float[][2][2], const float[][2], const MapObject[], float[]);
MapObject CreateMapObject(const CMapItemGroup*, const int, const int, const int, const int);
void SetExtendedArea(MapObject&);
MapObject CreateMapObject(const CMapItemGroup *, const int, const int, const int, const int);
void SetExtendedArea(MapObject &);
bool GetVisibleArea(const float[][2], const MapObject, float[][2] = 0x0);
bool GetReplaceableArea(const float[][2], const MapObject, float[][2]);
@ -55,11 +55,10 @@ void ConvertToTiles(const float[][2], int[][2]);
bool GetLineIntersection(const float[], const float[], float[] = 0x0);
bool GetLineIntersection(const float[], const float);
void SetInexistent(float*, const int);
bool IsInexistent(const float*, const int);
void SetInexistent(float *, const int);
bool IsInexistent(const float *, const int);
bool IsInexistent(const float);
int main(int argc, const char *argv[])
{
CCmdlineFix CmdlineFix(&argc, &argv);
@ -141,7 +140,6 @@ bool ReplaceArea(IStorage *pStorage, const char pMapNames[3][64], const float pG
return true;
}
bool OpenMaps(IStorage *pStorage, const char pMapNames[3][64], CDataFileReader InputMaps[2], CDataFileWriter &OutputMap)
{
for(int i = 0; i < 2; i++)
@ -236,18 +234,14 @@ void CompareGroups(const char pMapNames[3][64], CDataFileReader InputMaps[2])
for(int j = 0; j < 2; j++)
pItem[j] = (CMapItemGroup *)InputMaps[j].GetItem(Start[j] + i, 0, 0);
bool bSameConfig = pItem[0]->m_ParallaxX == pItem[1]->m_ParallaxX && pItem[0]->m_ParallaxY == pItem[1]->m_ParallaxY
&& pItem[0]->m_OffsetX == pItem[1]->m_OffsetX && pItem[0]->m_OffsetY == pItem[1]->m_OffsetY
&& pItem[0]->m_UseClipping == pItem[1]->m_UseClipping
&& pItem[0]->m_ClipX == pItem[1]->m_ClipX && pItem[0]->m_ClipY == pItem[1]->m_ClipY
&& pItem[0]->m_ClipW == pItem[1]->m_ClipW && pItem[0]->m_ClipH == pItem[1]->m_ClipH;
bool bSameConfig = pItem[0]->m_ParallaxX == pItem[1]->m_ParallaxX && pItem[0]->m_ParallaxY == pItem[1]->m_ParallaxY && pItem[0]->m_OffsetX == pItem[1]->m_OffsetX && pItem[0]->m_OffsetY == pItem[1]->m_OffsetY && pItem[0]->m_UseClipping == pItem[1]->m_UseClipping && pItem[0]->m_ClipX == pItem[1]->m_ClipX && pItem[0]->m_ClipY == pItem[1]->m_ClipY && pItem[0]->m_ClipW == pItem[1]->m_ClipW && pItem[0]->m_ClipH == pItem[1]->m_ClipH;
if(!bSameConfig)
dbg_msg("map_replace_area", "Warning: different configuration on layergroup #%d, this might lead to unexpected results", i);
}
}
const CMapItemGroup* GetLayerGroup(CDataFileReader &InputMap, const int LayerNumber)
const CMapItemGroup *GetLayerGroup(CDataFileReader &InputMap, const int LayerNumber)
{
int Start, Num;
InputMap.GetType(MAPITEMTYPE_GROUP, &Start, &Num);
@ -395,7 +389,6 @@ void ReplaceAreaQuads(CDataFileReader InputMaps[2], const float pGameAreas[][2][
}
else
delete pQuads[2];
}
bool RemoveDestinationQuads(const float pGameArea[2][2], const CQuad *pQuads, const int NumQuads, const CMapItemGroup *pLayerGroup, CQuad *pDestQuads, int &QuadsCounter)
@ -501,7 +494,7 @@ MapObject CreateMapObject(const CMapItemGroup *pLayerGroup, const int PosX, cons
void SetExtendedArea(MapObject &Ob)
{
SetInexistent((float*)Ob.m_pExtendedArea, 4);
SetInexistent((float *)Ob.m_pExtendedArea, 4);
for(int i = 0; i < 2; i++)
{
@ -523,11 +516,11 @@ void SetExtendedArea(MapObject &Ob)
bool GetVisibleArea(const float pGameArea[2][2], const MapObject Ob, float pVisibleArea[2][2])
{
if(IsInexistent((float*)Ob.m_pExtendedArea, 4))
if(IsInexistent((float *)Ob.m_pExtendedArea, 4))
return false;
if(pVisibleArea)
SetInexistent((float*)pVisibleArea, 4);
SetInexistent((float *)pVisibleArea, 4);
float pInspectedArea[2][2];
memcpy(pInspectedArea, pGameArea, sizeof(float[2][2]));
@ -555,8 +548,8 @@ bool GetVisibleArea(const float pGameArea[2][2], const MapObject Ob, float pVisi
bool GetReplaceableArea(const float pVisibleArea[2][2], const MapObject Ob, float pReplaceableArea[2][2])
{
SetInexistent((float*)pReplaceableArea, 4);
if(IsInexistent((float*)pVisibleArea, 4))
SetInexistent((float *)pReplaceableArea, 4);
if(IsInexistent((float *)pVisibleArea, 4))
return false;
for(int i = 0; i < 2; i++)
@ -629,7 +622,7 @@ void ConvertToTiles(const float pArea[2][2], int pTiles[2][2])
for(int i = 0; i < 2; i++)
{
pTiles[i][0] = floor((floor(pArea[i][0] * 100.0f) / 100.0f) / 32.0f);
pTiles[i][1] = ceil ((floor(pArea[i][1] * 100.0f) / 100.0f) / 32.0f);
pTiles[i][1] = ceil((floor(pArea[i][1] * 100.0f) / 100.0f) / 32.0f);
}
}
@ -637,11 +630,10 @@ bool GetLineIntersection(const float pLine1[2], const float pLine2[2], float pIn
{
float pBorders[2] = {
std::max(pLine1[0], pLine2[0]),
std::min(pLine1[1], pLine2[1])
};
std::min(pLine1[1], pLine2[1])};
if(pIntersection)
SetInexistent((float*)pIntersection, 2);
SetInexistent((float *)pIntersection, 2);
if(pBorders[0] - pBorders[1] > 0.01f)
return false;