From e00024e8b06809f144e2512c3b26274860f6db9a Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Fri, 2 Nov 2018 11:34:14 -0700
Subject: [PATCH 01/12] Create HFM library

---
 interface/CMakeLists.txt     |   2 +-
 libraries/hfm/CMakeLists.txt |   7 +
 libraries/hfm/src/HFM.h      | 329 +++++++++++++++++++++++++++++++++++
 3 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 libraries/hfm/CMakeLists.txt
 create mode 100644 libraries/hfm/src/HFM.h

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index cc9fe8ef4c..5b941ae5f7 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -208,7 +208,7 @@ endif()
 link_hifi_libraries(
   shared workload task octree ktx gpu gl procedural graphics graphics-scripting render
   pointers
-  recording fbx networking model-networking entities avatars trackers
+  recording hfm fbx networking model-networking entities avatars trackers
   audio audio-client animation script-engine physics
   render-utils entities-renderer avatars-renderer ui qml auto-updater midi
   controllers plugins image trackers
diff --git a/libraries/hfm/CMakeLists.txt b/libraries/hfm/CMakeLists.txt
new file mode 100644
index 0000000000..d569688a26
--- /dev/null
+++ b/libraries/hfm/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(TARGET_NAME hfm)
+setup_hifi_library()
+
+include_hifi_library_headers(graphics)
+include_hifi_library_headers(shared)
+
+target_draco()
diff --git a/libraries/hfm/src/HFM.h b/libraries/hfm/src/HFM.h
new file mode 100644
index 0000000000..469369ef62
--- /dev/null
+++ b/libraries/hfm/src/HFM.h
@@ -0,0 +1,329 @@
+//
+//  HFM.h
+//  libraries/hfm/src
+//
+//  Created by Sabrina Shanman on 2018/11/02.
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_HFM_h_
+#define hifi_HFM_h_
+
+#include <QMetaType>
+#include <QSet>
+#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>
+
+/// 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_HFM_h_

From 2801f324b77a32179ca50b67ef18e5a44fdda104 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Fri, 2 Nov 2018 16:05:34 -0700
Subject: [PATCH 02/12] Switch references to HFM to the HFM lib and remove HFM
 classes in FBX

---
 assignment-client/CMakeLists.txt              |   2 +-
 libraries/animation/CMakeLists.txt            |   1 +
 libraries/avatars-renderer/CMakeLists.txt     |   1 +
 libraries/baking/CMakeLists.txt               |   1 +
 libraries/baking/src/ModelBaker.h             |   1 +
 libraries/display-plugins/CMakeLists.txt      |   1 +
 libraries/entities-renderer/CMakeLists.txt    |   1 +
 libraries/entities/CMakeLists.txt             |   1 +
 libraries/fbx/CMakeLists.txt                  |   1 +
 libraries/fbx/src/FBX.h                       | 311 ------------------
 libraries/fbx/src/FBXReader.h                 |   5 +-
 libraries/model-networking/CMakeLists.txt     |   1 +
 libraries/render-utils/CMakeLists.txt         |   1 +
 libraries/script-engine/CMakeLists.txt        |   1 +
 plugins/openvr/CMakeLists.txt                 |   2 +-
 tests-manual/gpu/CMakeLists.txt               |   2 +-
 tests-manual/render-perf/CMakeLists.txt       |   2 +-
 .../render-texture-load/CMakeLists.txt        |   2 +-
 tools/oven/CMakeLists.txt                     |   2 +-
 tools/skeleton-dump/CMakeLists.txt            |   3 +-
 tools/vhacd-util/CMakeLists.txt               |   2 +-
 21 files changed, 22 insertions(+), 322 deletions(-)

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index c73e8e1d34..1500d7b98e 100644
--- a/assignment-client/CMakeLists.txt
+++ b/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
 )
diff --git a/libraries/animation/CMakeLists.txt b/libraries/animation/CMakeLists.txt
index 1ec6194afd..30addadcaa 100644
--- a/libraries/animation/CMakeLists.txt
+++ b/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()
diff --git a/libraries/avatars-renderer/CMakeLists.txt b/libraries/avatars-renderer/CMakeLists.txt
index 89dcc61805..06a3804ece 100644
--- a/libraries/avatars-renderer/CMakeLists.txt
+++ b/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)
diff --git a/libraries/baking/CMakeLists.txt b/libraries/baking/CMakeLists.txt
index ec7caf574b..3db7f6cbf3 100644
--- a/libraries/baking/CMakeLists.txt
+++ b/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)
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index cda4478b1d..d34f32c175 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/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)>;
diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt
index 0674c9fd92..8e966ed9ea 100644
--- a/libraries/display-plugins/CMakeLists.txt
+++ b/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)
diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index cf887bfeff..b08856e8a8 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/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)
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index c547708ffa..c51ae28d5f 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/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)
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index e422af3629..81e5115ba7 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/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()
diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index 84caa98ace..90de82e310 100644
--- a/libraries/fbx/src/FBX.h
+++ b/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_
diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index d9a216eeb8..2af7190b27 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/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>
 
diff --git a/libraries/model-networking/CMakeLists.txt b/libraries/model-networking/CMakeLists.txt
index 12181651db..0fca6fa3d1 100644
--- a/libraries/model-networking/CMakeLists.txt
+++ b/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)
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index eaa3b4dbf5..2b092bff2a 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/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)
diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 588377c072..0d657ed20a 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/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)
diff --git a/plugins/openvr/CMakeLists.txt b/plugins/openvr/CMakeLists.txt
index eea08e66d5..67a728b60a 100644
--- a/plugins/openvr/CMakeLists.txt
+++ b/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)
 
diff --git a/tests-manual/gpu/CMakeLists.txt b/tests-manual/gpu/CMakeLists.txt
index 8fd0316c05..2b04bdc3f2 100644
--- a/tests-manual/gpu/CMakeLists.txt
+++ b/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}
 )
diff --git a/tests-manual/render-perf/CMakeLists.txt b/tests-manual/render-perf/CMakeLists.txt
index 0cc3f87bd9..9e7d826d03 100644
--- a/tests-manual/render-perf/CMakeLists.txt
+++ b/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}
diff --git a/tests-manual/render-texture-load/CMakeLists.txt b/tests-manual/render-texture-load/CMakeLists.txt
index 36526ecd42..af6c5b44b5 100644
--- a/tests-manual/render-texture-load/CMakeLists.txt
+++ b/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 
diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt
index 1b77a2585f..022c9769fe 100644
--- a/tools/oven/CMakeLists.txt
+++ b/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()
 
diff --git a/tools/skeleton-dump/CMakeLists.txt b/tools/skeleton-dump/CMakeLists.txt
index d0a6475c59..baec1d163b 100644
--- a/tools/skeleton-dump/CMakeLists.txt
+++ b/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)
diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt
index 5ba8b7d971..aa6642c610 100644
--- a/tools/vhacd-util/CMakeLists.txt
+++ b/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)
 

From a98a9b1c0c0fa798c58675de718951e7707b81d9 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Fri, 2 Nov 2018 16:56:43 -0700
Subject: [PATCH 03/12] Move HFM prefixed classes to hfm namespace and add HFM
 prefixed names as typedefs

