Switch references to HFM to the HFM lib and remove HFM classes in FBX

assignment-client/CMakeLists.txt

@@ -11,7 +11,7 @@ setup_memory_debugger()
 
 # link in the shared libraries
 link_hifi_libraries(
-  audio avatars octree gpu graphics fbx entities
+  audio avatars octree gpu graphics fbx hfm entities
   networking animation recording shared script-engine embedded-webserver
   controllers physics plugins midi image
 )

libraries/animation/CMakeLists.txt

@@ -3,5 +3,6 @@ setup_hifi_library(Network Script)
 link_hifi_libraries(shared graphics fbx)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(gpu)
+include_hifi_library_headers(hfm)
 
 target_nsight()

libraries/avatars-renderer/CMakeLists.txt

@@ -3,6 +3,7 @@ setup_hifi_library(Network Script)
 link_hifi_libraries(shared shaders gpu graphics animation model-networking script-engine render render-utils image trackers entities-renderer)
 include_hifi_library_headers(avatars)
 include_hifi_library_headers(networking)
+include_hifi_library_headers(hfm)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(recording)
 include_hifi_library_headers(ktx)

libraries/baking/CMakeLists.txt

@@ -3,6 +3,7 @@ setup_hifi_library(Concurrent)
 
 link_hifi_libraries(shared graphics networking ktx image fbx)
 include_hifi_library_headers(gpu)
+include_hifi_library_headers(hfm)
 
 add_dependency_external_projects(draco)
 find_package(Draco REQUIRED)

libraries/baking/src/ModelBaker.h

@@ -25,6 +25,7 @@
 #include <gpu/Texture.h> 
 
 #include <FBX.h>
+#include <HFM.h>
 
 using TextureBakerThreadGetter = std::function<QThread*()>;
 using GetMaterialIDCallback = std::function <int(int)>;

libraries/display-plugins/CMakeLists.txt

@@ -5,6 +5,7 @@ include_hifi_library_headers(gpu)
 include_hifi_library_headers(model-networking)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(graphics)
+include_hifi_library_headers(hfm)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(image)
 include_hifi_library_headers(ktx)

libraries/entities-renderer/CMakeLists.txt

@@ -8,6 +8,7 @@ include_hifi_library_headers(octree)
 include_hifi_library_headers(audio)
 include_hifi_library_headers(physics)
 include_hifi_library_headers(animation)
+include_hifi_library_headers(hfm)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(entities)
 include_hifi_library_headers(avatars)

libraries/entities/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
 include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
+include_hifi_library_headers(hfm)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(image)

libraries/fbx/CMakeLists.txt

@@ -3,5 +3,6 @@ setup_hifi_library()
 
 link_hifi_libraries(shared graphics networking image)
 include_hifi_library_headers(gpu image)
+include_hifi_library_headers(hfm)
 
 target_draco()

libraries/fbx/src/FBX.h

@@ -13,20 +13,11 @@
 #define hifi_FBX_h_
 
 #include <QMetaType>
-#include <QSet>
-#include <QUrl>
 #include <QVarLengthArray>
 #include <QVariant>
 #include <QVector>
 
 #include <glm/glm.hpp>
-#include <glm/gtc/quaternion.hpp>
-
-#include <Extents.h>
-#include <Transform.h>
-
-#include <graphics/Geometry.h>
-#include <graphics/Material.h>
 
 #if defined(Q_OS_ANDROID)
 #define FBX_PACK_NORMALS 0
@@ -69,306 +60,4 @@ public:
     FBXNodeList children;
 };
 
