refactor: headers and namespace

Author: WallanceLee

src/FBX2glTF.cpp

@@ -6,19 +6,19 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// Standard library includes
 #include <fstream>
 #include <iostream>
-#include <map>
-#include <unordered_map>
 #include <vector>
 
+// Third-party library includes
 #include <CLI/CLI.hpp>
 
+// Project includes
 #include "FBX2glTF.h"
 #include "fbx/Fbx2Raw.hpp"
 #include "gltf/Raw2Gltf.hpp"
 #include "utils/File_Utils.hpp"
-#include "utils/String_Utils.hpp"
 
 bool verboseOutput = false;
 

src/fbx/Fbx2Raw.cpp

@@ -11,7 +11,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <cstdio>
 #include <map>
 #include <set>
 #include <string>

src/fbx/Fbx2Raw.hpp

@@ -8,6 +8,9 @@
 
 #pragma once
 
+#include <set>
+#include <string>
+
 #include "raw/RawModel.hpp"
 
 bool LoadFBXFile(

src/fbx/FbxBlendShapesAccess.hpp

@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <algorithm>
-#include <fstream>
 #include <string>
 #include <vector>
 

src/fbx/FbxSkinningAccess.hpp

@@ -8,15 +8,12 @@
 
 #pragma once
 
-#include <algorithm>
-#include <fstream>
-#include <map>
-#include <set>
-#include <string>
-#include <unordered_map>
+#include <fbxsdk/scene/geometry/fbxnode.h>
+#include <cassert>
 #include <vector>
+#include "mathfu.hpp"
+using namespace fbxsdk;
 
-#include "FBX2glTF.h"
 
 class FbxSkinningAccess {
  public:

src/fbx/materials/3dsMaxPhysicalMaterial.cpp

@@ -6,7 +6,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <fbxsdk/scene/shading/fbxfiletexture.h>
+#include <fmt/printf.h>
+
+#include "FBX2glTF.h"
 #include "RoughnessMetallicMaterials.hpp"
+using namespace fbxsdk;
 
 std::unique_ptr<FbxRoughMetMaterialInfo> Fbx3dsMaxPhysicalMaterialResolver::resolve() const {
   const FbxProperty topProp = fbxMaterial->FindProperty("3dsMax", false);

src/fbx/materials/FbxMaterials.hpp

@@ -8,19 +8,25 @@
 
 #pragma once
 
+#include <fbxsdk/core/arch/fbxtypes.h>
+#include <fbxsdk/core/base/fbxstring.h>
+#include <fbxsdk/scene/geometry/fbxlayer.h>
+#include <fbxsdk/scene/geometry/fbxmesh.h>
+#include <fbxsdk/scene/shading/fbxsurfacematerial.h>
+#include <fbxsdk/scene/shading/fbxtexture.h>
 #include <map>
+#include <memory>
 #include <vector>
-
-#include "FBX2glTF.h"
+using namespace fbxsdk;
 
 class FbxMaterialInfo {
  public:
   FbxMaterialInfo(const FbxUInt64 id, const FbxString& name, const FbxString& shadingModel)
       : id(id), name(name), shadingModel(shadingModel) {}
 
-  const FbxUInt64 id;
-  const FbxString name;
-  const FbxString shadingModel;
+  const fbxsdk::FbxUInt64 id;
+  const fbxsdk::FbxString name;
+  const fbxsdk::FbxString shadingModel;
 };
 
 template <class T>

src/fbx/materials/RoughnessMetallicMaterials.hpp

@@ -8,9 +8,11 @@
 
 #pragma once
 
+#include <fbxsdk/scene/shading/fbxfiletexture.h>
 #include <map>
 
 #include "FbxMaterials.hpp"
+using namespace fbxsdk;
 
 struct FbxRoughMetMaterialInfo : FbxMaterialInfo {
   static constexpr const char* FBX_SHADER_METROUGH = "MetallicRoughness";

src/fbx/materials/StingrayPBSMaterial.cpp

@@ -6,7 +6,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <cfloat>
+#include <fbxsdk/core/arch/fbxtypes.h>
+#include <fbxsdk/core/fbxproperty.h>
+#include <fbxsdk/scene/shading/fbxfiletexture.h>
+#include <fmt/printf.h>
+
 #include "RoughnessMetallicMaterials.hpp"
+using namespace fbxsdk;
 
 std::unique_ptr<FbxRoughMetMaterialInfo> FbxStingrayPBSMaterialResolver::resolve() const {
   const FbxProperty mayaProp = fbxMaterial->FindProperty("Maya");

src/fbx/materials/TraditionalMaterials.cpp

@@ -7,6 +7,9 @@
  */
 
 #include "TraditionalMaterials.hpp"
+#include <fbxsdk/scene/shading/fbxfiletexture.h>
+#include <fmt/printf.h>
+using namespace fbxsdk;
 
 std::unique_ptr<FbxTraditionalMaterialInfo> FbxTraditionalMaterialResolver::resolve() const {
   auto getSurfaceScalar = [&](const char* propName) -> std::tuple<FbxDouble, FbxFileTexture*> {