From 387f5df782cc3ddbda7da661555391f2d27608c2 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Sun, 7 Apr 2019 17:23:32 -0700 Subject: [PATCH] Whitespace tweak. --- src/FBX2glTF.h | 110 ++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/src/FBX2glTF.h b/src/FBX2glTF.h index 1d19e00..9205651 100644 --- a/src/FBX2glTF.h +++ b/src/FBX2glTF.h @@ -12,7 +12,7 @@ #include #include -#if defined ( _WIN32 ) +#if defined(_WIN32) // Tell Windows not to define min() and max() macros #define NOMINMAX #include @@ -20,10 +20,10 @@ #define FBX2GLTF_VERSION std::string("0.9.6") -#include #include +#include -#if defined ( _WIN32 ) +#if defined(_WIN32) // this is defined in fbxmath.h #undef isnan #endif @@ -31,10 +31,10 @@ #include "mathfu.hpp" // give all modules access to our tweaked JSON -#include #include +#include -template +template using workaround_fifo_map = nlohmann::fifo_map, A>; using json = nlohmann::basic_json; @@ -51,66 +51,66 @@ 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 { - 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 - MISSING, // if a mesh lacks normals, compute them all - ALWAYS // compute a new normal for every vertex, obliterating whatever may have been there before + 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 + MISSING, // if a mesh lacks normals, compute them all + ALWAYS // compute a new normal for every vertex, obliterating whatever may have been there before }; enum class UseLongIndicesOptions { - NEVER, // only ever use 16-bit indices - AUTO, // use shorts or longs depending on vertex count - ALWAYS, // only ever use 32-bit indices + NEVER, // only ever use 16-bit indices + AUTO, // use shorts or longs depending on vertex count + ALWAYS, // only ever use 32-bit indices }; /** -* User-supplied options that dictate the nature of the glTF being generated. -*/ -struct GltfOptions -{ - /** - * If negative, disabled. Otherwise, a bitfield of RawVertexAttributes that - * 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 - * attributes to keep are inferred from which textures are supplied. - */ - int keepAttribs { -1 }; - /** Whether to output a .glb file, the binary format of glTF. */ - bool outputBinary { false }; - /** If non-binary, whether to inline all resources, for a single (large) .glTF file. */ - bool embedResources { false }; + * User-supplied options that dictate the nature of the glTF being generated. + */ +struct GltfOptions { + /** + * If negative, disabled. Otherwise, a bitfield of RawVertexAttributes that + * 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 + * attributes to keep are inferred from which textures are supplied. + */ + int keepAttribs{-1}; + /** Whether to output a .glb file, the binary format of glTF. */ + bool outputBinary{false}; + /** If non-binary, whether to inline all resources, for a single (large) .glTF file. */ + bool embedResources{false}; - /** Whether and how to use KHR_draco_mesh_compression to minimize static geometry size. */ - struct { - bool enabled = false; - int compressionLevel = 7; - int quantBitsPosition = 14; - int quantBitsTexCoord = 10; - int quantBitsNormal = 10; - int quantBitsColor = 8; - int quantBitsGeneric = 8; - } draco; + /** Whether and how to use KHR_draco_mesh_compression to minimize static geometry size. */ + struct { + bool enabled = false; + int compressionLevel = 7; + int quantBitsPosition = 14; + int quantBitsTexCoord = 10; + int quantBitsNormal = 10; + int quantBitsColor = 8; + int quantBitsGeneric = 8; + } draco; - /** Whether to include FBX User Properties as 'extras' metadata in glTF nodes. */ - bool enableUserProperties { false }; + /** Whether to include FBX User Properties as 'extras' metadata in glTF nodes. */ + bool enableUserProperties{false}; - /** Whether to use KHR_materials_unlit to extend materials definitions. */ - bool useKHRMatUnlit { false }; - /** Whether to populate the pbrMetallicRoughness substruct in materials. */ - bool usePBRMetRough { false }; + /** Whether to use KHR_materials_unlit to extend materials definitions. */ + bool useKHRMatUnlit{false}; + /** Whether to populate the pbrMetallicRoughness substruct in materials. */ + bool usePBRMetRough{false}; - /** Whether to include lights through the KHR_punctual_lights extension. */ - bool useKHRLightsPunctual { true }; + /** Whether to include lights through the KHR_punctual_lights extension. */ + bool useKHRLightsPunctual{true}; - /** Whether to include blend shape normals, if present according to the SDK. */ - bool useBlendShapeNormals { false }; - /** Whether to include blend shape tangents, if present according to the SDK. */ - bool useBlendShapeTangents { false }; - /** When to compute vertex normals from geometry. */ - ComputeNormalsOption computeNormals = ComputeNormalsOption::BROKEN; - /** When to use 32-bit indices. */ - UseLongIndicesOptions useLongIndices = UseLongIndicesOptions::AUTO; + /** Whether to include blend shape normals, if present according to the SDK. */ + bool useBlendShapeNormals{false}; + /** Whether to include blend shape tangents, if present according to the SDK. */ + bool useBlendShapeTangents{false}; + /** When to compute vertex normals from geometry. */ + ComputeNormalsOption computeNormals = ComputeNormalsOption::BROKEN; + /** When to use 32-bit indices. */ + UseLongIndicesOptions useLongIndices = UseLongIndicesOptions::AUTO; };