Skip to content

Commit a5409b5

Browse files
WallanceLeeWallanceLee
committed
refactor: include dir style
1 parent a1a53a3 commit a5409b5

28 files changed

+75
-102
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -58,66 +58,41 @@ if (APPLE)
5858
set(FRAMEWORKS ${CF_FRAMEWORK})
5959
endif ()
6060

61-
set(LIB_HEADERS include/FBX2glTF.h)
61+
file(GLOB_RECURSE HEADER_FILES
62+
include/*.h
63+
include/*.hpp
64+
)
65+
66+
set(LIB_HEADERS ${HEADER_FILES})
6267

6368
set(LIB_SOURCE_FILES
6469
src/fbx/materials/3dsMaxPhysicalMaterial.cpp
6570
src/fbx/materials/FbxMaterials.cpp
66-
src/fbx/materials/FbxMaterials.hpp
67-
src/fbx/materials/RoughnessMetallicMaterials.hpp
6871
src/fbx/materials/StingrayPBSMaterial.cpp
6972
src/fbx/materials/TraditionalMaterials.cpp
70-
src/fbx/materials/TraditionalMaterials.hpp
7173
src/fbx/Fbx2Raw.cpp
72-
src/fbx/Fbx2Raw.hpp
7374
src/fbx/FbxBlendShapesAccess.cpp
74-
src/fbx/FbxBlendShapesAccess.hpp
75-
src/fbx/FbxLayerElementAccess.hpp
7675
src/fbx/FbxSkinningAccess.cpp
77-
src/fbx/FbxSkinningAccess.hpp
7876
src/gltf/Raw2Gltf.cpp
79-
src/gltf/Raw2Gltf.hpp
8077
src/gltf/GltfModel.cpp
81-
src/gltf/GltfModel.hpp
8278
src/gltf/TextureBuilder.cpp
83-
src/gltf/TextureBuilder.hpp
8479
src/gltf/properties/AccessorData.cpp
85-
src/gltf/properties/AccessorData.hpp
8680
src/gltf/properties/AnimationData.cpp
87-
src/gltf/properties/AnimationData.hpp
8881
src/gltf/properties/BufferData.cpp
89-
src/gltf/properties/BufferData.hpp
9082
src/gltf/properties/BufferViewData.cpp
91-
src/gltf/properties/BufferViewData.hpp
9283
src/gltf/properties/CameraData.cpp
93-
src/gltf/properties/CameraData.hpp
9484
src/gltf/properties/ImageData.cpp
95-
src/gltf/properties/ImageData.hpp
9685
src/gltf/properties/LightData.cpp
97-
src/gltf/properties/LightData.hpp
9886
src/gltf/properties/MaterialData.cpp
99-
src/gltf/properties/MaterialData.hpp
10087
src/gltf/properties/MeshData.cpp
101-
src/gltf/properties/MeshData.hpp
10288
src/gltf/properties/NodeData.cpp
103-
src/gltf/properties/NodeData.hpp
10489
src/gltf/properties/PrimitiveData.cpp
105-
src/gltf/properties/PrimitiveData.hpp
106-
src/gltf/properties/SamplerData.hpp
10790
src/gltf/properties/SceneData.cpp
108-
src/gltf/properties/SceneData.hpp
10991
src/gltf/properties/SkinData.cpp
110-
src/gltf/properties/SkinData.hpp
11192
src/gltf/properties/TextureData.cpp
112-
src/gltf/properties/TextureData.hpp
113-
src/mathfu.hpp
11493
src/raw/RawModel.cpp
115-
src/raw/RawModel.hpp
11694
src/utils/File_Utils.cpp
117-
src/utils/File_Utils.hpp
11895
src/utils/Image_Utils.cpp
119-
src/utils/Image_Utils.hpp
120-
src/utils/String_Utils.hpp
12196
)
12297

12398
add_library(libFBX2glTF STATIC ${LIB_SOURCE_FILES})

‎src/fbx/Fbx2Raw.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include "Fbx2Raw.hpp"
9+
#include <fbx/Fbx2Raw.hpp>
1010

1111
#include <algorithm>
1212
#include <cassert>
@@ -18,15 +18,15 @@
1818

1919
#include "FBX2glTF.h"
2020

21-
#include "raw/RawModel.hpp"
22-
#include "utils/File_Utils.hpp"
23-
#include "utils/String_Utils.hpp"
21+
#include <raw/RawModel.hpp>
22+
#include <utils/File_Utils.hpp>
23+
#include <utils/String_Utils.hpp>
2424

25-
#include "FbxBlendShapesAccess.hpp"
26-
#include "FbxLayerElementAccess.hpp"
27-
#include "FbxSkinningAccess.hpp"
28-
#include "materials/RoughnessMetallicMaterials.hpp"
29-
#include "materials/TraditionalMaterials.hpp"
25+
#include <fbx/FbxBlendShapesAccess.hpp>
26+
#include <fbx/FbxLayerElementAccess.hpp>
27+
#include <fbx/FbxSkinningAccess.hpp>
28+
#include <fbx/materials/RoughnessMetallicMaterials.hpp>
29+
#include <fbx/materials/TraditionalMaterials.hpp>
3030

3131
#include <glm/glm.hpp>
3232
#include <glm/gtc/matrix_transform.hpp>

‎src/fbx/FbxBlendShapesAccess.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include "FbxBlendShapesAccess.hpp"
9+
#include <fbx/FbxBlendShapesAccess.hpp>
1010

1111
FbxBlendShapesAccess::TargetShape::TargetShape(const FbxShape* shape, FbxDouble fullWeight)
1212
: shape(shape),

‎src/fbx/FbxSkinningAccess.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include "FbxSkinningAccess.hpp"
9+
#include <fbx/FbxSkinningAccess.hpp>
1010

1111
FbxSkinningAccess::FbxSkinningAccess(const FbxMesh* pMesh, FbxScene* pScene, FbxNode* pNode)
1212
: rootIndex(-1) {

‎src/fbx/materials/3dsMaxPhysicalMaterial.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <fbxsdk/scene/shading/fbxfiletexture.h>
1010
#include <fmt/printf.h>
1111

12-
#include "FBX2glTF.h"
13-
#include "RoughnessMetallicMaterials.hpp"
12+
#include <FBX2glTF.h>
13+
#include <fbx/materials/RoughnessMetallicMaterials.hpp>
1414
using namespace fbxsdk;
1515

1616
std::unique_ptr<FbxRoughMetMaterialInfo> Fbx3dsMaxPhysicalMaterialResolver::resolve() const {

‎src/fbx/materials/FbxMaterials.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include "fbx/Fbx2Raw.hpp"
1010

11-
#include "FbxMaterials.hpp"
12-
#include "RoughnessMetallicMaterials.hpp"
13-
#include "TraditionalMaterials.hpp"
11+
#include <fbx/materials/FbxMaterials.hpp>
12+
#include <fbx/materials/RoughnessMetallicMaterials.hpp>
13+
#include <fbx/materials/TraditionalMaterials.hpp>
1414

1515
static int warnMtrCount = 0;
1616

‎src/fbx/materials/StingrayPBSMaterial.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <fbxsdk/scene/shading/fbxfiletexture.h>
1313
#include <fmt/printf.h>
1414

15-
#include "RoughnessMetallicMaterials.hpp"
15+
#include <fbx/materials/RoughnessMetallicMaterials.hpp>
1616
using namespace fbxsdk;
1717

1818
std::unique_ptr<FbxRoughMetMaterialInfo> FbxStingrayPBSMaterialResolver::resolve() const {

‎src/fbx/materials/TraditionalMaterials.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include "TraditionalMaterials.hpp"
9+
#include <fbx/materials/TraditionalMaterials.hpp>
1010
#include <fbxsdk/scene/shading/fbxfiletexture.h>
1111
#include <fmt/printf.h>
1212
using namespace fbxsdk;

‎src/gltf/GltfModel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include "GltfModel.hpp"
9+
#include <gltf/GltfModel.hpp>
1010

1111
std::shared_ptr<BufferViewData> GltfModel::GetAlignedBufferView(
1212
BufferData& buffer,

‎src/gltf/Raw2Gltf.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include "Raw2Gltf.hpp"
9+
#include <fbx/Fbx2Raw.hpp>
1010

1111
#include <cassert>
1212
#include <cstdint>
@@ -25,21 +25,21 @@
2525

2626
#include "raw/RawModel.hpp"
2727

28-
#include "gltf/properties/AccessorData.hpp"
29-
#include "gltf/properties/AnimationData.hpp"
30-
#include "gltf/properties/BufferData.hpp"
31-
#include "gltf/properties/BufferViewData.hpp"
32-
#include "gltf/properties/CameraData.hpp"
33-
#include "gltf/properties/MaterialData.hpp"
34-
#include "gltf/properties/MeshData.hpp"
35-
#include "gltf/properties/NodeData.hpp"
36-
#include "gltf/properties/PrimitiveData.hpp"
37-
#include "gltf/properties/SceneData.hpp"
38-
#include "gltf/properties/SkinData.hpp"
39-
#include "gltf/properties/TextureData.hpp"
40-
41-
#include "GltfModel.hpp"
42-
#include "TextureBuilder.hpp"
28+
#include <gltf/properties/AccessorData.hpp>
29+
#include <gltf/properties/AnimationData.hpp>
30+
#include <gltf/properties/BufferData.hpp>
31+
#include <gltf/properties/BufferViewData.hpp>
32+
#include <gltf/properties/CameraData.hpp>
33+
#include <gltf/properties/MaterialData.hpp>
34+
#include <gltf/properties/MeshData.hpp>
35+
#include <gltf/properties/NodeData.hpp>
36+
#include <gltf/properties/PrimitiveData.hpp>
37+
#include <gltf/properties/SceneData.hpp>
38+
#include <gltf/properties/SkinData.hpp>
39+
#include <gltf/properties/TextureData.hpp>
40+
41+
#include <gltf/GltfModel.hpp>
42+
#include <gltf/TextureBuilder.hpp>
4343

4444
typedef uint32_t TriangleIndex;
4545

0 commit comments

Comments
 (0)