dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update headers in collada

Browse source 
Make include-what-you-use happy with files in source/collada and
fix what needs to be fixed after. Also switch quote with bracket include
where appropriate.

Ref: #8086
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2025-06-20 00:06:41 +02:00
parent 891908b801
commit 7eaea3d181
No known key found for this signature in database
12 changed files with 120 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/collada/CommonConvert.cpp
View file

@ -19,18 +19,27 @@
#include "CommonConvert.h"
#include "DLL.h"
#include "StdSkeletons.h"
#include "XMLFix.h"
#include "FCollada.h"
#include "FCDocument/FCDSceneNode.h"
#include "FCDocument/FCDSkinController.h"
#include "FUtils/FUDaeSyntax.h"
#include "FUtils/FUFileManager.h"
#include <FCDocument/FCDAsset.h>
#include <FCDocument/FCDControllerInstance.h>
#include <FCDocument/FCDEntity.h>
#include <FCDocument/FCDEntityInstance.h>
#include <FCDocument/FCDSceneNode.h>
#include <FCDocument/FCDSkinController.h>
#include <FCollada.h>
#include <FMath/FMVector3.h>
#include <FUtils/FUString.h>
#include <FUtils/FUtils.h>
#include <algorithm>
#include <cassert>
#include <cstdarg>
#include <cstdio>
#include <libxml/xmlerror.h>
#include <libxml/xmlmemory.h>
#include <utility>
void require_(int line, bool value, const char* type, const char* message)
{

13
source/collada/CommonConvert.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,15 +18,22 @@
#ifndef INCLUDED_COMMONCONVERT
#define INCLUDED_COMMONCONVERT
#include <FCDocument/FCDExtra.h>
#include <FCDocument/FCDocument.h>
#include <FMath/FMMatrix44.h>
#include <FUtils/FUError.h>
#include <FUtils/Platforms.h>
#include <cstddef>
#include <exception>
#include <string>
#include <libxml/tree.h>
#include <memory>
#include <string>
#include <vector>
class FCDControllerInstance;
class FCDEntityInstance;
class FCDSceneNode;
class FCDSkinController;
class FMMatrix44;
class Skeleton;

10
source/collada/DLL.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -17,13 +17,19 @@
#include "precompiled.h"
#include "DLL.h"
#include "CommonConvert.h"
#include "PMDConvert.h"
#include "PSAConvert.h"
#include "StdSkeletons.h"
#include <cstdarg>
#include <FCollada.h>
#include <cassert>
#include <cstdarg>
#include <cstdio>
#include <cstring>
#include <string>
void default_logger(void*, int severity, const char* message)
{

5
source/collada/Decompose.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2018 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -23,9 +23,10 @@
/**** Decompose.c ****/
/* Ken Shoemake, 1993 */
#include <math.h>
#include "Decompose.h"
#include <cmath>
/******* Matrix Preliminaries *******/
/** Fill out 3x3 matrix to 4x4 **/

28
source/collada/GeomReindex.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -19,18 +19,22 @@
#include "GeomReindex.h"
#include "FCollada.h"
#include "FCDocument/FCDEntity.h"
#include "FCDocument/FCDGeometryMesh.h"
#include "FCDocument/FCDGeometryPolygons.h"
#include "FCDocument/FCDGeometryPolygonsInput.h"
#include "FCDocument/FCDGeometrySource.h"
#include "FCDocument/FCDSkinController.h"
#include <cassert>
#include <vector>
#include <map>
#include <FCDocument/FCDGeometryMesh.h>
#include <FCDocument/FCDGeometryPolygons.h>
#include <FCDocument/FCDGeometryPolygonsInput.h>
#include <FCDocument/FCDGeometrySource.h>
#include <FCDocument/FCDSkinController.h>
#include <FMath/FMath.h>
#include <FUtils/FUDaeEnum.h>
#include <FUtils/Platforms.h>
#include <algorithm>
#include <cassert>
#include <cmath>
#include <cstring>
#include <iterator>
#include <map>
#include <utility>
#include <vector>
typedef std::pair<float, float> uv_pair_type;

6
source/collada/Maths.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -19,8 +19,10 @@
#include "Maths.h"
#include "FCollada.h"
#include "DLL.h"
#include <FMath/FMMatrix44.h>
#include <FMath/FMVector3.h>
void DumpMatrix(const FMMatrix44& m)
{

41
source/collada/PMDConvert.cpp
View file

@ -18,31 +18,36 @@
#include "precompiled.h"
#include "PMDConvert.h"
#include "CommonConvert.h"
#include "FCollada.h"
#include "FCDocument/FCDAsset.h"
#include "FCDocument/FCDocument.h"
#include "FCDocument/FCDocumentTools.h"
#include "FCDocument/FCDController.h"
#include "FCDocument/FCDControllerInstance.h"
#include "FCDocument/FCDGeometry.h"
#include "FCDocument/FCDGeometryMesh.h"
#include "FCDocument/FCDGeometryPolygons.h"
#include "FCDocument/FCDGeometryPolygonsInput.h"
#include "FCDocument/FCDGeometryPolygonsTools.h"
#include "FCDocument/FCDGeometrySource.h"
#include "FCDocument/FCDSceneNode.h"
#include "FCDocument/FCDSkinController.h"
#include "DLL.h"
#include "StdSkeletons.h"
#include "Decompose.h"
#include "Maths.h"
#include "GeomReindex.h"
#include <cassert>
#include <vector>
#include <FCDocument/FCDController.h>
#include <FCDocument/FCDControllerInstance.h>
#include <FCDocument/FCDEntity.h>
#include <FCDocument/FCDEntityInstance.h>
#include <FCDocument/FCDGeometry.h>
#include <FCDocument/FCDGeometryMesh.h>
#include <FCDocument/FCDGeometryPolygons.h>
#include <FCDocument/FCDGeometryPolygonsInput.h>
#include <FCDocument/FCDGeometryPolygonsTools.h>
#include <FCDocument/FCDGeometrySource.h>
#include <FCDocument/FCDSceneNode.h>
#include <FCDocument/FCDSkinController.h>
#include <FMath/FMMatrix44.h>
#include <FMath/FMVector3.h>
#include <FUtils/FUDaeEnum.h>
#include <FUtils/FUString.h>
#include <FUtils/Platforms.h>
#include <algorithm>
#include <cassert>
#include <cstring>
#include <utility>
#include <vector>
const size_t maxInfluences = 4;
struct VertexBlend

46
source/collada/PSAConvert.cpp
View file

@ -18,33 +18,35 @@
#include "precompiled.h"
#include "PSAConvert.h"
#include "CommonConvert.h"
#include "FCollada.h"
#include "FCDocument/FCDocument.h"
#include "FCDocument/FCDocumentTools.h"
#include "FCDocument/FCDAnimated.h"
#include "FCDocument/FCDAnimationCurve.h"
#include "FCDocument/FCDAnimationKey.h"
#include "FCDocument/FCDController.h"
#include "FCDocument/FCDControllerInstance.h"
#include "FCDocument/FCDExtra.h"
#include "FCDocument/FCDGeometry.h"
#include "FCDocument/FCDGeometryMesh.h"
#include "FCDocument/FCDGeometryPolygons.h"
#include "FCDocument/FCDGeometrySource.h"
#include "FCDocument/FCDSceneNode.h"
#include "StdSkeletons.h"
#include "Decompose.h"
#include "Maths.h"
#include "GeomReindex.h"
#include "StdSkeletons.h"
#include "DLL.h"
#include <cassert>
#include <vector>
#include <limits>
#include <iterator>
#include <FCDocument/FCDAnimated.h>
#include <FCDocument/FCDAnimationCurve.h>
#include <FCDocument/FCDAnimationKey.h>
#include <FCDocument/FCDController.h>
#include <FCDocument/FCDControllerInstance.h>
#include <FCDocument/FCDEntityInstance.h>
#include <FCDocument/FCDExtra.h>
#include <FCDocument/FCDSceneNode.h>
#include <FCDocument/FCDSkinController.h>
#include <FCDocument/FCDTransform.h>
#include <FCDocument/FCDocument.h>
#include <FMath/FMMatrix44.h>
#include <FUtils/FUString.h>
#include <FUtils/FUStringConversion.h>
#include <FUtils/Platforms.h>
#include <algorithm>
#include <cassert>
#include <cstring>
#include <float.h>
#include <iterator>
#include <limits>
#include <vector>
class PSAConvert
{

13
source/collada/StdSkeletons.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -17,16 +17,17 @@
#include "precompiled.h"
#include "libxml/parser.h"
#include "libxml/xmlerror.h"
#include "StdSkeletons.h"
#include "CommonConvert.h"
#include "FUtils/FUXmlParser.h"
#include <FUtils/FUXmlParser.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xmlerror.h>
#include <map>
#include <utility>
#include <vector>
namespace
{

3
source/collada/StdSkeletons.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,6 +18,7 @@
#ifndef INCLUDED_STDSKELETONS
#define INCLUDED_STDSKELETONS
#include <cstddef>
#include <string>
#include <memory>

9
source/collada/XMLFix.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2023 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -19,11 +19,12 @@
#include "XMLFix.h"
#include "CommonConvert.h"
#include "FUtils/FUXmlParser.h"
#include "DLL.h"
#include <cstring>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xmlstring.h>
/*

4
source/collada/XMLFix.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,6 +18,8 @@
#ifndef XMLFIX_INCLUDED
#define XMLFIX_INCLUDED
#include <cstddef>
/**
* Fixes some errors in COLLADA XML files that would otherwise prevent
* FCollada from loading them successfully.