-
-/// A single blendshape.
-class HFMBlendshape {
-public:
-    QVector<int> indices;
-    QVector<glm::vec3> vertices;
-    QVector<glm::vec3> normals;
-    QVector<glm::vec3> tangents;
-};
-
-struct HFMJointShapeInfo {
-    // same units and frame as HFMJoint.translation
-    glm::vec3 avgPoint;
-    std::vector<float> dots;
-    std::vector<glm::vec3> points;
-    std::vector<glm::vec3> debugLines;
-};
-
-/// A single joint (transformation node).
-class HFMJoint {
-public:
-
-    HFMJointShapeInfo shapeInfo;
-    QVector<int> freeLineage;
-    bool isFree;
-    int parentIndex;
-    float distanceToParent;
-
-    // http://download.autodesk.com/us/fbx/20112/FBX_SDK_HELP/SDKRef/a00209.html
-
-    glm::vec3 translation;   // T
-    glm::mat4 preTransform;  // Roff * Rp
-    glm::quat preRotation;   // Rpre
-    glm::quat rotation;      // R
-    glm::quat postRotation;  // Rpost
-    glm::mat4 postTransform; // Rp-1 * Soff * Sp * S * Sp-1
-
-    // World = ParentWorld * T * (Roff * Rp) * Rpre * R * Rpost * (Rp-1 * Soff * Sp * S * Sp-1)
-
-    glm::mat4 transform;
-    glm::vec3 rotationMin;  // radians
-    glm::vec3 rotationMax;  // radians
-    glm::quat inverseDefaultRotation;
-    glm::quat inverseBindRotation;
-    glm::mat4 bindTransform;
-    QString name;
-    bool isSkeletonJoint;
-    bool bindTransformFoundInCluster;
-
-    // geometric offset is applied in local space but does NOT affect children.
-    bool hasGeometricOffset;
-    glm::vec3 geometricTranslation;
-    glm::quat geometricRotation;
-    glm::vec3 geometricScaling;
-};
-
-
-/// A single binding to a joint.
-class HFMCluster {
-public:
-
-    int jointIndex;
-    glm::mat4 inverseBindMatrix;
-    Transform inverseBindTransform;
-};
-
-const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
-
-/// A texture map.
-class HFMTexture {
-public:
-    QString id;
-    QString name;
-    QByteArray filename;
-    QByteArray content;
-
-    Transform transform;
-    int maxNumPixels { MAX_NUM_PIXELS_FOR_FBX_TEXTURE };
-    int texcoordSet;
-    QString texcoordSetName;
-
-    bool isBumpmap{ false };
-
-    bool isNull() const { return name.isEmpty() && filename.isEmpty() && content.isEmpty(); }
-};
-
-/// A single part of a mesh (with the same material).
-class HFMMeshPart {
-public:
-
-    QVector<int> quadIndices; // original indices from the FBX mesh
-    QVector<int> quadTrianglesIndices; // original indices from the FBX mesh of the quad converted as triangles
-    QVector<int> triangleIndices; // original indices from the FBX mesh
-
-    QString materialID;
-};
-
-class HFMMaterial {
-public:
-    HFMMaterial() {};
-    HFMMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
-         float shininess, float opacity) :
-        diffuseColor(diffuseColor),
-        specularColor(specularColor),
-        emissiveColor(emissiveColor),
-        shininess(shininess),
-        opacity(opacity)  {}
-
-    void getTextureNames(QSet<QString>& textureList) const;
-    void setMaxNumPixelsPerTexture(int maxNumPixels);
-
-    glm::vec3 diffuseColor{ 1.0f };
-    float diffuseFactor{ 1.0f };
-    glm::vec3 specularColor{ 0.02f };
-    float specularFactor{ 1.0f };
-
-    glm::vec3 emissiveColor{ 0.0f };
-    float emissiveFactor{ 0.0f };
-
-    float shininess{ 23.0f };
-    float opacity{ 1.0f };
-
-    float metallic{ 0.0f };
-    float roughness{ 1.0f };
-    float emissiveIntensity{ 1.0f };
-    float ambientFactor{ 1.0f };
-
-    float bumpMultiplier { 1.0f }; // TODO: to be implemented
-
-    QString materialID;
-    QString name;
-    QString shadingModel;
-    graphics::MaterialPointer _material;
-
-    HFMTexture normalTexture;
-    HFMTexture albedoTexture;
-    HFMTexture opacityTexture;
-    HFMTexture glossTexture;
-    HFMTexture roughnessTexture;
-    HFMTexture specularTexture;
-    HFMTexture metallicTexture;
-    HFMTexture emissiveTexture;
-    HFMTexture occlusionTexture;
-    HFMTexture scatteringTexture;
-    HFMTexture lightmapTexture;
-    glm::vec2 lightmapParams{ 0.0f, 1.0f };
-
-
-    bool isPBSMaterial{ false };
-    // THe use XXXMap are not really used to drive which map are going or not, debug only
-    bool useNormalMap{ false };
-    bool useAlbedoMap{ false };
-    bool useOpacityMap{ false };
-    bool useRoughnessMap{ false };
-    bool useSpecularMap{ false };
-    bool useMetallicMap{ false };
-    bool useEmissiveMap{ false };
-    bool useOcclusionMap{ false };
-
-    bool needTangentSpace() const;
-};
-
-/// A single mesh (with optional blendshapes).
-class HFMMesh {
-public:
-
-    QVector<HFMMeshPart> parts;
-
-    QVector<glm::vec3> vertices;
-    QVector<glm::vec3> normals;
-    QVector<glm::vec3> tangents;
-    QVector<glm::vec3> colors;
-    QVector<glm::vec2> texCoords;
-    QVector<glm::vec2> texCoords1;
-    QVector<uint16_t> clusterIndices;
-    QVector<uint16_t> clusterWeights;
-    QVector<int32_t> originalIndices;
-
-    QVector<HFMCluster> clusters;
-
-    Extents meshExtents;
-    glm::mat4 modelTransform;
-
-    QVector<HFMBlendshape> blendshapes;
-
-    unsigned int meshIndex; // the order the meshes appeared in the object file
-
-    graphics::MeshPointer _mesh;
-    bool wasCompressed { false };
-
-    void createMeshTangents(bool generateFromTexCoords);
-    void createBlendShapeTangents(bool generateTangents);
-};
-
-class ExtractedMesh {
-public:
-    HFMMesh mesh;
-    QMultiHash<int, int> newIndices;
-    QVector<QHash<int, int> > blendshapeIndexMaps;
-    QVector<QPair<int, int> > partMaterialTextures;
-    QHash<QString, size_t> texcoordSetMap;
-};
-
-/**jsdoc
- * @typedef {object} FBXAnimationFrame
- * @property {Quat[]} rotations
- * @property {Vec3[]} translations
- */
-/// A single animation frame.
-class HFMAnimationFrame {
-public:
-    QVector<glm::quat> rotations;
-    QVector<glm::vec3> translations;
-};
-
-/// A light.
-class HFMLight {
-public:
-    QString name;
-    Transform transform;
-    float intensity;
-    float fogValue;
-    glm::vec3 color;
-
-    HFMLight() :
-        name(),
-        transform(),
-        intensity(1.0f),
-        fogValue(0.0f),
-        color(1.0f)
-    {}
-};
-
-Q_DECLARE_METATYPE(HFMAnimationFrame)
-Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
-
-/// The runtime model format.
-class HFMModel {
-public:
-    using Pointer = std::shared_ptr<HFMModel>;
-
-    QString originalURL;
-    QString author;
-    QString applicationName; ///< the name of the application that generated the model
-
-    QVector<HFMJoint> joints;
-    QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
-    bool hasSkeletonJoints;
-
-    QVector<HFMMesh> meshes;
-    QVector<QString> scripts;
-
-    QHash<QString, HFMMaterial> materials;
-
-    glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file
-
-    int leftEyeJointIndex = -1;
-    int rightEyeJointIndex = -1;
-    int neckJointIndex = -1;
-    int rootJointIndex = -1;
-    int leanJointIndex = -1;
-    int headJointIndex = -1;
-    int leftHandJointIndex = -1;
-    int rightHandJointIndex = -1;
-    int leftToeJointIndex = -1;
-    int rightToeJointIndex = -1;
-
-    float leftEyeSize = 0.0f;  // Maximum mesh extents dimension
-    float rightEyeSize = 0.0f;
-
-    QVector<int> humanIKJointIndices;
-
-    glm::vec3 palmDirection;
-
-    glm::vec3 neckPivot;
-
-    Extents bindExtents;
-    Extents meshExtents;
-
-    QVector<HFMAnimationFrame> animationFrames;
-
-    int getJointIndex(const QString& name) const { return jointIndices.value(name) - 1; }
-    QStringList getJointNames() const;
-
-    bool hasBlendedMeshes() const;
-
-    /// Returns the unscaled extents of the model's mesh
-    Extents getUnscaledMeshExtents() const;
-
-    bool convexHullContains(const glm::vec3& point) const;
-
-    QHash<int, QString> meshIndicesToModelNames;
-
-    /// given a meshIndex this will return the name of the model that mesh belongs to if known
-    QString getModelNameOfMesh(int meshIndex) const;
-
-    QList<QString> blendshapeChannelNames;
-};
-
-Q_DECLARE_METATYPE(HFMModel)
-Q_DECLARE_METATYPE(HFMModel::Pointer)
-
 #endif // hifi_FBX_h_