---
 interface/src/ModelPackager.h  |   4 +-
 libraries/hfm/src/HFM.h        | 130 ++++++++++++++++++++-------------
 tests-manual/gpu/src/TestFbx.h |   2 -
 3 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/interface/src/ModelPackager.h b/interface/src/ModelPackager.h
index ed86f15008..1c47252f15 100644
--- a/interface/src/ModelPackager.h
+++ b/interface/src/ModelPackager.h
@@ -17,9 +17,9 @@
 #include <QFileInfo>
 #include <QVariantHash>
 
-#include "ui/ModelsBrowser.h"
+#include <HFM.h>
 
-class HFMModel;
+#include "ui/ModelsBrowser.h"
 
 class ModelPackager : public QObject {
 public:
diff --git a/libraries/hfm/src/HFM.h b/libraries/hfm/src/HFM.h
index 469369ef62..8aeba04131 100644
--- a/libraries/hfm/src/HFM.h
+++ b/libraries/hfm/src/HFM.h
@@ -25,8 +25,39 @@
 #include <graphics/Geometry.h>
 #include <graphics/Material.h>
 
+// High Fidelity Model namespace
+namespace hfm {
+    class Blendshape;
+    struct JointShapeInfo;
+    class Joint;
+    class Cluster;
+    class Texture;
+    class MeshPart;
+    class Material;
+    class Mesh;
+    class AnimationFrame;
+    class Light;
+    class Model;
+};
+
+typedef hfm::Blendshape HFMBlendshape;
+typedef hfm::JointShapeInfo HFMJointShapeInfo;
+typedef hfm::Joint HFMJoint;
+typedef hfm::Cluster HFMCluster;
+typedef hfm::Texture HFMTexture;
+typedef hfm::MeshPart HFMMeshPart;
+typedef hfm::Material HFMMaterial;
+typedef hfm::Mesh HFMMesh;
+typedef hfm::AnimationFrame HFMAnimationFrame;
+typedef hfm::Light HFMLight;
+typedef hfm::Model HFMModel;
+
+const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
+
+namespace hfm {
+
 /// A single blendshape.
-class HFMBlendshape {
+class Blendshape {
 public:
     QVector<int> indices;
     QVector<glm::vec3> vertices;
@@ -34,7 +65,7 @@ public:
     QVector<glm::vec3> tangents;
 };
 
-struct HFMJointShapeInfo {
+struct JointShapeInfo {
     // same units and frame as HFMJoint.translation
     glm::vec3 avgPoint;
     std::vector<float> dots;
@@ -43,10 +74,9 @@ struct HFMJointShapeInfo {
 };
 
 /// A single joint (transformation node).
-class HFMJoint {
+class Joint {
 public:
-
-    HFMJointShapeInfo shapeInfo;
+    JointShapeInfo shapeInfo;
     QVector<int> freeLineage;
     bool isFree;
     int parentIndex;
@@ -82,7 +112,7 @@ public:
 
 
 /// A single binding to a joint.
-class HFMCluster {
+class Cluster {
 public:
 
     int jointIndex;
@@ -90,10 +120,8 @@ public:
     Transform inverseBindTransform;
 };
 
-const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
-
 /// A texture map.
-class HFMTexture {
+class Texture {
 public:
     QString id;
     QString name;
@@ -111,7 +139,7 @@ public:
 };
 
 /// A single part of a mesh (with the same material).
-class HFMMeshPart {
+class MeshPart {
 public:
 
     QVector<int> quadIndices; // original indices from the FBX mesh
@@ -121,10 +149,10 @@ public:
     QString materialID;
 };
 
-class HFMMaterial {
+class Material {
 public:
-    HFMMaterial() {};
-    HFMMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
+    Material() {};
+    Material(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
          float shininess, float opacity) :
         diffuseColor(diffuseColor),
         specularColor(specularColor),
@@ -158,17 +186,17 @@ public:
     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;
+    Texture normalTexture;
+    Texture albedoTexture;
+    Texture opacityTexture;
+    Texture glossTexture;
+    Texture roughnessTexture;
+    Texture specularTexture;
+    Texture metallicTexture;
+    Texture emissiveTexture;
+    Texture occlusionTexture;
+    Texture scatteringTexture;
+    Texture lightmapTexture;
     glm::vec2 lightmapParams{ 0.0f, 1.0f };
 
 
@@ -187,10 +215,10 @@ public:
 };
 
 /// A single mesh (with optional blendshapes).
-class HFMMesh {
+class Mesh {
 public:
 
-    QVector<HFMMeshPart> parts;
+    QVector<MeshPart> parts;
 
     QVector<glm::vec3> vertices;
     QVector<glm::vec3> normals;
@@ -202,12 +230,12 @@ public:
     QVector<uint16_t> clusterWeights;
     QVector<int32_t> originalIndices;
 
-    QVector<HFMCluster> clusters;
+    QVector<Cluster> clusters;
 
     Extents meshExtents;
     glm::mat4 modelTransform;
 
-    QVector<HFMBlendshape> blendshapes;
+    QVector<Blendshape> blendshapes;
 
     unsigned int meshIndex; // the order the meshes appeared in the object file
 
@@ -218,29 +246,23 @@ public:
     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 {
+class AnimationFrame {
 public:
     QVector<glm::quat> rotations;
     QVector<glm::vec3> translations;
 };
 
+Q_DECLARE_METATYPE(AnimationFrame)
+Q_DECLARE_METATYPE(QVector<AnimationFrame>)
+
 /// A light.
-class HFMLight {
+class Light {
 public:
     QString name;
     Transform transform;
@@ -248,7 +270,7 @@ public:
     float fogValue;
     glm::vec3 color;
 
-    HFMLight() :
+    Light() :
         name(),
         transform(),
         intensity(1.0f),
@@ -257,13 +279,10 @@ public:
     {}
 };
 
-Q_DECLARE_METATYPE(HFMAnimationFrame)
-Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
-
 /// The runtime model format.
-class HFMModel {
+class Model {
 public:
-    using Pointer = std::shared_ptr<HFMModel>;
+    using Pointer = std::shared_ptr<Model>;
 
     QString originalURL;
     QString author;
@@ -273,10 +292,10 @@ public:
     QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
     bool hasSkeletonJoints;
 
-    QVector<HFMMesh> meshes;
+    QVector<Mesh> meshes;
     QVector<QString> scripts;
 
-    QHash<QString, HFMMaterial> materials;
+    QHash<QString, Material> materials;
 
     glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file
 
@@ -303,7 +322,7 @@ public:
     Extents bindExtents;
     Extents meshExtents;
 
-    QVector<HFMAnimationFrame> animationFrames;
+    QVector<AnimationFrame> animationFrames;
 
     int getJointIndex(const QString& name) const { return jointIndices.value(name) - 1; }
     QStringList getJointNames() const;
@@ -323,7 +342,18 @@ public:
     QList<QString> blendshapeChannelNames;
 };
 
-Q_DECLARE_METATYPE(HFMModel)
-Q_DECLARE_METATYPE(HFMModel::Pointer)
+Q_DECLARE_METATYPE(Model)
+Q_DECLARE_METATYPE(Model::Pointer)
+
+};
+
+class ExtractedMesh {
+public:
+    hfm::Mesh mesh;
+    QMultiHash<int, int> newIndices;
+    QVector<QHash<int, int> > blendshapeIndexMaps;
+    QVector<QPair<int, int> > partMaterialTextures;
+    QHash<QString, size_t> texcoordSetMap;
+};
 
 #endif // hifi_HFM_h_
diff --git a/tests-manual/gpu/src/TestFbx.h b/tests-manual/gpu/src/TestFbx.h
index 8056af21ec..9ca2c67c3b 100644
--- a/tests-manual/gpu/src/TestFbx.h
+++ b/tests-manual/gpu/src/TestFbx.h
@@ -11,8 +11,6 @@
 
 #include <render/ShapePipeline.h>
 
-class HFMModel;
-
 class TestFbx : public GpuTestBase {
     size_t _partCount { 0 };
     graphics::Material _material;

From c85b809e0497641949ea82aa9ae6e8bb7a36aea1 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Mon, 5 Nov 2018 13:40:38 -0800
Subject: [PATCH 04/12] Fix Qt metatypes breaking by moving them back out of
 the hfm namespace

---
 libraries/hfm/src/HFM.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/hfm/src/HFM.h b/libraries/hfm/src/HFM.h
index 8aeba04131..dd5250ca83 100644
--- a/libraries/hfm/src/HFM.h
+++ b/libraries/hfm/src/HFM.h
@@ -258,9 +258,6 @@ public:
     QVector<glm::vec3> translations;
 };
 
-Q_DECLARE_METATYPE(AnimationFrame)
-Q_DECLARE_METATYPE(QVector<AnimationFrame>)
-
 /// A light.
 class Light {
 public:
@@ -342,9 +339,6 @@ public:
     QList<QString> blendshapeChannelNames;
 };
 
-Q_DECLARE_METATYPE(Model)
-Q_DECLARE_METATYPE(Model::Pointer)
-
 };
 
 class ExtractedMesh {
@@ -356,4 +350,10 @@ public:
     QHash<QString, size_t> texcoordSetMap;
 };
 
+Q_DECLARE_METATYPE(HFMAnimationFrame)
+Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
+
+Q_DECLARE_METATYPE(HFMModel)
+Q_DECLARE_METATYPE(HFMModel::Pointer)
+
 #endif // hifi_HFM_h_

From 1a69afb3e86e2d82bdc3a1ad894e96ac683c8b28 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 6 Nov 2018 11:43:19 -0800
Subject: [PATCH 05/12] Move HFM.h to hfm subfolder per convention

---
 interface/src/ModelPackager.h     | 2 +-
 libraries/baking/src/ModelBaker.h | 2 +-
 libraries/fbx/src/FBXReader.h     | 2 +-
 libraries/hfm/src/{ => hfm}/HFM.h | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename libraries/hfm/src/{ => hfm}/HFM.h (100%)

diff --git a/interface/src/ModelPackager.h b/interface/src/ModelPackager.h
index 1c47252f15..bc42bc1fda 100644
--- a/interface/src/ModelPackager.h
+++ b/interface/src/ModelPackager.h
@@ -17,7 +17,7 @@
 #include <QFileInfo>
 #include <QVariantHash>
 
-#include <HFM.h>
+#include <hfm/HFM.h>
 
 #include "ui/ModelsBrowser.h"
 
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index d34f32c175..14a182f622 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/libraries/baking/src/ModelBaker.h
@@ -25,7 +25,7 @@
 #include <gpu/Texture.h> 
 
 #include <FBX.h>
-#include <HFM.h>
+#include <hfm/HFM.h>
 
 using TextureBakerThreadGetter = std::function<QThread*()>;
 using GetMaterialIDCallback = std::function <int(int)>;
diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index 2af7190b27..c74b4dc8ac 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/libraries/fbx/src/FBXReader.h
@@ -27,7 +27,7 @@
 #include <Transform.h>
 
 #include "FBX.h"
-#include <HFM.h>
+#include <hfm/HFM.h>
 
 #include <graphics/Geometry.h>
 #include <graphics/Material.h>
diff --git a/libraries/hfm/src/HFM.h b/libraries/hfm/src/hfm/HFM.h
similarity index 100%
rename from libraries/hfm/src/HFM.h
rename to libraries/hfm/src/hfm/HFM.h

From 8fa72396efeb8d617fdbe220b9c60d915b042f3c Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 6 Nov 2018 11:44:31 -0800
Subject: [PATCH 06/12] Consolidate HFM class implementations into source file
 and move model logging.

---
 libraries/fbx/CMakeLists.txt                  |   3 +-
 libraries/fbx/src/FBXReader.cpp               | 200 +-------------
 libraries/fbx/src/FBXReader_Material.cpp      |  56 +---
 libraries/fbx/src/FBXReader_Mesh.cpp          |   2 +-
 libraries/fbx/src/FBXReader_Node.cpp          |   2 +-
 libraries/fbx/src/GLTFReader.h                |   2 +-
 libraries/fbx/src/OBJReader.cpp               |   2 +-
 libraries/fbx/src/OBJWriter.cpp               |   2 +-
 libraries/hfm/CMakeLists.txt                  |   1 +
 libraries/hfm/src/hfm/HFM.cpp                 | 259 ++++++++++++++++++
 libraries/hfm/src/hfm/HFM.h                   |   1 -
 .../src/hfm}/ModelFormatLogging.cpp           |   2 +-
 .../src => hfm/src/hfm}/ModelFormatLogging.h  |   2 +-
 13 files changed, 270 insertions(+), 264 deletions(-)
 create mode 100644 libraries/hfm/src/hfm/HFM.cpp
 rename libraries/{fbx/src => hfm/src/hfm}/ModelFormatLogging.cpp (94%)
 rename libraries/{fbx/src => hfm/src/hfm}/ModelFormatLogging.h (95%)

diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index 81e5115ba7..2006d23c60 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -1,8 +1,7 @@
 set(TARGET_NAME fbx)
 setup_hifi_library()
 
-link_hifi_libraries(shared graphics networking image)
+link_hifi_libraries(shared graphics networking image hfm)
 include_hifi_library_headers(gpu image)
-include_hifi_library_headers(hfm)
 
 target_draco()
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 2cf57e54b4..cea3d079bc 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -33,109 +33,13 @@
 #include <gpu/Format.h>
 #include <LogHandler.h>
 
-#include "ModelFormatLogging.h"
+#include <hfm/ModelFormatLogging.h>
 
 // TOOL: Uncomment the following line to enable the filtering of all the unkwnon fields of a node so we can break point easily while loading a model with problems...
 //#define DEBUG_FBXREADER
 
 using namespace std;
 
-int HFMModelPointerMetaTypeId = qRegisterMetaType<HFMModel::Pointer>();
-
-QStringList HFMModel::getJointNames() const {
-    QStringList names;
-    foreach (const HFMJoint& joint, joints) {
-        names.append(joint.name);
-    }
-    return names;
-}
-
-bool HFMModel::hasBlendedMeshes() const {
-    if (!meshes.isEmpty()) {
-        foreach (const HFMMesh& mesh, meshes) {
-            if (!mesh.blendshapes.isEmpty()) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-Extents HFMModel::getUnscaledMeshExtents() const {
-    const Extents& extents = meshExtents;
-
-    // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
-    // is captured in the offset matrix
-    glm::vec3 minimum = glm::vec3(offset * glm::vec4(extents.minimum, 1.0f));
-    glm::vec3 maximum = glm::vec3(offset * glm::vec4(extents.maximum, 1.0f));
-    Extents scaledExtents = { minimum, maximum };
-
-    return scaledExtents;
-}
-
-// TODO: Move to graphics::Mesh when Sam's ready
-bool HFMModel::convexHullContains(const glm::vec3& point) const {
-    if (!getUnscaledMeshExtents().containsPoint(point)) {
-        return false;
-    }
-
-    auto checkEachPrimitive = [=](HFMMesh& mesh, QVector<int> indices, int primitiveSize) -> bool {
-        // Check whether the point is "behind" all the primitives.
-        int verticesSize = mesh.vertices.size();
-        for (int j = 0;
-             j < indices.size() - 2; // -2 in case the vertices aren't the right size -- we access j + 2 below
-             j += primitiveSize) {
-            if (indices[j] < verticesSize &&
-                indices[j + 1] < verticesSize &&
-                indices[j + 2] < verticesSize &&
-                !isPointBehindTrianglesPlane(point,
-                                             mesh.vertices[indices[j]],
-                                             mesh.vertices[indices[j + 1]],
-                                             mesh.vertices[indices[j + 2]])) {
-                // it's not behind at least one so we bail
-                return false;
-            }
-        }
-        return true;
-    };
-
-    // Check that the point is contained in at least one convex mesh.
-    for (auto mesh : meshes) {
-        bool insideMesh = true;
-
-        // To be considered inside a convex mesh,
-        // the point needs to be "behind" all the primitives respective planes.
-        for (auto part : mesh.parts) {
-            // run through all the triangles and quads
-            if (!checkEachPrimitive(mesh, part.triangleIndices, 3) ||
-                !checkEachPrimitive(mesh, part.quadIndices, 4)) {
-                // If not, the point is outside, bail for this mesh
-                insideMesh = false;
-                continue;
-            }
-        }
-        if (insideMesh) {
-            // It's inside this mesh, return true.
-            return true;
-        }
-    }
-
-    // It wasn't in any mesh, return false.
-    return false;
-}
-
-QString HFMModel::getModelNameOfMesh(int meshIndex) const {
-    if (meshIndicesToModelNames.contains(meshIndex)) {
-        return meshIndicesToModelNames.value(meshIndex);
-    }
-    return QString();
-}
-
-int hfmModelMetaTypeId = qRegisterMetaType<HFMModel>();
-int hfmAnimationFrameMetaTypeId = qRegisterMetaType<HFMAnimationFrame>();
-int hfmAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<HFMAnimationFrame>>();
-
-
 glm::vec3 parseVec3(const QString& string) {
     QStringList elements = string.split(',');
     if (elements.isEmpty()) {
@@ -362,108 +266,6 @@ HFMBlendshape extractBlendshape(const FBXNode& object) {
     return blendshape;
 }
 
-using IndexAccessor = std::function<glm::vec3*(const HFMMesh&, int, int, glm::vec3*, glm::vec3&)>;
-
-static void setTangents(const HFMMesh& mesh, const IndexAccessor& vertexAccessor, int firstIndex, int secondIndex,
-                        const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals, QVector<glm::vec3>& tangents) {
-    glm::vec3 vertex[2];
-    glm::vec3 normal;
-    glm::vec3* tangent = vertexAccessor(mesh, firstIndex, secondIndex, vertex, normal);
-    if (tangent) {
-        glm::vec3 bitangent = glm::cross(normal, vertex[1] - vertex[0]);
-        if (glm::length(bitangent) < EPSILON) {
-            return;
-        }
-        glm::vec2 texCoordDelta = mesh.texCoords.at(secondIndex) - mesh.texCoords.at(firstIndex);
-        glm::vec3 normalizedNormal = glm::normalize(normal);
-        *tangent += glm::cross(glm::angleAxis(-atan2f(-texCoordDelta.t, texCoordDelta.s), normalizedNormal) *
-                                       glm::normalize(bitangent), normalizedNormal);
-    }
-}
-
-static void createTangents(const HFMMesh& mesh, bool generateFromTexCoords,
-                           const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals, QVector<glm::vec3>& tangents,
-                           IndexAccessor accessor) {
-    // if we have a normal map (and texture coordinates), we must compute tangents
-    if (generateFromTexCoords && !mesh.texCoords.isEmpty()) {
-        tangents.resize(vertices.size());
-
-        foreach(const HFMMeshPart& part, mesh.parts) {
-            for (int i = 0; i < part.quadIndices.size(); i += 4) {
-                setTangents(mesh, accessor, part.quadIndices.at(i), part.quadIndices.at(i + 1), vertices, normals, tangents);
-                setTangents(mesh, accessor, part.quadIndices.at(i + 1), part.quadIndices.at(i + 2), vertices, normals, tangents);
-                setTangents(mesh, accessor, part.quadIndices.at(i + 2), part.quadIndices.at(i + 3), vertices, normals, tangents);
-                setTangents(mesh, accessor, part.quadIndices.at(i + 3), part.quadIndices.at(i), vertices, normals, tangents);
-            }
-            // <= size - 3 in order to prevent overflowing triangleIndices when (i % 3) != 0
-            // This is most likely evidence of a further problem in extractMesh()
-            for (int i = 0; i <= part.triangleIndices.size() - 3; i += 3) {
-                setTangents(mesh, accessor, part.triangleIndices.at(i), part.triangleIndices.at(i + 1), vertices, normals, tangents);
-                setTangents(mesh, accessor, part.triangleIndices.at(i + 1), part.triangleIndices.at(i + 2), vertices, normals, tangents);
-                setTangents(mesh, accessor, part.triangleIndices.at(i + 2), part.triangleIndices.at(i), vertices, normals, tangents);
-            }
-            if ((part.triangleIndices.size() % 3) != 0) {
-                qCDebug(modelformat) << "Error in extractHFMModel part.triangleIndices.size() is not divisible by three ";
-            }
-        }
-    }
-}
-
-static void _createBlendShapeTangents(HFMMesh& mesh, bool generateFromTexCoords, HFMBlendshape& blendShape);
-
-void HFMMesh::createBlendShapeTangents(bool generateTangents) {
-    for (auto& blendShape : blendshapes) {
-        _createBlendShapeTangents(*this, generateTangents, blendShape);
-    }
-}
-
-void HFMMesh::createMeshTangents(bool generateFromTexCoords) {
-    HFMMesh& mesh = *this;
-    // This is the only workaround I've found to trick the compiler into understanding that mesh.tangents isn't
-    // const in the lambda function.
-    auto& tangents = mesh.tangents;
-    createTangents(mesh, generateFromTexCoords, mesh.vertices, mesh.normals, mesh.tangents, 
-                   [&](const HFMMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
-        outVertices[0] = mesh.vertices[firstIndex];
-        outVertices[1] = mesh.vertices[secondIndex];
-        outNormal = mesh.normals[firstIndex];
-        return &(tangents[firstIndex]);
-    });
-}
-
-static void _createBlendShapeTangents(HFMMesh& mesh, bool generateFromTexCoords, HFMBlendshape& blendShape) {
-    // Create lookup to get index in blend shape from vertex index in mesh
-    std::vector<int> reverseIndices;
-    reverseIndices.resize(mesh.vertices.size());
-    std::iota(reverseIndices.begin(), reverseIndices.end(), 0);
-
-    for (int indexInBlendShape = 0; indexInBlendShape < blendShape.indices.size(); ++indexInBlendShape) {
-        auto indexInMesh = blendShape.indices[indexInBlendShape];
-        reverseIndices[indexInMesh] = indexInBlendShape;
-    }
-
-    createTangents(mesh, generateFromTexCoords, blendShape.vertices, blendShape.normals, blendShape.tangents,
-                   [&](const HFMMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
-        const auto index1 = reverseIndices[firstIndex];
-        const auto index2 = reverseIndices[secondIndex];
-
-        if (index1 < blendShape.vertices.size()) {
-            outVertices[0] = blendShape.vertices[index1];
-            if (index2 < blendShape.vertices.size()) {
-                outVertices[1] = blendShape.vertices[index2];
-            } else {
-                // Index isn't in the blend shape so return vertex from mesh
-                outVertices[1] = mesh.vertices[secondIndex];
-            }
-            outNormal = blendShape.normals[index1];
-            return &blendShape.tangents[index1];
-        } else {
-            // Index isn't in blend shape so return nullptr
-            return (glm::vec3*)nullptr;
-        }
-    });
-}
-
 QVector<int> getIndices(const QVector<QString> ids, QVector<QString> modelIDs) {
     QVector<int> indices;
     foreach (const QString& id, ids) {
diff --git a/libraries/fbx/src/FBXReader_Material.cpp b/libraries/fbx/src/FBXReader_Material.cpp
index ff1de30b97..2ec8cfde75 100644
--- a/libraries/fbx/src/FBXReader_Material.cpp
+++ b/libraries/fbx/src/FBXReader_Material.cpp
@@ -25,61 +25,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
-#include "ModelFormatLogging.h"
-
-void HFMMaterial::getTextureNames(QSet<QString>& textureList) const {
-    if (!normalTexture.isNull()) {
-        textureList.insert(normalTexture.name);
-    }
-    if (!albedoTexture.isNull()) {
-        textureList.insert(albedoTexture.name);
-    }
-    if (!opacityTexture.isNull()) {
-        textureList.insert(opacityTexture.name);
-    }
-    if (!glossTexture.isNull()) {
-        textureList.insert(glossTexture.name);
-    }
-    if (!roughnessTexture.isNull()) {
-        textureList.insert(roughnessTexture.name);
-    }
-    if (!specularTexture.isNull()) {
-        textureList.insert(specularTexture.name);
-    }
-    if (!metallicTexture.isNull()) {
-        textureList.insert(metallicTexture.name);
-    }
-    if (!emissiveTexture.isNull()) {
-        textureList.insert(emissiveTexture.name);
-    }
-    if (!occlusionTexture.isNull()) {
-        textureList.insert(occlusionTexture.name);
-    }
-    if (!scatteringTexture.isNull()) {
-        textureList.insert(scatteringTexture.name);
-    }
-    if (!lightmapTexture.isNull()) {
-        textureList.insert(lightmapTexture.name);
-    }
-}
-
-void HFMMaterial::setMaxNumPixelsPerTexture(int maxNumPixels) {
-    normalTexture.maxNumPixels = maxNumPixels;
-    albedoTexture.maxNumPixels = maxNumPixels;
-    opacityTexture.maxNumPixels = maxNumPixels;
-    glossTexture.maxNumPixels = maxNumPixels;
-    roughnessTexture.maxNumPixels = maxNumPixels;
-    specularTexture.maxNumPixels = maxNumPixels;
-    metallicTexture.maxNumPixels = maxNumPixels;
-    emissiveTexture.maxNumPixels = maxNumPixels;
-    occlusionTexture.maxNumPixels = maxNumPixels;
-    scatteringTexture.maxNumPixels = maxNumPixels;
-    lightmapTexture.maxNumPixels = maxNumPixels;
-}
-
-bool HFMMaterial::needTangentSpace() const {
-    return !normalTexture.isNull();
-}
+#include <hfm/ModelFormatLogging.h>
 
 HFMTexture FBXReader::getTexture(const QString& textureID) {
     HFMTexture texture;
diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp
index e098aff99a..07c4c2a25a 100644
--- a/libraries/fbx/src/FBXReader_Mesh.cpp
+++ b/libraries/fbx/src/FBXReader_Mesh.cpp
@@ -31,7 +31,7 @@
 #include <QFileInfo>
 #include <QHash>
 #include <LogHandler.h>
-#include "ModelFormatLogging.h"
+#include <hfm/ModelFormatLogging.h>
 
 #include "FBXReader.h"
 
diff --git a/libraries/fbx/src/FBXReader_Node.cpp b/libraries/fbx/src/FBXReader_Node.cpp
index 9375dc7b56..cd717998dd 100644
--- a/libraries/fbx/src/FBXReader_Node.cpp
+++ b/libraries/fbx/src/FBXReader_Node.cpp
@@ -22,7 +22,7 @@
 #include <QtCore/QFileInfo>
 
 #include <shared/NsightHelpers.h>
-#include "ModelFormatLogging.h"
+#include <hfm/ModelFormatLogging.h>
 
 template<class T>
 int streamSize() {
diff --git a/libraries/fbx/src/GLTFReader.h b/libraries/fbx/src/GLTFReader.h
index 44186504f0..cf01aa0c6b 100644
--- a/libraries/fbx/src/GLTFReader.h
+++ b/libraries/fbx/src/GLTFReader.h
@@ -14,7 +14,7 @@
 
 #include <memory.h>
 #include <QtNetwork/QNetworkReply>
-#include "ModelFormatLogging.h"
+#include <hfm/ModelFormatLogging.h>
 #include "FBXReader.h"
 
 
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 87fae0e965..dd8acec9a2 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -28,7 +28,7 @@
 #include <ResourceManager.h>
 
 #include "FBXReader.h"
-#include "ModelFormatLogging.h"
+#include <hfm/ModelFormatLogging.h>
 #include <shared/PlatformHacks.h>
 
 QHash<QString, float> COMMENT_SCALE_HINTS = {{"This file uses centimeters as units", 1.0f / 100.0f},
diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index 630ac95b9e..b2e191bcbf 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -15,7 +15,7 @@
 #include <QFileInfo>
 #include <graphics/BufferViewHelpers.h>
 #include <graphics/Geometry.h>
-#include "ModelFormatLogging.h"
+#include <hfm/ModelFormatLogging.h>
 
 static QString formatFloat(double n) {
     // limit precision to 6, but don't output trailing zeros.
diff --git a/libraries/hfm/CMakeLists.txt b/libraries/hfm/CMakeLists.txt
index d569688a26..a042e51fb8 100644
--- a/libraries/hfm/CMakeLists.txt
+++ b/libraries/hfm/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(TARGET_NAME hfm)
 setup_hifi_library()
 
+include_hifi_library_headers(gpu)
 include_hifi_library_headers(graphics)
 include_hifi_library_headers(shared)
 
diff --git a/libraries/hfm/src/hfm/HFM.cpp b/libraries/hfm/src/hfm/HFM.cpp
new file mode 100644
index 0000000000..8f01956f17
--- /dev/null
+++ b/libraries/hfm/src/hfm/HFM.cpp
@@ -0,0 +1,259 @@
+//
+//  HFM.cpp
+//  libraries/hfm/src
+//
+//  Created by Sabrina Shanman on 2018/11/06.
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "HFM.h"
+
+#include "ModelFormatLogging.h"
+
+void HFMMaterial::getTextureNames(QSet<QString>& textureList) const {
+    if (!normalTexture.isNull()) {
+        textureList.insert(normalTexture.name);
+    }
+    if (!albedoTexture.isNull()) {
+        textureList.insert(albedoTexture.name);
+    }
+    if (!opacityTexture.isNull()) {
+        textureList.insert(opacityTexture.name);
+    }
+    if (!glossTexture.isNull()) {
+        textureList.insert(glossTexture.name);
+    }
+    if (!roughnessTexture.isNull()) {
+        textureList.insert(roughnessTexture.name);
+    }
+    if (!specularTexture.isNull()) {
+        textureList.insert(specularTexture.name);
+    }
+    if (!metallicTexture.isNull()) {
+        textureList.insert(metallicTexture.name);
+    }
+    if (!emissiveTexture.isNull()) {
+        textureList.insert(emissiveTexture.name);
+    }
+    if (!occlusionTexture.isNull()) {
+        textureList.insert(occlusionTexture.name);
+    }
+    if (!scatteringTexture.isNull()) {
+        textureList.insert(scatteringTexture.name);
+    }
+    if (!lightmapTexture.isNull()) {
+        textureList.insert(lightmapTexture.name);
+    }
+}
+
+void HFMMaterial::setMaxNumPixelsPerTexture(int maxNumPixels) {
+    normalTexture.maxNumPixels = maxNumPixels;
+    albedoTexture.maxNumPixels = maxNumPixels;
+    opacityTexture.maxNumPixels = maxNumPixels;
+    glossTexture.maxNumPixels = maxNumPixels;
+    roughnessTexture.maxNumPixels = maxNumPixels;
+    specularTexture.maxNumPixels = maxNumPixels;
+    metallicTexture.maxNumPixels = maxNumPixels;
+    emissiveTexture.maxNumPixels = maxNumPixels;
+    occlusionTexture.maxNumPixels = maxNumPixels;
+    scatteringTexture.maxNumPixels = maxNumPixels;
+    lightmapTexture.maxNumPixels = maxNumPixels;
+}
+
+bool HFMMaterial::needTangentSpace() const {
+    return !normalTexture.isNull();
+}
+
+static void _createBlendShapeTangents(HFMMesh& mesh, bool generateFromTexCoords, HFMBlendshape& blendShape);
+
+void HFMMesh::createBlendShapeTangents(bool generateTangents) {
+    for (auto& blendShape : blendshapes) {
+        _createBlendShapeTangents(*this, generateTangents, blendShape);
+    }
+}
+
+using IndexAccessor = std::function<glm::vec3*(const HFMMesh&, int, int, glm::vec3*, glm::vec3&)>;
+
+static void setTangents(const HFMMesh& mesh, const IndexAccessor& vertexAccessor, int firstIndex, int secondIndex,
+    const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals, QVector<glm::vec3>& tangents) {
+    glm::vec3 vertex[2];
+    glm::vec3 normal;
+    glm::vec3* tangent = vertexAccessor(mesh, firstIndex, secondIndex, vertex, normal);
+    if (tangent) {
+        glm::vec3 bitangent = glm::cross(normal, vertex[1] - vertex[0]);
+        if (glm::length(bitangent) < EPSILON) {
+            return;
+        }
+        glm::vec2 texCoordDelta = mesh.texCoords.at(secondIndex) - mesh.texCoords.at(firstIndex);
+        glm::vec3 normalizedNormal = glm::normalize(normal);
+        *tangent += glm::cross(glm::angleAxis(-atan2f(-texCoordDelta.t, texCoordDelta.s), normalizedNormal) *
+            glm::normalize(bitangent), normalizedNormal);
+    }
+}
+
+static void createTangents(const HFMMesh& mesh, bool generateFromTexCoords,
+    const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals, QVector<glm::vec3>& tangents,
+    IndexAccessor accessor) {
+    // if we have a normal map (and texture coordinates), we must compute tangents
+    if (generateFromTexCoords && !mesh.texCoords.isEmpty()) {
+        tangents.resize(vertices.size());
+
+        foreach(const HFMMeshPart& part, mesh.parts) {
+            for (int i = 0; i < part.quadIndices.size(); i += 4) {
+                setTangents(mesh, accessor, part.quadIndices.at(i), part.quadIndices.at(i + 1), vertices, normals, tangents);
+                setTangents(mesh, accessor, part.quadIndices.at(i + 1), part.quadIndices.at(i + 2), vertices, normals, tangents);
+                setTangents(mesh, accessor, part.quadIndices.at(i + 2), part.quadIndices.at(i + 3), vertices, normals, tangents);
+                setTangents(mesh, accessor, part.quadIndices.at(i + 3), part.quadIndices.at(i), vertices, normals, tangents);
+            }
+            // <= size - 3 in order to prevent overflowing triangleIndices when (i % 3) != 0
+            // This is most likely evidence of a further problem in extractMesh()
+            for (int i = 0; i <= part.triangleIndices.size() - 3; i += 3) {
+                setTangents(mesh, accessor, part.triangleIndices.at(i), part.triangleIndices.at(i + 1), vertices, normals, tangents);
+                setTangents(mesh, accessor, part.triangleIndices.at(i + 1), part.triangleIndices.at(i + 2), vertices, normals, tangents);
+                setTangents(mesh, accessor, part.triangleIndices.at(i + 2), part.triangleIndices.at(i), vertices, normals, tangents);
+            }
+            if ((part.triangleIndices.size() % 3) != 0) {
+                qCDebug(modelformat) << "Error in extractHFMModel part.triangleIndices.size() is not divisible by three ";
+            }
+        }
+    }
+}
+
+void HFMMesh::createMeshTangents(bool generateFromTexCoords) {
+    HFMMesh& mesh = *this;
+    // This is the only workaround I've found to trick the compiler into understanding that mesh.tangents isn't
+    // const in the lambda function.
+    auto& tangents = mesh.tangents;
+    createTangents(mesh, generateFromTexCoords, mesh.vertices, mesh.normals, mesh.tangents, 
+        [&](const HFMMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
+        outVertices[0] = mesh.vertices[firstIndex];
+        outVertices[1] = mesh.vertices[secondIndex];
+        outNormal = mesh.normals[firstIndex];
+        return &(tangents[firstIndex]);
+    });
+}
+
+static void _createBlendShapeTangents(HFMMesh& mesh, bool generateFromTexCoords, HFMBlendshape& blendShape) {
+    // Create lookup to get index in blend shape from vertex index in mesh
+    std::vector<int> reverseIndices;
+    reverseIndices.resize(mesh.vertices.size());
+    std::iota(reverseIndices.begin(), reverseIndices.end(), 0);
+
+    for (int indexInBlendShape = 0; indexInBlendShape < blendShape.indices.size(); ++indexInBlendShape) {
+        auto indexInMesh = blendShape.indices[indexInBlendShape];
+        reverseIndices[indexInMesh] = indexInBlendShape;
+    }
+
+    createTangents(mesh, generateFromTexCoords, blendShape.vertices, blendShape.normals, blendShape.tangents,
+        [&](const HFMMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
+        const auto index1 = reverseIndices[firstIndex];
+        const auto index2 = reverseIndices[secondIndex];
+
+        if (index1 < blendShape.vertices.size()) {
+            outVertices[0] = blendShape.vertices[index1];
+            if (index2 < blendShape.vertices.size()) {
+                outVertices[1] = blendShape.vertices[index2];
+            } else {
+                // Index isn't in the blend shape so return vertex from mesh
+                outVertices[1] = mesh.vertices[secondIndex];
+            }
+            outNormal = blendShape.normals[index1];
+            return &blendShape.tangents[index1];
+        } else {
+            // Index isn't in blend shape so return nullptr
+            return (glm::vec3*)nullptr;
+        }
+    });
+}
+
+QStringList HFMModel::getJointNames() const {
+    QStringList names;
+    foreach (const HFMJoint& joint, joints) {
+        names.append(joint.name);
+    }
+    return names;
+}
+
+bool HFMModel::hasBlendedMeshes() const {
+    if (!meshes.isEmpty()) {
+        foreach (const HFMMesh& mesh, meshes) {
+            if (!mesh.blendshapes.isEmpty()) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+Extents HFMModel::getUnscaledMeshExtents() const {
+    const Extents& extents = meshExtents;
+
+    // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
+    // is captured in the offset matrix
+    glm::vec3 minimum = glm::vec3(offset * glm::vec4(extents.minimum, 1.0f));
+    glm::vec3 maximum = glm::vec3(offset * glm::vec4(extents.maximum, 1.0f));
+    Extents scaledExtents = { minimum, maximum };
+
+    return scaledExtents;
+}
+
+// TODO: Move to graphics::Mesh when Sam's ready
+bool HFMModel::convexHullContains(const glm::vec3& point) const {
+    if (!getUnscaledMeshExtents().containsPoint(point)) {
+        return false;
+    }
+
+    auto checkEachPrimitive = [=](HFMMesh& mesh, QVector<int> indices, int primitiveSize) -> bool {
+        // Check whether the point is "behind" all the primitives.
+        int verticesSize = mesh.vertices.size();
+        for (int j = 0;
+            j < indices.size() - 2; // -2 in case the vertices aren't the right size -- we access j + 2 below
+            j += primitiveSize) {
+            if (indices[j] < verticesSize &&
+                indices[j + 1] < verticesSize &&
+                indices[j + 2] < verticesSize &&
+                !isPointBehindTrianglesPlane(point,
+                    mesh.vertices[indices[j]],
+                    mesh.vertices[indices[j + 1]],
+                    mesh.vertices[indices[j + 2]])) {
+                // it's not behind at least one so we bail
+                return false;
+            }
+        }
+        return true;
+    };
+
+    // Check that the point is contained in at least one convex mesh.
+    for (auto mesh : meshes) {
+        bool insideMesh = true;
+
+        // To be considered inside a convex mesh,
+        // the point needs to be "behind" all the primitives respective planes.
+        for (auto part : mesh.parts) {
+            // run through all the triangles and quads
+            if (!checkEachPrimitive(mesh, part.triangleIndices, 3) ||
+                !checkEachPrimitive(mesh, part.quadIndices, 4)) {
+                // If not, the point is outside, bail for this mesh
+                insideMesh = false;
+                continue;
+            }
+        }
+        if (insideMesh) {
+            // It's inside this mesh, return true.
+            return true;
+        }
+    }
+
+    // It wasn't in any mesh, return false.
+    return false;
+}
+
+QString HFMModel::getModelNameOfMesh(int meshIndex) const {
+    if (meshIndicesToModelNames.contains(meshIndex)) {
+        return meshIndicesToModelNames.value(meshIndex);
+    }
+    return QString();
+}
diff --git a/libraries/hfm/src/hfm/HFM.h b/libraries/hfm/src/hfm/HFM.h
index dd5250ca83..1766d519cc 100644
--- a/libraries/hfm/src/hfm/HFM.h
+++ b/libraries/hfm/src/hfm/HFM.h
@@ -352,7 +352,6 @@ public:
 
 Q_DECLARE_METATYPE(HFMAnimationFrame)
 Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
-
 Q_DECLARE_METATYPE(HFMModel)
 Q_DECLARE_METATYPE(HFMModel::Pointer)
 
diff --git a/libraries/fbx/src/ModelFormatLogging.cpp b/libraries/hfm/src/hfm/ModelFormatLogging.cpp
similarity index 94%
rename from libraries/fbx/src/ModelFormatLogging.cpp
rename to libraries/hfm/src/hfm/ModelFormatLogging.cpp
index e720b3c054..7748b8496d 100644
--- a/libraries/fbx/src/ModelFormatLogging.cpp
+++ b/libraries/hfm/src/hfm/ModelFormatLogging.cpp
@@ -1,6 +1,6 @@
 //
 //  ModelFormatLogging.cpp
-//  libraries/fbx/src
+//  libraries/hfm/src
 //
 //  Created by Seth Alves on 4/6/15.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/fbx/src/ModelFormatLogging.h b/libraries/hfm/src/hfm/ModelFormatLogging.h
similarity index 95%
rename from libraries/fbx/src/ModelFormatLogging.h
rename to libraries/hfm/src/hfm/ModelFormatLogging.h
index 19c7c27322..745f22d7ff 100644
--- a/libraries/fbx/src/ModelFormatLogging.h
+++ b/libraries/hfm/src/hfm/ModelFormatLogging.h
@@ -1,6 +1,6 @@
 //
 //  ModelFormatLogging.h
-//  libraries/fbx/src
+//  libraries/hfm/src
 //
 //  Created by Seth Alves on 4/6/15.
 //  Copyright 2014 High Fidelity, Inc.

From 70c9db38ef30af84888354c44dac08e1e6d35b9a Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 6 Nov 2018 14:13:48 -0800
Subject: [PATCH 07/12] Do not reference HFM inside the hfm namespace

---
 libraries/hfm/src/hfm/HFM.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/hfm/src/hfm/HFM.h b/libraries/hfm/src/hfm/HFM.h
index 1766d519cc..daa94f7e87 100644
--- a/libraries/hfm/src/hfm/HFM.h
+++ b/libraries/hfm/src/hfm/HFM.h
@@ -66,7 +66,7 @@ public:
 };
 
 struct JointShapeInfo {
-    // same units and frame as HFMJoint.translation
+    // same units and frame as Joint.translation
     glm::vec3 avgPoint;
     std::vector<float> dots;
     std::vector<glm::vec3> points;
@@ -285,7 +285,7 @@ public:
     QString author;
     QString applicationName; ///< the name of the application that generated the model
 
-    QVector<HFMJoint> joints;
+    QVector<Joint> joints;
     QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
     bool hasSkeletonJoints;
 

From e654ff9bbce558afbf1eb0081dc4f50f7e3d4cbb Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 6 Nov 2018 14:53:23 -0800
Subject: [PATCH 08/12] Remove forward declaration in HFM.h so ModelPackager
 and other things can use it instead

---
 interface/src/ModelPackager.cpp |  2 +-
 interface/src/ModelPackager.h   | 10 +++++----
 libraries/hfm/src/hfm/HFM.h     | 40 +++++++++++----------------------
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp
index 21d3477d7e..a7fc0b9e20 100644
--- a/interface/src/ModelPackager.cpp
+++ b/interface/src/ModelPackager.cpp
@@ -235,7 +235,7 @@ bool ModelPackager::zipModel() {
     return true;
 }
 
-void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const HFMModel& hfmModel) {
+void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const hfm::Model& hfmModel) {
 
     bool isBodyType = _modelType == FSTReader::BODY_ONLY_MODEL || _modelType == FSTReader::HEAD_AND_BODY_MODEL;
 
diff --git a/interface/src/ModelPackager.h b/interface/src/ModelPackager.h
index bc42bc1fda..849f6ac3da 100644
--- a/interface/src/ModelPackager.h
+++ b/interface/src/ModelPackager.h
@@ -17,10 +17,12 @@
 #include <QFileInfo>
 #include <QVariantHash>
 
-#include <hfm/HFM.h>
-
 #include "ui/ModelsBrowser.h"
 
+namespace hfm {
+    class Model;
+};
+
 class ModelPackager : public QObject {
 public:
     static bool package();
@@ -32,7 +34,7 @@ private:
     bool editProperties();
     bool zipModel();
     
-    void populateBasicMapping(QVariantHash& mapping, QString filename, const HFMModel& hfmModel);
+    void populateBasicMapping(QVariantHash& mapping, QString filename, const hfm::Model& hfmModel);
     
     void listTextures();
     bool copyTextures(const QString& oldDir, const QDir& newDir);
@@ -44,7 +46,7 @@ private:
     QString _scriptDir;
 
     QVariantHash _mapping;
-    std::unique_ptr<HFMModel> _hfmModel;
+    std::unique_ptr<hfm::Model> _hfmModel;
     QStringList _textures;
     QStringList _scripts;
 };
diff --git a/libraries/hfm/src/hfm/HFM.h b/libraries/hfm/src/hfm/HFM.h
index daa94f7e87..7d4479e681 100644
--- a/libraries/hfm/src/hfm/HFM.h
+++ b/libraries/hfm/src/hfm/HFM.h
@@ -25,35 +25,9 @@
 #include <graphics/Geometry.h>
 #include <graphics/Material.h>
 
-// High Fidelity Model namespace
-namespace hfm {
-    class Blendshape;
-    struct JointShapeInfo;
-    class Joint;
-    class Cluster;
-    class Texture;
-    class MeshPart;
-    class Material;
-    class Mesh;
-    class AnimationFrame;
-    class Light;
-    class Model;
-};
-
-typedef hfm::Blendshape HFMBlendshape;
-typedef hfm::JointShapeInfo HFMJointShapeInfo;
-typedef hfm::Joint HFMJoint;
-typedef hfm::Cluster HFMCluster;
-typedef hfm::Texture HFMTexture;
-typedef hfm::MeshPart HFMMeshPart;
-typedef hfm::Material HFMMaterial;
-typedef hfm::Mesh HFMMesh;
-typedef hfm::AnimationFrame HFMAnimationFrame;
-typedef hfm::Light HFMLight;
-typedef hfm::Model HFMModel;
-
 const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
 
+// High Fidelity Model namespace
 namespace hfm {
 
 /// A single blendshape.
@@ -350,6 +324,18 @@ public:
     QHash<QString, size_t> texcoordSetMap;
 };
 
+typedef hfm::Blendshape HFMBlendshape;
+typedef hfm::JointShapeInfo HFMJointShapeInfo;
+typedef hfm::Joint HFMJoint;
+typedef hfm::Cluster HFMCluster;
+typedef hfm::Texture HFMTexture;
+typedef hfm::MeshPart HFMMeshPart;
+typedef hfm::Material HFMMaterial;
+typedef hfm::Mesh HFMMesh;
+typedef hfm::AnimationFrame HFMAnimationFrame;
+typedef hfm::Light HFMLight;
+typedef hfm::Model HFMModel;
+
 Q_DECLARE_METATYPE(HFMAnimationFrame)
 Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
 Q_DECLARE_METATYPE(HFMModel)

From 906fc1a4251151490e43e3f5989f809a8623c62b Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 6 Nov 2018 16:38:36 -0800
Subject: [PATCH 09/12] Fix Android build not linking hfm library

---
 android/app/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
index 9930a9e152..19dce330c1 100644
--- a/android/app/CMakeLists.txt
+++ b/android/app/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME native-lib)
 setup_hifi_library()
-link_hifi_libraries(shared task networking gl gpu qml image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND})
+link_hifi_libraries(shared task networking gl gpu qml image fbx hfm render-utils physics entities octree ${PLATFORM_GL_BACKEND})
 target_opengl()
 target_bullet()
 

From 8b37133875c5687b2b721415475f82faccfab314 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 6 Nov 2018 17:10:44 -0800
Subject: [PATCH 10/12] Remove unnecessary draco dependency from hfm library

---
 libraries/hfm/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/hfm/CMakeLists.txt b/libraries/hfm/CMakeLists.txt
index a042e51fb8..e2a8dc178b 100644
--- a/libraries/hfm/CMakeLists.txt
+++ b/libraries/hfm/CMakeLists.txt
@@ -4,5 +4,3 @@ setup_hifi_library()
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(graphics)
 include_hifi_library_headers(shared)
-
-target_draco()

From 2c94d1f620d706a341e9b4fc006a5871b65cdebf Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 7 Nov 2018 09:24:42 -0800
Subject: [PATCH 11/12] Fix hfm not linking in script-engine for Android build

---
 libraries/script-engine/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 0d657ed20a..346c6e50f6 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -17,7 +17,6 @@ if (NOT ANDROID)
 
 endif ()
 
-link_hifi_libraries(shared networking octree shaders gpu procedural graphics model-networking ktx recording avatars fbx entities controllers animation audio physics image midi)
+link_hifi_libraries(shared networking octree shaders gpu procedural graphics model-networking ktx recording avatars fbx hfm 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)

From 4d9c20343aee8664ea72d397d22edd7215ea0f19 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 7 Nov 2018 11:44:58 -0800
Subject: [PATCH 12/12] Link shared library in hfm

---
 libraries/hfm/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/hfm/CMakeLists.txt b/libraries/hfm/CMakeLists.txt
index e2a8dc178b..553fd935d9 100644
--- a/libraries/hfm/CMakeLists.txt
+++ b/libraries/hfm/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(TARGET_NAME hfm)
 setup_hifi_library()
 
+link_hifi_libraries(shared)
+
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(graphics)
-include_hifi_library_headers(shared)