dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Whitespace tweak.

This commit is contained in:
Par Winzell 2019-04-07 17:23:32 -07:00
parent e5078a50b7
commit 387f5df782
1 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/FBX2glTF.h
View File

@ -12,7 +12,7 @@
#include <climits> #include <climits>
#include <string> #include <string>
#if defined ( _WIN32 ) #if defined(_WIN32)
// Tell Windows not to define min() and max() macros // Tell Windows not to define min() and max() macros
#define NOMINMAX #define NOMINMAX
#include <Windows.h> #include <Windows.h>
@ -20,10 +20,10 @@
#define FBX2GLTF_VERSION std::string("0.9.6") #define FBX2GLTF_VERSION std::string("0.9.6")
#include <fmt/printf.h>
#include <fbxsdk.h> #include <fbxsdk.h>
#include <fmt/printf.h>
#if defined ( _WIN32 ) #if defined(_WIN32)
// this is defined in fbxmath.h // this is defined in fbxmath.h
#undef isnan #undef isnan
#endif #endif
@ -31,10 +31,10 @@
#include "mathfu.hpp" #include "mathfu.hpp"
// give all modules access to our tweaked JSON // give all modules access to our tweaked JSON
#include <json.hpp>
#include <fifo_map.hpp> #include <fifo_map.hpp>
#include <json.hpp>
template<class K, class V, class ignore, class A> template <class K, class V, class ignore, class A>
using workaround_fifo_map = nlohmann::fifo_map<K, V, nlohmann::fifo_map_compare<K>, A>; using workaround_fifo_map = nlohmann::fifo_map<K, V, nlohmann::fifo_map_compare<K>, A>;
using json = nlohmann::basic_json<workaround_fifo_map>; using json = nlohmann::basic_json<workaround_fifo_map>;
@ -51,8 +51,9 @@ inline uint32_t to_uint32(size_t n) {
} }
/** /**
* The variuos situations in which the user may wish for us to (re-)compute normals for our vertices. * The variuos situations in which the user may wish for us to (re-)compute normals for our
*/ * vertices.
*/
enum class ComputeNormalsOption { enum class ComputeNormalsOption {
NEVER, // do not ever compute any normals (results in broken glTF for some sources) NEVER, // do not ever compute any normals (results in broken glTF for some sources)
BROKEN, // replace zero-length normals in any mesh that has a normal layer BROKEN, // replace zero-length normals in any mesh that has a normal layer
@ -67,21 +68,20 @@ enum class UseLongIndicesOptions {
}; };
/** /**
* User-supplied options that dictate the nature of the glTF being generated. * User-supplied options that dictate the nature of the glTF being generated.
*/ */
struct GltfOptions struct GltfOptions {
{
/** /**
* If negative, disabled. Otherwise, a bitfield of RawVertexAttributes that * If negative, disabled. Otherwise, a bitfield of RawVertexAttributes that
* specify the largest set of attributes that'll ever be kept for a vertex. * specify the largest set of attributes that'll ever be kept for a vertex.
* The special bit RAW_VERTEX_ATTRIBUTE_AUTO triggers smart mode, where the * The special bit RAW_VERTEX_ATTRIBUTE_AUTO triggers smart mode, where the
* attributes to keep are inferred from which textures are supplied. * attributes to keep are inferred from which textures are supplied.
*/ */
int keepAttribs { -1 }; int keepAttribs{-1};
/** Whether to output a .glb file, the binary format of glTF. */ /** Whether to output a .glb file, the binary format of glTF. */
bool outputBinary { false }; bool outputBinary{false};
/** If non-binary, whether to inline all resources, for a single (large) .glTF file. */ /** If non-binary, whether to inline all resources, for a single (large) .glTF file. */
bool embedResources { false }; bool embedResources{false};
/** Whether and how to use KHR_draco_mesh_compression to minimize static geometry size. */ /** Whether and how to use KHR_draco_mesh_compression to minimize static geometry size. */
struct { struct {
@ -95,20 +95,20 @@ struct GltfOptions
} draco; } draco;
/** Whether to include FBX User Properties as 'extras' metadata in glTF nodes. */ /** Whether to include FBX User Properties as 'extras' metadata in glTF nodes. */
bool enableUserProperties { false }; bool enableUserProperties{false};
/** Whether to use KHR_materials_unlit to extend materials definitions. */ /** Whether to use KHR_materials_unlit to extend materials definitions. */
bool useKHRMatUnlit { false }; bool useKHRMatUnlit{false};
/** Whether to populate the pbrMetallicRoughness substruct in materials. */ /** Whether to populate the pbrMetallicRoughness substruct in materials. */
bool usePBRMetRough { false }; bool usePBRMetRough{false};
/** Whether to include lights through the KHR_punctual_lights extension. */ /** Whether to include lights through the KHR_punctual_lights extension. */
bool useKHRLightsPunctual { true }; bool useKHRLightsPunctual{true};
/** Whether to include blend shape normals, if present according to the SDK. */ /** Whether to include blend shape normals, if present according to the SDK. */
bool useBlendShapeNormals { false }; bool useBlendShapeNormals{false};
/** Whether to include blend shape tangents, if present according to the SDK. */ /** Whether to include blend shape tangents, if present according to the SDK. */
bool useBlendShapeTangents { false }; bool useBlendShapeTangents{false};
/** When to compute vertex normals from geometry. */ /** When to compute vertex normals from geometry. */
ComputeNormalsOption computeNormals = ComputeNormalsOption::BROKEN; ComputeNormalsOption computeNormals = ComputeNormalsOption::BROKEN;
/** When to use 32-bit indices. */ /** When to use 32-bit indices. */