libraries/fbx/src/FBXReader.h

@@ -12,8 +12,6 @@
 #ifndef hifi_FBXReader_h
 #define hifi_FBXReader_h
 
-#include "FBX.h"
-
 #include <QtGlobal>
 #include <QMetaType>
 #include <QSet>
@@ -28,6 +26,9 @@
 #include <Extents.h>
 #include <Transform.h>
 
+#include "FBX.h"
+#include <HFM.h>
+
 #include <graphics/Geometry.h>
 #include <graphics/Material.h>
 

libraries/model-networking/CMakeLists.txt

@@ -2,3 +2,4 @@ set(TARGET_NAME model-networking)
 setup_hifi_library()
 link_hifi_libraries(shared shaders networking graphics fbx ktx image gl)
 include_hifi_library_headers(gpu)
+include_hifi_library_headers(hfm)

libraries/render-utils/CMakeLists.txt

@@ -7,6 +7,7 @@ link_hifi_libraries(shared task ktx gpu shaders graphics graphics-scripting mode
 include_hifi_library_headers(audio)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)
+include_hifi_library_headers(hfm)
 
 # tell CMake to exclude qrc_fonts.cpp for policy CMP0071
 set_property(SOURCE qrc_fonts.cpp PROPERTY SKIP_AUTOMOC ON)

libraries/script-engine/CMakeLists.txt

@@ -20,3 +20,4 @@ endif ()
 link_hifi_libraries(shared networking octree shaders gpu procedural graphics model-networking ktx recording avatars fbx entities controllers animation audio physics image midi)
 # ui includes gl, but link_hifi_libraries does not use transitive includes, so gl must be explicit
 include_hifi_library_headers(gl)
+include_hifi_library_headers(hfm)

plugins/openvr/CMakeLists.txt

@@ -13,7 +13,7 @@ if (WIN32 AND (NOT USE_GLES))
     setup_hifi_plugin(Gui Qml Multimedia)
     link_hifi_libraries(shared task gl qml networking controllers ui 
         plugins display-plugins ui-plugins input-plugins script-engine
-        audio-client render-utils graphics shaders gpu render model-networking fbx ktx image procedural ${PLATFORM_GL_BACKEND})
+        audio-client render-utils graphics shaders gpu render model-networking hfm fbx ktx image procedural ${PLATFORM_GL_BACKEND})
 
     include_hifi_library_headers(octree)
 

tests-manual/gpu/CMakeLists.txt

@@ -6,7 +6,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 link_hifi_libraries(
     shared task networking gl 
     ktx shaders gpu procedural octree image 
-    graphics model-networking fbx animation 
+    graphics model-networking fbx hfm animation 
     script-engine render render-utils 
     ${PLATFORM_GL_BACKEND}
 )

tests-manual/render-perf/CMakeLists.txt

@@ -17,7 +17,7 @@ link_hifi_libraries(
     ktx image octree 
     shaders gl gpu ${PLATFORM_GL_BACKEND}
     render render-utils 
-    graphics fbx model-networking graphics-scripting
+    graphics hfm fbx model-networking graphics-scripting
     entities entities-renderer audio avatars script-engine 
     physics procedural midi qml ui
     ${PLATFORM_GL_BACKEND}

tests-manual/render-texture-load/CMakeLists.txt

@@ -15,7 +15,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 link_hifi_libraries(
     shared task networking octree 
     shaders gl gpu render ktx image animation 
-    graphics fbx model-networking 
+    graphics hfm fbx model-networking 
     render-utils 
     entities entities-renderer audio avatars 
     script-engine physics 

tools/oven/CMakeLists.txt

@@ -2,7 +2,7 @@ set(TARGET_NAME oven)
 
 setup_hifi_project(Widgets Gui Concurrent)
 
-link_hifi_libraries(networking shared image gpu ktx fbx baking graphics)
+link_hifi_libraries(networking shared image gpu ktx fbx hfm baking graphics)
 
 setup_memory_debugger()
 

tools/skeleton-dump/CMakeLists.txt

@@ -1,5 +1,4 @@
 set(TARGET_NAME skeleton-dump)
 setup_hifi_project(Core)
 setup_memory_debugger()
-link_hifi_libraries(shared fbx graphics gpu gl animation)
-
+link_hifi_libraries(shared fbx hfm graphics gpu gl animation)

tools/vhacd-util/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME vhacd-util)
 setup_hifi_project(Core)
-link_hifi_libraries(shared fbx graphics gpu gl)
+link_hifi_libraries(shared fbx hfm graphics gpu gl)
 
 add_dependency_external_projects(vhacd)