Merge remote-tracking branch 'upstream/master' into android_new_login

assignment-client/src/AssignmentClient.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AssignmentClient.h"
+
 #include <assert.h>
 
 #include <QProcess>
@@ -32,16 +34,14 @@
 #include <SoundCache.h>
 #include <ResourceScriptingInterface.h>
 #include <UserActivityLoggerScriptingInterface.h>
-
-#include "AssignmentFactory.h"
-#include "AssignmentDynamicFactory.h"
-
-#include "AssignmentClient.h"
-#include "AssignmentClientLogging.h"
-#include "avatars/ScriptableAvatar.h"
 #include <Trace.h>
 #include <StatTracker.h>
 
+#include "AssignmentClientLogging.h"
+#include "AssignmentDynamicFactory.h"
+#include "AssignmentFactory.h"
+#include "avatars/ScriptableAvatar.h"
+
 const QString ASSIGNMENT_CLIENT_TARGET_NAME = "assignment-client";
 const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000;
 

assignment-client/src/AssignmentClientMonitor.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AssignmentClientMonitor.h"
+
 #include <memory>
 #include <signal.h>
 
@@ -19,7 +21,6 @@
 #include <LogHandler.h>
 #include <udt/PacketHeaders.h>
 
-#include "AssignmentClientMonitor.h"
 #include "AssignmentClientApp.h"
 #include "AssignmentClientChildData.h"
 #include "SharedUtil.h"

assignment-client/src/AssignmentDynamic.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "EntitySimulation.h"
-
 #include "AssignmentDynamic.h"
 
+#include "EntitySimulation.h"
+
 AssignmentDynamic::AssignmentDynamic(EntityDynamicType type, const QUuid& id, EntityItemPointer ownerEntity) :
     EntityDynamicInterface(type, id),
     _data(QByteArray()),

assignment-client/src/AssignmentFactory.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AssignmentFactory.h"
+
 #include <udt/PacketHeaders.h>
 
 #include "Agent.h"
 #include "assets/AssetServer.h"
-#include "AssignmentFactory.h"
 #include "audio/AudioMixer.h"
 #include "avatars/AvatarMixer.h"
 #include "entities/EntityServer.h"

assignment-client/src/assets/AssetServer.h

@@ -36,10 +36,11 @@ enum class BakedAssetType : int {
     Undefined
 };
 
-// ATTENTION! If you change the current version for an asset type, you will also
+// ATTENTION! Do not remove baking versions, and do not reorder them. If you add
-// need to update the function currentBakeVersionForAssetType() inside of AssetServer.cpp.
+// a new value, it will immediately become the "current" version.
 enum class ModelBakeVersion : BakeVersion {
     Initial = INITIAL_BAKE_VERSION,
+    MetaTextureJson,
 
     COUNT
 };
@@ -47,6 +48,7 @@ enum class ModelBakeVersion : BakeVersion {
 // ATTENTION! See above.
 enum class TextureBakeVersion : BakeVersion {
     Initial = INITIAL_BAKE_VERSION,
+    MetaTextureJson,
 
     COUNT
 };

assignment-client/src/audio/AudioMixerSlavePool.cpp

@@ -9,11 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioMixerSlavePool.h"
+
 #include <assert.h>
 #include <algorithm>
 
-#include "AudioMixerSlavePool.h"
-
 void AudioMixerSlaveThread::run() {
     while (true) {
         wait();

assignment-client/src/audio/AvatarAudioStream.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarAudioStream.h"
+
 #include <udt/PacketHeaders.h>
 
 #include "AudioLogging.h"
-#include "AvatarAudioStream.h"
 
 AvatarAudioStream::AvatarAudioStream(bool isStereo, int numStaticJitterFrames) :
     PositionalAudioStream(PositionalAudioStream::Microphone, isStereo, numStaticJitterFrames) {}

assignment-client/src/avatars/AvatarMixer.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarMixer.h"
+
 #include <cfloat>
 #include <chrono>
 #include <memory>
@@ -31,8 +33,6 @@
 #include <UUID.h>
 #include <TryLocker.h>
 
-#include "AvatarMixer.h"
-
 const QString AVATAR_MIXER_LOGGING_NAME = "avatar-mixer";
 
 // FIXME - what we'd actually like to do is send to users at ~50% of their present rate down to 30hz. Assume 90 for now.

assignment-client/src/avatars/AvatarMixerClientData.cpp

@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarMixerClientData.h"
+
 #include <udt/PacketHeaders.h>
 
 #include <DependencyManager.h>
 #include <NodeList.h>
 
-#include "AvatarMixerClientData.h"
-
 AvatarMixerClientData::AvatarMixerClientData(const QUuid& nodeID) :
     NodeData(nodeID)
 {

assignment-client/src/avatars/AvatarMixerSlave.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarMixerSlave.h"
+
 #include <algorithm>
 #include <random>
 
@@ -28,10 +30,8 @@
 #include <StDev.h>
 #include <UUID.h>
 
-
 #include "AvatarMixer.h"
 #include "AvatarMixerClientData.h"
-#include "AvatarMixerSlave.h"
 
 void AvatarMixerSlave::configure(ConstIter begin, ConstIter end) {
     _begin = begin;

assignment-client/src/avatars/AvatarMixerSlave.h

@@ -12,6 +12,8 @@
 #ifndef hifi_AvatarMixerSlave_h
 #define hifi_AvatarMixerSlave_h
 
+#include <NodeList.h>
+
 class AvatarMixerClientData;
 
 class AvatarMixerSlaveStats {

assignment-client/src/avatars/AvatarMixerSlavePool.cpp

@@ -9,11 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarMixerSlavePool.h"
+
 #include <assert.h>
 #include <algorithm>
 
-#include "AvatarMixerSlavePool.h"
-
 void AvatarMixerSlaveThread::run() {
     while (true) {
         wait();

assignment-client/src/avatars/ScriptableAvatar.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ScriptableAvatar.h"
+
 #include <QDebug>
 #include <QThread>
 #include <glm/gtx/transform.hpp>
@@ -16,7 +18,6 @@
 #include <shared/QtHelpers.h>
 #include <GLMHelpers.h>
 #include <AnimUtil.h>
-#include "ScriptableAvatar.h"
 
 
 QByteArray ScriptableAvatar::toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking) {

assignment-client/src/entities/EntityServer.cpp

@@ -9,21 +9,23 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "EntityServer.h"
+
 #include <QtCore/QEventLoop>
 #include <QTimer>
+#include <QJsonArray>
+#include <QJsonDocument>
+
 #include <EntityTree.h>
 #include <SimpleEntitySimulation.h>
 #include <ResourceCache.h>
 #include <ScriptCache.h>
 #include <EntityEditFilters.h>
 #include <NetworkingConstants.h>
-#include <QJsonArray>
-#include <QJsonDocument>
 #include <AddressManager.h>
 
 #include "AssignmentParentFinder.h"
 #include "EntityNodeData.h"
-#include "EntityServer.h"
 #include "EntityServerConsts.h"
 #include "EntityTreeSendThread.h"
 

assignment-client/src/messages/MessagesMixer.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "MessagesMixer.h"
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QJsonObject>
 #include <QBuffer>
@@ -16,7 +18,6 @@
 #include <MessagesClient.h>
 #include <NodeList.h>
 #include <udt/PacketHeaders.h>
-#include "MessagesMixer.h"
 
 const QString MESSAGES_MIXER_LOGGING_NAME = "messages-mixer";
 

assignment-client/src/octree/OctreeInboundPacketProcessor.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OctreeInboundPacketProcessor.h"
+
 #include <limits>
 
 #include <NumericalConstants.h>
@@ -17,7 +19,6 @@
 
 #include "OctreeServer.h"
 #include "OctreeServerConsts.h"
-#include "OctreeInboundPacketProcessor.h"
 
 static QUuid DEFAULT_NODE_ID_REF;
 const quint64 TOO_LONG_SINCE_LAST_NACK = 1 * USECS_PER_SECOND;

assignment-client/src/octree/OctreeSendThread.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OctreeSendThread.h"
+
 #include <chrono>
 #include <thread>
 
@@ -17,7 +19,6 @@
 #include <udt/PacketHeaders.h>
 #include <PerfStat.h>
 
-#include "OctreeSendThread.h"
 #include "OctreeServer.h"
 #include "OctreeServerConsts.h"
 #include "OctreeLogging.h"

domain-server/src/DomainServerNodeData.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DomainServerNodeData.h"
+
 #include <QtCore/QDataStream>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
@@ -17,8 +19,6 @@
 
 #include <udt/PacketHeaders.h>
 
-#include "DomainServerNodeData.h"
-
 DomainServerNodeData::StringPairHash DomainServerNodeData::_overrideHash;
 
 DomainServerNodeData::DomainServerNodeData() {

domain-server/src/DomainServerNodeData.h

@@ -15,6 +15,7 @@
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QHash>
 #include <QtCore/QUuid>
+#include <QtCore/QJsonObject>
 
 #include <HifiSockAddr.h>
 #include <NLPacket.h>

domain-server/src/DomainServerWebSessionData.cpp

@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DomainServerWebSessionData.h"
+
 #include <QtCore/QDataStream>
 #include <QtCore/QDebug>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 
-#include "DomainServerWebSessionData.h"
-
 DomainServerWebSessionData::DomainServerWebSessionData() :
     _username(),
     _roles()

gvr-interface/src/Client.cpp

@@ -9,14 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Client.h"
+
 #include <AccountManager.h>
 #include <AddressManager.h>
 #include <HifiSockAddr.h>
 #include <NodeList.h>
 #include <PacketHeaders.h>
 
-#include "Client.h"
-
 Client::Client(QObject* parent) :
     QObject(parent)
 {   
@@ -70,4 +70,4 @@ void Client::processDatagrams() {
             processVerifiedPacket(senderSockAddr, incomingPacket);
         }
     }
-}
+}

gvr-interface/src/GVRInterface.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "GVRInterface.h"
+
 #ifdef ANDROID
 
 #include <jni.h>
@@ -32,8 +34,6 @@
 #include "GVRMainWindow.h"
 #include "RenderingClient.h"
 
-#include "GVRInterface.h"
-
 static QString launchURLString = QString();
 
 #ifdef ANDROID

gvr-interface/src/GVRMainWindow.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "GVRMainWindow.h"
+
 #include <QtGui/QKeyEvent>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QInputDialog>
@@ -37,8 +39,6 @@ const float LIBOVR_LONG_PRESS_DURATION = 0.75f;
 #include "LoginDialog.h"
 #include "RenderingClient.h"
 
-#include "GVRMainWindow.h"
-
 
 
 GVRMainWindow::GVRMainWindow(QWidget* parent) :

gvr-interface/src/LoginDialog.cpp

@@ -9,14 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LoginDialog.h"
+
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QGridLayout>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QPushButton>
 
-#include "LoginDialog.h"
-
 LoginDialog::LoginDialog(QWidget* parent) :
     QDialog(parent)
 {
@@ -66,4 +66,4 @@ void LoginDialog::setupGUI() {
 void LoginDialog::loginButtonClicked() {
     emit credentialsEntered(_usernameLineEdit->text(), _passwordLineEdit->text());
     close();
-}
+}

gvr-interface/src/RenderingClient.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "RenderingClient.h"
+
 #include <QtCore/QThread>
 #include <QtWidgets/QInputDialog>
 
@@ -17,8 +19,6 @@
 #include <AvatarHashMap.h>
 #include <NodeList.h>
 
-#include "RenderingClient.h"
-
 RenderingClient* RenderingClient::_instance = NULL;
 
 RenderingClient::RenderingClient(QObject *parent, const QString& launchURLString) :

interface/src/Application.cpp

@@ -1334,6 +1334,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     // Create the main thread context, the GPU backend, and the display plugins
     initializeGL();
+    DependencyManager::get<TextureCache>()->setGPUContext(_gpuContext);
     qCDebug(interfaceapp, "Initialized Display.");
     // Create the rendering engine.  This can be slow on some machines due to lots of 
     // GPU pipeline creation.
@@ -3655,7 +3656,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                     } else {
                         showCursor(Cursor::Icon::DEFAULT);
                     }
-                } else {
+                } else if (!event->isAutoRepeat()){
                     resetSensors(true);
                 }
                 break;

interface/src/AvatarBookmarks.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarBookmarks.h"
+
 #include <QAction>
 #include <QInputDialog>
 #include <QMessageBox>
@@ -27,7 +29,6 @@
 
 #include "MainWindow.h"
 #include "Menu.h"
-#include "AvatarBookmarks.h"
 #include "InterfaceLogging.h"
 
 #include "QVariantGLM.h"

interface/src/Bookmarks.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Bookmarks.h"
+
 #include <QAction>
 #include <QDebug>
 #include <QInputDialog>
@@ -22,8 +24,6 @@
 #include "Menu.h"
 #include "InterfaceLogging.h"
 
-#include "Bookmarks.h"
-
 Bookmarks::Bookmarks() :
 _isMenuSorted(false)
 {

interface/src/DiscoverabilityManager.cpp

@@ -9,7 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DiscoverabilityManager.h"
+
 #include <QtCore/QJsonDocument>
+#include <QThread>
 
 #include <AccountManager.h>
 #include <AddressManager.h>
@@ -21,11 +24,8 @@
 #include <UUID.h>
 
 #include "Crashpad.h"
-#include "DiscoverabilityManager.h"
 #include "Menu.h"
 
-#include <QThread>
-
 const Discoverability::Mode DEFAULT_DISCOVERABILITY_MODE = Discoverability::Connections;
 
 DiscoverabilityManager::DiscoverabilityManager() :

interface/src/DiscoverabilityManager.h

@@ -12,9 +12,13 @@
 #ifndef hifi_DiscoverabilityManager_h
 #define hifi_DiscoverabilityManager_h
 
+#include <QJsonObject>
+
 #include <DependencyManager.h>
 #include <SettingHandle.h>
 
+class QNetworkReply;
+
 namespace Discoverability {
     enum Mode {
         None,

interface/src/GLCanvas.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-// FIXME ordering of headers
-#include "Application.h"
 #include "GLCanvas.h"
 
+#include "Application.h"
+
 bool GLCanvas::event(QEvent* event) {
     if (QEvent::Paint == event->type() && qApp->isAboutToQuit()) {
         return true;

interface/src/InterfaceDynamicFactory.cpp

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-
+#include "InterfaceDynamicFactory.h"
 
 #include <avatar/AvatarActionHold.h>
 #include <avatar/AvatarActionFarGrab.h>
@@ -22,9 +22,6 @@
 #include <ObjectConstraintConeTwist.h>
 #include <LogHandler.h>
 
-#include "InterfaceDynamicFactory.h"
-
-
 EntityDynamicPointer interfaceDynamicFactory(EntityDynamicType type, const QUuid& id, EntityItemPointer ownerEntity) {
     switch (type) {
         case DYNAMIC_TYPE_NONE:

interface/src/InterfaceParentFinder.cpp

@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "InterfaceParentFinder.h"
+
 #include <Application.h>
+#include <AvatarData.h>
+#include <avatar/AvatarManager.h>
 #include <EntityTree.h>
 #include <EntityTreeRenderer.h>
-#include <avatar/AvatarManager.h>
-#include <AvatarData.h>
-
-#include "InterfaceParentFinder.h"
 
 SpatiallyNestableWeakPointer InterfaceParentFinder::find(QUuid parentID, bool& success, SpatialParentTree* entityTree) const {
     SpatiallyNestableWeakPointer parent;

interface/src/LODManager.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LODManager.h"
+
 #include <SettingHandle.h>
 #include <OctreeUtils.h>
 #include <Util.h>
@@ -17,8 +19,6 @@
 #include "ui/DialogsManager.h"
 #include "InterfaceLogging.h"
 
-#include "LODManager.h"
-
 
 Setting::Handle<float> desktopLODDecreaseFPS("desktopLODDecreaseFPS", DEFAULT_DESKTOP_LOD_DOWN_FPS);
 Setting::Handle<float> hmdLODDecreaseFPS("hmdLODDecreaseFPS", DEFAULT_HMD_LOD_DOWN_FPS);

interface/src/LocationBookmarks.cpp

@@ -9,21 +9,16 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LocationBookmarks.h"
+
 #include <QAction>
-#include <QInputDialog>
-#include <QMessageBox>
 #include <QStandardPaths>
 
 #include <AddressManager.h>
-#include <Application.h>
 #include <OffscreenUi.h>
 
-#include "MainWindow.h"
 #include "Menu.h"
 
-#include "LocationBookmarks.h"
-#include <QtQuick/QQuickWindow>
-
 const QString LocationBookmarks::HOME_BOOKMARK = "Home";
 
 LocationBookmarks::LocationBookmarks() {

interface/src/LocationBookmarks.h

@@ -13,6 +13,7 @@
 #define hifi_LocationBookmarks_h
 
 #include <DependencyManager.h>
+
 #include "Bookmarks.h"
 
 class LocationBookmarks : public Bookmarks, public  Dependency  {

interface/src/Menu.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Menu.h"
+
 #include <QFileDialog>
 #include <QMenuBar>
 #include <QShortcut>
@@ -52,8 +54,6 @@
 #include "SpeechRecognizer.h"
 #endif
 
-#include "Menu.h"
-
 extern bool DEV_DECIMATE_TEXTURES;
 
 Menu* Menu::getInstance() {

interface/src/ModelPackager.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelPackager.h"
+
 #include <QFile>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -21,8 +23,6 @@
 #include "ModelPropertiesDialog.h"
 #include "InterfaceLogging.h"
 
-#include "ModelPackager.h"
-
 static const int MAX_TEXTURE_SIZE = 1024;
 
 void copyDirectoryContent(QDir& from, QDir& to) {

interface/src/ModelPackager.h

@@ -12,11 +12,15 @@
 #ifndef hifi_ModelPackager_h
 #define hifi_ModelPackager_h
 
+#include <memory>
+
 #include <QFileInfo>
 #include <QVariantHash>
 
 #include "ui/ModelsBrowser.h"
 
+class FBXGeometry;
+
 class ModelPackager : public QObject {
 public:
     static bool package();

interface/src/ModelPropertiesDialog.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelPropertiesDialog.h"
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
@@ -23,8 +25,6 @@
 #include <GLMHelpers.h>
 #include <OffscreenUi.h>
 
-#include "ModelPropertiesDialog.h"
-
 
 ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
                                              const QString& basePath, const FBXGeometry& geometry) :

interface/src/ModelSelector.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelSelector.h"
+
 #include <QDialogButtonBox>
 #include <QComboBox>
 #include <QFileDialog>
@@ -16,8 +18,6 @@
 #include <QPushButton>
 #include <QStandardPaths>
 
-#include "ModelSelector.h"
-
 static const QString AVATAR_HEAD_AND_BODY_STRING = "Avatar Body with Head";
 static const QString AVATAR_ATTACHEMENT_STRING = "Avatar Attachment";
 static const QString ENTITY_MODEL_STRING = "Entity Model";
@@ -82,4 +82,4 @@ void ModelSelector::browse() {
         _browseButton->setText(fileInfo.fileName());
         lastModelBrowseLocation.set(fileInfo.path());
     }
-}
+}

interface/src/SecondaryCamera.cpp

@@ -9,13 +9,16 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Application.h"
 #include "SecondaryCamera.h"
-#include <TextureCache.h>
+
-#include <gpu/Context.h>
-#include <EntityScriptingInterface.h>
 #include <glm/gtx/transform.hpp>
 
+#include <EntityScriptingInterface.h>
+#include <gpu/Context.h>
+#include <TextureCache.h>
+
+#include "Application.h"
+
 using RenderArgsPointer = std::shared_ptr<RenderArgs>;
 
 void MainRenderTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor, bool isDeferred) {    
@@ -213,4 +216,4 @@ void SecondaryCameraRenderTask::build(JobModel& task, const render::Varying& inp
         task.addJob<RenderDeferredTask>("RenderDeferredTask", items);
     }
     task.addJob<EndSecondaryCameraFrame>("EndSecondaryCamera", cachedArg);
-}
+}

interface/src/SecondaryCamera.h

@@ -17,6 +17,8 @@
 #include <render/RenderFetchCullSortTask.h>
 #include <RenderDeferredTask.h>
 #include <RenderForwardTask.h>
+#include <TextureCache.h>
+#include <ViewFrustum.h>
 
 class MainRenderTask {
 public:

interface/src/SpeechRecognizer.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "SpeechRecognizer.h"
+
 #include <QtGlobal>
 #include <QDebug>
 
 #include "InterfaceLogging.h"
-#include "SpeechRecognizer.h"
 
 #if defined(Q_OS_WIN)
 

interface/src/SpeechRecognizer.mm

@@ -16,10 +16,10 @@
 #import <AppKit/NSSpeechRecognizer.h>
 #import <AppKit/NSWorkspace.h>
 
-#include <QDebug>
-
 #include "SpeechRecognizer.h"
 
+#include <QDebug>
+
 @interface SpeechRecognizerDelegate : NSObject <NSSpeechRecognizerDelegate> {
     SpeechRecognizer* _listener;
 }

interface/src/UIUtil.cpp

@@ -9,11 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "UIUtil.h"
+
 #include <QStyle>
 #include <QStyleOptionTitleBar>
 
-#include "UIUtil.h"
-
 int UIUtil::getWindowTitleBarHeight(const QWidget* window) {
     QStyleOptionTitleBar options;
     options.titleBarState = 1;

interface/src/audio/AudioScope.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioScope.h"
+
 #include <qvector2d.h>
 #include <limits>
 
@@ -19,8 +21,6 @@
 #include <gpu/Context.h>
 #include <GLMHelpers.h>
 
-#include "AudioScope.h"
-
 static const unsigned int DEFAULT_FRAMES_PER_SCOPE = 5;
 static const unsigned int MULTIPLIER_SCOPE_HEIGHT = 20;
 static const unsigned int SCOPE_HEIGHT = 2 * 15 * MULTIPLIER_SCOPE_HEIGHT;

interface/src/avatar/AvatarManager.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarManager.h"
+
 #include <string>
 
 #include <QScriptEngine>
@@ -38,7 +40,6 @@
 #include <shared/ConicalViewFrustum.h>
 
 #include "Application.h"
-#include "AvatarManager.h"
 #include "InterfaceLogging.h"
 #include "Menu.h"
 #include "MyAvatar.h"

interface/src/commerce/Ledger.cpp

@@ -9,16 +9,19 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Ledger.h"
+
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QTimeZone>
 #include <QJsonDocument>
-#include "Wallet.h"
+
-#include "Ledger.h"
-#include "CommerceLogging.h"
 #include <NetworkingConstants.h>
 #include <AddressManager.h>
 
+#include "Wallet.h"
+#include "CommerceLogging.h"
+
 // inventory answers {status: 'success', data: {assets: [{id: "guid", title: "name", preview: "url"}....]}}
 // balance answers {status: 'success', data: {balance: integer}}
 // buy and receive_at answer {status: 'success'}

interface/src/commerce/Wallet.cpp

@@ -9,22 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "CommerceLogging.h"
-#include "Ledger.h"
 #include "Wallet.h"
-#include "Application.h"
-#include "ui/SecurityImageProvider.h"
-#include "scripting/HMDScriptingInterface.h"
-#include <ui/TabletScriptingInterface.h>
-
-#include <PathUtils.h>
-#include <OffscreenUi.h>
-#include <AccountManager.h>
-
-#include <QFile>
-#include <QCryptographicHash>
-#include <QQmlContext>
-#include <QBuffer>
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
@@ -33,7 +18,6 @@
 #include <openssl/evp.h>
 #include <openssl/aes.h>
 #include <openssl/ecdsa.h>
-
 // I know, right?  But per https://www.openssl.org/docs/faq.html
 // this avoids OPENSSL_Uplink(00007FF847238000,08): no OPENSSL_Applink
 // at runtime.
@@ -41,6 +25,22 @@
 #include <openssl/applink.c>
 #endif
 
+#include <QFile>
+#include <QCryptographicHash>
+#include <QQmlContext>
+#include <QBuffer>
+
+#include <PathUtils.h>
+#include <OffscreenUi.h>
+#include <AccountManager.h>
+#include <ui/TabletScriptingInterface.h>
+
+#include "Application.h"
+#include "CommerceLogging.h"
+#include "Ledger.h"
+#include "ui/SecurityImageProvider.h"
+#include "scripting/HMDScriptingInterface.h"
+
 static const char* KEY_FILE = "hifikey";
 static const char* INSTRUCTIONS_FILE = "backup_instructions.html";
 static const char* IMAGE_HEADER = "-----BEGIN SECURITY IMAGE-----\n";

interface/src/networking/CloseEventSender.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "CloseEventSender.h"
+
 #include <QtCore/QDateTime>
 #include <QtCore/QEventLoop>
 #include <QtCore/QJsonDocument>
@@ -22,8 +24,6 @@
 #include <UserActivityLogger.h>
 #include <UUID.h>
 
-#include "CloseEventSender.h"
-
 QNetworkRequest createNetworkRequest() {
 
     QNetworkRequest request;

interface/src/octree/OctreePacketProcessor.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OctreePacketProcessor.h"
+
 #include <PerfStat.h>
 
 #include "Application.h"
 #include "Menu.h"
-#include "OctreePacketProcessor.h"
 #include "SceneScriptingInterface.h"
 
 OctreePacketProcessor::OctreePacketProcessor() {

interface/src/scripting/AccountServicesScriptingInterface.cpp

@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AccountServicesScriptingInterface.h"
+
 #include "AccountManager.h"
 #include "Application.h"
 #include "DiscoverabilityManager.h"
 #include "ResourceCache.h"
 
-#include "AccountServicesScriptingInterface.h"
-
 AccountServicesScriptingInterface::AccountServicesScriptingInterface() {
     auto accountManager = DependencyManager::get<AccountManager>();
     connect(accountManager.data(), &AccountManager::usernameChanged, this, &AccountServicesScriptingInterface::onUsernameChanged);

interface/src/scripting/AccountServicesScriptingInterface.h

@@ -18,6 +18,8 @@
 #include <QScriptValue>
 #include <QString>
 #include <QStringList>
+
+#include <AccountManager.h>
 #include <DiscoverabilityManager.h>
 
 class DownloadInfoResult {

interface/src/scripting/AudioDevices.cpp

@@ -9,18 +9,17 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioDevices.h"
+
 #include <map>
 #include <algorithm>
 
 #include <shared/QtHelpers.h>
 #include <plugins/DisplayPlugin.h>
 
-#include "AudioDevices.h"
-
 #include "Application.h"
 #include "AudioClient.h"
 #include "Audio.h"
-
 #include "UserActivityLogger.h"
 
 using namespace scripting;

interface/src/scripting/GooglePolyScriptingInterface.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "GooglePolyScriptingInterface.h"
+
 #include <QEventLoop>
 #include <QtGlobal>
 #include <QJsonArray>
@@ -20,9 +22,7 @@
 #include <QString>
 #include <QTime>
 #include <QUrl>
-#include <random>
 
-#include "GooglePolyScriptingInterface.h"
 #include "ScriptEngineLogging.h"
 
 const QString LIST_POLY_URL = "https://poly.googleapis.com/v1/assets?";

interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp

@@ -9,13 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LimitlessVoiceRecognitionScriptingInterface.h"
+
 #include <QtConcurrent/QtConcurrentRun>
 
 #include <ThreadHelpers.h>
-#include <src/InterfaceLogging.h>
-#include <src/ui/AvatarInputs.h>
 
-#include "LimitlessVoiceRecognitionScriptingInterface.h"
+#include "InterfaceLogging.h"
+#include "ui/AvatarInputs.h"
 
 const float LimitlessVoiceRecognitionScriptingInterface::_audioLevelThreshold = 0.33f;
 const int LimitlessVoiceRecognitionScriptingInterface::_voiceTimeoutDuration = 2000;

interface/src/ui/DomainConnectionDialog.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DomainConnectionDialog.h"
+
 #include <QtCore/QMetaEnum>
 #include <QtWidgets/QHBoxLayout>
 #include <QtWidgets/QHeaderView>
@@ -17,8 +19,6 @@
 #include <NodeList.h>
 #include <NumericalConstants.h>
 
-#include "DomainConnectionDialog.h"
-
 DomainConnectionDialog::DomainConnectionDialog(QWidget* parent) :
     QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint)
 {

interface/src/ui/HMDToolsDialog.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "HMDToolsDialog.h"
+
 #include <QDesktopWidget>
 #include <QDialogButtonBox>
 #include <QFormLayout>
@@ -25,8 +27,7 @@
 #include "Application.h"
 #include "MainWindow.h"
 #include "Menu.h"
-#include "ui/DialogsManager.h"
+#include "DialogsManager.h"
-#include "ui/HMDToolsDialog.h"
 
 static const int WIDTH = 350;
 static const int HEIGHT = 100;

interface/src/ui/LodToolsDialog.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LodToolsDialog.h"
+
 #include <QCheckBox>
 #include <QColor>
 #include <QDialogButtonBox>
@@ -23,7 +25,6 @@
 #include <LODManager.h>
 
 #include "Menu.h"
-#include "ui/LodToolsDialog.h"
 
 
 LodToolsDialog::LodToolsDialog(QWidget* parent) :

interface/src/ui/ModelsBrowser.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelsBrowser.h"
+
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QGridLayout>
@@ -27,8 +29,6 @@
 #include <NetworkAccessManager.h>
 #include <SharedUtil.h>
 
-#include "ModelsBrowser.h"
-
 const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "skeletons", "attachments" };
 
 static const QString S3_URL = "http://s3.amazonaws.com/hifi-public";

interface/src/ui/OctreeStatsDialog.cpp

@@ -9,20 +9,19 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OctreeStatsDialog.h"
+
 #include <sstream>
 
 #include <QFormLayout>
 #include <QDialogButtonBox>
-
 #include <QPalette>
 #include <QColor>
 
 #include <OctreeSceneStats.h>
 
 #include "Application.h"
-
 #include "../octree/OctreePacketProcessor.h"
-#include "ui/OctreeStatsDialog.h"
 
 OctreeStatsDialog::OctreeStatsDialog(QWidget* parent, NodeToOctreeSceneStats* model) :
     QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint),

interface/src/ui/OctreeStatsDialog.h

@@ -19,7 +19,6 @@
 #include <OctreeSceneStats.h>
 
 #define MAX_STATS 100
-#define DEFAULT_COLOR 0
 
 class OctreeStatsDialog : public QDialog {
     Q_OBJECT
@@ -42,7 +41,7 @@ protected:
     // Emits a 'closed' signal when this dialog is closed.
     void closeEvent(QCloseEvent*) override;
 
-    int AddStatItem(const char* caption, unsigned colorRGBA = DEFAULT_COLOR);
+    int AddStatItem(const char* caption, unsigned colorRGBA = 0);
     void RemoveStatItem(int item);
     void showAllOctreeServers();
 

interface/src/ui/OctreeStatsProvider.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Application.h"
+#include "OctreeStatsProvider.h"
 
-#include "../octree/OctreePacketProcessor.h"
+#include "Application.h"
-#include "ui/OctreeStatsProvider.h"
+#include "octree/OctreePacketProcessor.h"
 
 OctreeStatsProvider::OctreeStatsProvider(QObject* parent, NodeToOctreeSceneStats* model) :
     QObject(parent),

interface/src/ui/OverlayConductor.cpp

@@ -8,13 +8,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OverlayConductor.h"
+
 #include <OffscreenUi.h>
 #include <display-plugins/CompositorHelper.h>
 
 #include "Application.h"
 #include "avatar/AvatarManager.h"
 #include "InterfaceLogging.h"
-#include "OverlayConductor.h"
 
 OverlayConductor::OverlayConductor() {
 

interface/src/ui/OverlayConductor.h

@@ -11,6 +11,8 @@
 #ifndef hifi_OverlayConductor_h
 #define hifi_OverlayConductor_h
 
+#include <cstdint>
+
 class OverlayConductor {
 public:
     OverlayConductor();
@@ -34,12 +36,12 @@ private:
     bool _hmdMode { false };
 
     // used by updateAvatarHasDriveInput
-    quint64 _desiredDrivingTimer { 0 };
+    uint64_t _desiredDrivingTimer { 0 };
     bool _desiredDriving { false };
     bool _currentDriving { false };
 
     // used by updateAvatarIsAtRest
-    quint64 _desiredAtRestTimer { 0 };
+    uint64_t _desiredAtRestTimer { 0 };
     bool _desiredAtRest { true };
     bool _currentAtRest { true };
 };

interface/src/ui/Snapshot.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Snapshot.h"
+
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -31,7 +33,6 @@
 #include <SharedUtil.h>
 
 #include "Application.h"
-#include "Snapshot.h"
 #include "SnapshotUploader.h"
 
 // filename format: hifi-snap-by-%username%-on-%date%_%time%_@-%location%.jpg

interface/src/ui/Snapshot.h

@@ -16,6 +16,7 @@
 
 #include <QString>
 #include <QStandardPaths>
+#include <QUrl>
 
 #include <SettingHandle.h>
 #include <DependencyManager.h>

interface/src/ui/SnapshotAnimated.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "SnapshotAnimated.h"
+
 #include <QtCore/QDateTime>
 #include <QtCore/QObject>
 #include <QtCore/QString>
@@ -16,7 +18,6 @@
 #include <QtConcurrent/QtConcurrentRun>
 
 #include <plugins/DisplayPlugin.h>
-#include "SnapshotAnimated.h"
 
 QTimer* SnapshotAnimated::snapshotAnimatedTimer = NULL;
 qint64 SnapshotAnimated::snapshotAnimatedTimestamp = 0;

interface/src/ui/SnapshotUploader.cpp

@@ -9,11 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "SnapshotUploader.h"
+
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>
+
 #include <AddressManager.h>
+
 #include "scripting/WindowScriptingInterface.h"
-#include "SnapshotUploader.h"
 
 SnapshotUploader::SnapshotUploader(QUrl inWorldLocation, QString pathname) :
     _inWorldLocation(inWorldLocation),

interface/src/ui/StandAloneJSConsole.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "StandAloneJSConsole.h"
+
 #include <QMainWindow>
 #include <QDialog>
 #include <QVBoxLayout>
@@ -16,8 +18,6 @@
 #include <Application.h>
 #include <MainWindow.h>
 
-#include "StandAloneJSConsole.h"
-
 void StandAloneJSConsole::toggleConsole()  {
     QMainWindow* mainWindow = qApp->getWindow();
     if (!_jsConsole) {

interface/src/ui/TestingDialog.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ScriptEngines.h"
+#include "TestingDialog.h"
 
-#include "ui/TestingDialog.h"
 #include "Application.h"
+#include "ScriptEngines.h"
 
 TestingDialog::TestingDialog(QWidget* parent) :
     QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint),

interface/src/ui/overlays/ModelOverlay.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelOverlay.h"
+
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/transform.hpp>
 
-#include "ModelOverlay.h"
 #include <Rig.h>
 
 #include "Application.h"

libraries/animation/src/AnimClip.cpp

@@ -8,8 +8,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "GLMHelpers.h"
 #include "AnimClip.h"
+
+#include "GLMHelpers.h"
 #include "AnimationLogging.h"
 #include "AnimUtil.h"
 

libraries/animation/src/AnimExpression.cpp

@@ -8,10 +8,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <StreamUtils.h>
+#include "AnimExpression.h"
+
 #include <QRegExp>
 
-#include "AnimExpression.h"
+#include <StreamUtils.h>
+
 #include "AnimationLogging.h"
 
 AnimExpression::AnimExpression(const QString& str) :

libraries/animation/src/AnimNode.cpp

@@ -8,9 +8,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QtGlobal>
 #include "AnimNode.h"
 
+#include <QtGlobal>
+
 AnimNode::Pointer AnimNode::getParent() {
     return _parent.lock();
 }

libraries/animation/src/AnimNodeLoader.cpp

@@ -8,6 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AnimNodeLoader.h"
+
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -19,7 +21,6 @@
 #include "AnimBlendLinearMove.h"
 #include "AnimationLogging.h"
 #include "AnimOverlay.h"
-#include "AnimNodeLoader.h"
 #include "AnimStateMachine.h"
 #include "AnimManipulator.h"
 #include "AnimInverseKinematics.h"

libraries/animation/src/AnimVariant.cpp

@@ -1,5 +1,5 @@
 //
-//  AnimVariantMap.cpp
+//  AnimVariant.cpp
 //  library/animation
 //
 //  Created by Howard Stearns on 10/15/15.
@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AnimVariant.h" // which has AnimVariant/AnimVariantMap
+
 #include <QScriptEngine>
 #include <QScriptValueIterator>
 #include <QThread>
 #include <RegisteredMetaTypes.h>
-#include "AnimVariant.h" // which has AnimVariant/AnimVariantMap
 
 const AnimVariant AnimVariant::False = AnimVariant();
 

libraries/animation/src/AnimationObject.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AnimationObject.h"
+
 #include <QScriptEngine>
 
 #include "AnimationCache.h"
-#include "AnimationObject.h"
 
 QStringList AnimationObject::getJointNames() const {
     return qscriptvalue_cast<AnimationPointer>(thisObject())->getJointNames();

libraries/audio-client/src/AudioClient.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioClient.h"
+
 #include <cstring>
 #include <math.h>
 #include <sys/stat.h>
@@ -50,8 +52,6 @@
 #include "AudioLogging.h"
 #include "AudioHelpers.h"
 
-#include "AudioClient.h"
-
 const int AudioClient::MIN_BUFFER_FRAMES = 1;
 
 const int AudioClient::MAX_BUFFER_FRAMES = 20;

libraries/audio-client/src/AudioIOStats.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioIOStats.h"
+
 #include <AudioConstants.h>
 #include <MixedProcessedAudioStream.h>
 #include <NodeList.h>
@@ -16,8 +18,6 @@
 
 #include "AudioClient.h"
 
-#include "AudioIOStats.h"
-
 // This is called 1x/sec (see AudioClient) and we want it to log the last 5s
 static const int INPUT_READS_WINDOW = 5;
 static const int INPUT_UNPLAYED_WINDOW = 5;

libraries/audio/src/AudioFOA.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioFOA.h"
+
 #include <string.h>
 #include <assert.h>
 
-#include "AudioFOA.h"
 #include "AudioFOAData.h"
 
 #if defined(_MSC_VER)

libraries/audio/src/AudioGate.cpp

@@ -6,12 +6,13 @@
 //  Copyright 2017 High Fidelity, Inc.
 //
 
+#include "AudioGate.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
 
 #include "AudioDynamics.h"
-#include "AudioGate.h"
 
 // log2 domain headroom bits above 0dB (int32_t)
 static const int LOG2_HEADROOM_Q30 = 1;

libraries/audio/src/AudioHRTF.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioHRTF.h"
+
 #include <math.h>
 #include <string.h>
 #include <assert.h>
 
-#include "AudioHRTF.h"
 #include "AudioHRTFData.h"
 
 #if defined(_MSC_VER)

libraries/audio/src/AudioLimiter.cpp

@@ -6,10 +6,11 @@
 //  Copyright 2016 High Fidelity, Inc.
 //
 
+#include "AudioLimiter.h"
+
 #include <assert.h>
 
 #include "AudioDynamics.h"
-#include "AudioLimiter.h"
 
 //
 // Limiter (common)

libraries/audio/src/AudioReverb.cpp

@@ -6,12 +6,12 @@
 //  Copyright 2015 High Fidelity, Inc.
 //
 
+#include "AudioReverb.h"
+
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
 
-#include "AudioReverb.h"
-
 #ifdef _MSC_VER
 #include <intrin.h>
 #define MULHI(a,b)  ((int32_t)(__emul(a, b) >> 32))

libraries/audio/src/AudioRingBuffer.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioRingBuffer.h"
+
 #include <cstdlib>
 #include <cstring>
 #include <functional>
@@ -21,8 +23,6 @@
 
 #include "AudioLogging.h"
 
-#include "AudioRingBuffer.h"
-
 static const QString RING_BUFFER_OVERFLOW_DEBUG { "AudioRingBuffer::writeData has overflown the buffer. Overwriting old data." };
 static const QString DROPPED_SILENT_DEBUG { "AudioRingBuffer::addSilentSamples dropping silent samples to prevent overflow." };
 

libraries/audio/src/AudioSRC.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioSRC.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "AudioSRC.h"
 #include "AudioSRCData.h"
 
 #ifndef MAX

libraries/audio/src/InboundAudioStream.cpp

@@ -9,13 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "InboundAudioStream.h"
+
 #include <glm/glm.hpp>
 
 #include <NLPacket.h>
 #include <Node.h>
 #include <NodeList.h>
 
-#include "InboundAudioStream.h"
 #include "AudioLogging.h"
 
 const bool InboundAudioStream::DEFAULT_DYNAMIC_JITTER_BUFFER_ENABLED = true;

libraries/audio/src/InjectedAudioStream.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "InjectedAudioStream.h"
+
 #include <cstring>
 
 #include <QtCore/QDataStream>
@@ -17,7 +19,6 @@
 #include <udt/PacketHeaders.h>
 #include <UUID.h>
 
-#include "InjectedAudioStream.h"
 #include "AudioHelpers.h"
 
 InjectedAudioStream::InjectedAudioStream(const QUuid& streamIdentifier, bool isStereo, int numStaticJitterFrames) :

libraries/audio/src/Sound.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Sound.h"
+
 #include <stdint.h>
 
 #include <glm/glm.hpp>
@@ -29,8 +31,6 @@
 #include "AudioLogging.h"
 #include "AudioSRC.h"
 
-#include "Sound.h"
-
 QScriptValue soundSharedPointerToScriptValue(QScriptEngine* engine, const SharedSoundPointer& in) {
     return engine->newQObject(new SoundScriptingInterface(in), QScriptEngine::ScriptOwnership);
 }

libraries/avatars/src/AvatarHashMap.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarHashMap.h"
+
 #include <QtCore/QDataStream>
 
 #include <NodeList.h>
@@ -17,7 +19,6 @@
 #include <SharedUtil.h>
 
 #include "AvatarLogging.h"
-#include "AvatarHashMap.h"
 
 AvatarHashMap::AvatarHashMap() {
     auto nodeList = DependencyManager::get<NodeList>();

libraries/baking/src/Baker.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ModelBakingLoggingCategory.h"
-
 #include "Baker.h"
 
+#include "ModelBakingLoggingCategory.h"
+
 bool Baker::shouldStop() {
     if (_shouldAbort) {
         setWasAborted(true);

libraries/baking/src/FBXBaker.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "FBXBaker.h"
+
 #include <cmath> // need this include so we don't get an error looking for std::isnan
 
 #include <QtConcurrent>
@@ -31,8 +33,6 @@
 #include "ModelBakingLoggingCategory.h"
 #include "TextureBaker.h"
 
-#include "FBXBaker.h"
-
 void FBXBaker::bake() {    
     qDebug() << "FBXBaker" << _modelURL << "bake starting";
 
@@ -70,13 +70,6 @@ void FBXBaker::bakeSourceCopy() {
         return;
     }
 
-    // export the FBX with re-written texture references
-    exportScene();
-
-    if (shouldStop()) {
-        return;
-    }
-
     // check if we're already done with textures (in case we had none to re-write)
     checkIfTexturesFinished();
 }
@@ -352,27 +345,3 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
         }
     }
 }
-
-void FBXBaker::exportScene() {
-    // save the relative path to this FBX inside our passed output folder
-    auto fileName = _modelURL.fileName();
-    auto baseName = fileName.left(fileName.lastIndexOf('.'));
-    auto bakedFilename = baseName + BAKED_FBX_EXTENSION;
-
-    _bakedModelFilePath = _bakedOutputDir + "/" + bakedFilename;
-
-    auto fbxData = FBXWriter::encodeFBX(_rootNode);
-
-    QFile bakedFile(_bakedModelFilePath);
-
-    if (!bakedFile.open(QIODevice::WriteOnly)) {
-        handleError("Error opening " + _bakedModelFilePath + " for writing");
-        return;
-    }
-
-    bakedFile.write(fbxData);
-
-    _outputFiles.push_back(_bakedModelFilePath);
-
-    qCDebug(model_baking) << "Exported" << _modelURL << "with re-written paths to" << _bakedModelFilePath;
-}

libraries/baking/src/FBXBaker.h

@@ -26,8 +26,6 @@
 
 #include <FBX.h>
 
-static const QString BAKED_FBX_EXTENSION = ".baked.fbx";
-
 using TextureBakerThreadGetter = std::function<QThread*()>;
 
 class FBXBaker : public ModelBaker {
@@ -51,11 +49,11 @@ private:
     void loadSourceFBX();
 
     void importScene();
+    void embedTextureMetaData();
     void rewriteAndBakeSceneModels();
     void rewriteAndBakeSceneTextures();
     void exportScene();
 
-    FBXNode _rootNode;
     FBXGeometry* _geometry;
     QHash<QString, int> _textureNameMatchCount;
     QHash<QUrl, QString> _remappedTexturePaths;

libraries/baking/src/JSBaker.cpp

@@ -9,9 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "JSBaker.h"
+
 #include <PathUtils.h>
 
-#include "JSBaker.h"
 #include "Baker.h"
 
 const int ASCII_CHARACTERS_UPPER_LIMIT = 126;

libraries/baking/src/JSBaker.h

@@ -12,6 +12,8 @@
 #ifndef hifi_JSBaker_h
 #define hifi_JSBaker_h
 
+#include <QUrl>
+
 #include "Baker.h"
 #include "JSBakingLoggingCategory.h"
 

libraries/baking/src/ModelBaker.cpp

@@ -246,9 +246,9 @@ bool ModelBaker::compressMesh(FBXMesh& mesh, bool hasDeformers, FBXNode& dracoMe
 
 QString ModelBaker::compressTexture(QString modelTextureFileName, image::TextureUsage::Type textureType) {
 
-    QFileInfo modelTextureFileInfo{ modelTextureFileName.replace("\\", "/") };
+    QFileInfo modelTextureFileInfo { modelTextureFileName.replace("\\", "/") };
     
-    if (modelTextureFileInfo.suffix() == BAKED_TEXTURE_EXT.mid(1)) {
+    if (modelTextureFileInfo.suffix().toLower() == BAKED_TEXTURE_KTX_EXT.mid(1)) {
         // re-baking a model that already references baked textures
         // this is an error - return from here
         handleError("Cannot re-bake a file that already references compressed textures");
@@ -273,31 +273,31 @@ QString ModelBaker::compressTexture(QString modelTextureFileName, image::Texture
         }
         auto urlToTexture = getTextureURL(modelTextureFileInfo, modelTextureFileName, !textureContent.isNull());
 
-        QString bakedTextureFileName;
+        QString baseTextureFileName;
         if (_remappedTexturePaths.contains(urlToTexture)) {
-            bakedTextureFileName = _remappedTexturePaths[urlToTexture];
+            baseTextureFileName = _remappedTexturePaths[urlToTexture];
         } else {
             // construct the new baked texture file name and file path
             // ensuring that the baked texture will have a unique name
             // even if there was another texture with the same name at a different path
-            bakedTextureFileName = createBakedTextureFileName(modelTextureFileInfo);
+            baseTextureFileName = createBaseTextureFileName(modelTextureFileInfo);
-            _remappedTexturePaths[urlToTexture] = bakedTextureFileName;
+            _remappedTexturePaths[urlToTexture] = baseTextureFileName;
         }
 
         qCDebug(model_baking).noquote() << "Re-mapping" << modelTextureFileName
-            << "to" << bakedTextureFileName;
+            << "to" << baseTextureFileName;
 
-        QString bakedTextureFilePath{
+        QString bakedTextureFilePath {
-            _bakedOutputDir + "/" + bakedTextureFileName
+            _bakedOutputDir + "/" + baseTextureFileName + BAKED_META_TEXTURE_SUFFIX
         };
 
-        textureChild = bakedTextureFileName;
+        textureChild = baseTextureFileName + BAKED_META_TEXTURE_SUFFIX;
 
         if (!_bakingTextures.contains(urlToTexture)) {
             _outputFiles.push_back(bakedTextureFilePath);
 
             // bake this texture asynchronously
-            bakeTexture(urlToTexture, textureType, _bakedOutputDir, bakedTextureFileName, textureContent);
+            bakeTexture(urlToTexture, textureType, _bakedOutputDir, baseTextureFileName, textureContent);
         }
     }
    
@@ -309,7 +309,7 @@ void ModelBaker::bakeTexture(const QUrl& textureURL, image::TextureUsage::Type t
     
     // start a bake for this texture and add it to our list to keep track of
     QSharedPointer<TextureBaker> bakingTexture{
-        new TextureBaker(textureURL, textureType, outputDir, bakedFilename, textureContent),
+        new TextureBaker(textureURL, textureType, outputDir, "../", bakedFilename, textureContent),
         &TextureBaker::deleteLater
     };
     
@@ -484,30 +484,30 @@ void ModelBaker::checkIfTexturesFinished() {
         } else {
             qCDebug(model_baking) << "Finished baking, emitting finished" << _modelURL;
 
+            texturesFinished();
+
             setIsFinished(true);
         }
     }
 }
 
-QString ModelBaker::createBakedTextureFileName(const QFileInfo& textureFileInfo) {
+QString ModelBaker::createBaseTextureFileName(const QFileInfo& textureFileInfo) {
     // first make sure we have a unique base name for this texture
     // in case another texture referenced by this model has the same base name
     auto& nameMatches = _textureNameMatchCount[textureFileInfo.baseName()];
 
-    QString bakedTextureFileName{ textureFileInfo.completeBaseName() };
+    QString baseTextureFileName{ textureFileInfo.completeBaseName() };
 
     if (nameMatches > 0) {
         // there are already nameMatches texture with this name
         // append - and that number to our baked texture file name so that it is unique
-        bakedTextureFileName += "-" + QString::number(nameMatches);
+        baseTextureFileName += "-" + QString::number(nameMatches);
     }
 
-    bakedTextureFileName += BAKED_TEXTURE_EXT;
-
     // increment the number of name matches
     ++nameMatches;
 
-    return bakedTextureFileName;
+    return baseTextureFileName;
 }
 
 void ModelBaker::setWasAborted(bool wasAborted) {
@@ -519,3 +519,91 @@ void ModelBaker::setWasAborted(bool wasAborted) {
         }
     }
 }
+
+void ModelBaker::texturesFinished() {
+    embedTextureMetaData();
+    exportScene();
+}
+
+void ModelBaker::embedTextureMetaData() {
+    std::vector<FBXNode> embeddedTextureNodes;
+
+    for (FBXNode& rootChild : _rootNode.children) {
+        if (rootChild.name == "Objects") {
+            qlonglong maxId = 0;
+            for (auto &child : rootChild.children) {
+                if (child.properties.length() == 3) {
+                    maxId = std::max(maxId, child.properties[0].toLongLong());
+                }
+            }
+
+            for (auto& object : rootChild.children) {
+                if (object.name == "Texture") {
+                    QVariant relativeFilename;
+                    for (auto& child : object.children) {
+                        if (child.name == "RelativeFilename") {
+                            relativeFilename = child.properties[0];
+                            break;
+                        }
+                    }
+
+                    if (relativeFilename.isNull()
+                        || !relativeFilename.toString().endsWith(BAKED_META_TEXTURE_SUFFIX)) {
+                        continue;
+                    }
+                    if (object.properties.length() < 2) {
+                        qWarning() << "Found texture with unexpected number of properties: " << object.name;
+                        continue;
+                    }
+
+                    FBXNode videoNode;
+                    videoNode.name = "Video";
+                    videoNode.properties.append(++maxId);
+                    videoNode.properties.append(object.properties[1]);
+                    videoNode.properties.append("Clip");
+
+                    QString bakedTextureFilePath {
+                        _bakedOutputDir + "/" + relativeFilename.toString()
+                    };
+
+                    QFile textureFile { bakedTextureFilePath };
+                    if (!textureFile.open(QIODevice::ReadOnly)) {
+                        qWarning() << "Failed to open: " << bakedTextureFilePath;
+                        continue;
+                    }
+
+                    videoNode.children.append({ "RelativeFilename", { relativeFilename }, { } });
+                    videoNode.children.append({ "Content", { textureFile.readAll() }, { } });
+
+                    rootChild.children.append(videoNode);
+
+                    textureFile.close();
+                }
+            }
+        }
+    }
+}
+
+void ModelBaker::exportScene() {
+    // save the relative path to this FBX inside our passed output folder
+    auto fileName = _modelURL.fileName();
+    auto baseName = fileName.left(fileName.lastIndexOf('.'));
+    auto bakedFilename = baseName + BAKED_FBX_EXTENSION;
+
+    _bakedModelFilePath = _bakedOutputDir + "/" + bakedFilename;
+
+    auto fbxData = FBXWriter::encodeFBX(_rootNode);
+
+    QFile bakedFile(_bakedModelFilePath);
+
+    if (!bakedFile.open(QIODevice::WriteOnly)) {
+        handleError("Error opening " + _bakedModelFilePath + " for writing");
+        return;
+    }
+
+    bakedFile.write(fbxData);
+
+    _outputFiles.push_back(_bakedModelFilePath);
+
+    qCDebug(model_baking) << "Exported" << _modelURL << "with re-written paths to" << _bakedModelFilePath;
+}

libraries/baking/src/ModelBaker.h

@@ -29,6 +29,8 @@
 using TextureBakerThreadGetter = std::function<QThread*()>;
 using GetMaterialIDCallback = std::function <int(int)>;
 
+static const QString BAKED_FBX_EXTENSION = ".baked.fbx";
+
 class ModelBaker : public Baker {
     Q_OBJECT
 
@@ -49,7 +51,11 @@ public slots:
 
 protected:
     void checkIfTexturesFinished();
+    void texturesFinished();
+    void embedTextureMetaData();
+    void exportScene();
     
+    FBXNode _rootNode;
     QHash<QByteArray, QByteArray> _textureContentMap;
     QUrl _modelURL;
     QString _bakedOutputDir;
@@ -63,7 +69,7 @@ private slots:
     void handleAbortedTexture();
 
 private:
-    QString createBakedTextureFileName(const QFileInfo & textureFileInfo);
+    QString createBaseTextureFileName(const QFileInfo & textureFileInfo);
     QUrl getTextureURL(const QFileInfo& textureFileInfo, QString relativeFileName, bool isEmbedded = false);
     void bakeTexture(const QUrl & textureURL, image::TextureUsage::Type textureType, const QDir & outputDir, 
                      const QString & bakedFilename, const QByteArray & textureContent);

libraries/baking/src/OBJBaker.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OBJBaker.h"
+
 #include <PathUtils.h>
 #include <NetworkAccessManager.h>
 
-#include "OBJBaker.h"
 #include "OBJReader.h"
 #include "FBXWriter.h"
 
@@ -147,31 +148,7 @@ void OBJBaker::bakeOBJ() {
     auto geometry = reader.readOBJ(objData, QVariantHash(), combineParts, _modelURL);
 
     // Write OBJ Data as FBX tree nodes
-    FBXNode rootNode;
+    createFBXNodeTree(_rootNode, *geometry);
-    createFBXNodeTree(rootNode, *geometry);
-
-    // Serialize the resultant FBX tree
-    auto encodedFBX = FBXWriter::encodeFBX(rootNode);
-
-    // Export as baked FBX
-    auto fileName = _modelURL.fileName();
-    auto baseName = fileName.left(fileName.lastIndexOf('.'));
-    auto bakedFilename = baseName + ".baked.fbx";
-
-    _bakedModelFilePath = _bakedOutputDir + "/" + bakedFilename;
-
-    QFile bakedFile;
-    bakedFile.setFileName(_bakedModelFilePath);
-    if (!bakedFile.open(QIODevice::WriteOnly)) {
-        handleError("Error opening " + _bakedModelFilePath + " for writing");
-        return;
-    }
-
-    bakedFile.write(encodedFBX);
-
-    // Export successful
-    _outputFiles.push_back(_bakedModelFilePath);
-    qCDebug(model_baking) << "Exported" << _modelURL << "to" << _bakedModelFilePath;
 
     checkIfTexturesFinished();
 }
@@ -203,15 +180,17 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
     globalSettingsNode.children = { properties70Node };
 
     // Generating Object node
-    _objectNode.name = OBJECTS_NODE_NAME;
+    FBXNode objectNode;
+    objectNode.name = OBJECTS_NODE_NAME;
 
     // Generating Object node's child - Geometry node 
     FBXNode geometryNode;
     geometryNode.name = GEOMETRY_NODE_NAME;
+    NodeID geometryID;
     {
-        _geometryID = nextNodeID();
+        geometryID = nextNodeID();
         geometryNode.properties = {
-            _geometryID,
+            geometryID,
             GEOMETRY_NODE_NAME,
             MESH
         };
@@ -226,12 +205,13 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
     // Generating Object node's child - Model node
     FBXNode modelNode;
     modelNode.name = MODEL_NODE_NAME;
+    NodeID modelID;
     {
-        _modelID = nextNodeID();
+        modelID = nextNodeID();
-        modelNode.properties = { _modelID, MODEL_NODE_NAME, MESH };
+        modelNode.properties = { modelID, MODEL_NODE_NAME, MESH };
     }
 
-    _objectNode.children = { geometryNode, modelNode };
+    objectNode.children = { geometryNode, modelNode };
 
     // Generating Objects node's child - Material node
     auto& meshParts = geometry.meshes[0].parts;
@@ -247,7 +227,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
             setMaterialNodeProperties(materialNode, meshPart.materialID, geometry);
         }
 
-        _objectNode.children.append(materialNode);
+        objectNode.children.append(materialNode);
     }
 
     // Generating Texture Node
@@ -257,13 +237,13 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
         QString material = meshParts[i].materialID;
         FBXMaterial currentMaterial = geometry.materials[material];
         if (!currentMaterial.albedoTexture.filename.isEmpty() || !currentMaterial.specularTexture.filename.isEmpty()) {
-            _textureID = nextNodeID();
+            auto textureID = nextNodeID();
-            _mapTextureMaterial.emplace_back(_textureID, i);
+            _mapTextureMaterial.emplace_back(textureID, i);
 
             FBXNode textureNode;
             {
                 textureNode.name = TEXTURE_NODE_NAME;
-                textureNode.properties = { _textureID };
+                textureNode.properties = { textureID, "texture" + QString::number(textureID) };
             }
 
             // Texture node child - TextureName node
@@ -295,7 +275,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
 
             textureNode.children = { textureNameNode, relativeFilenameNode };
 
-            _objectNode.children.append(textureNode);
+            objectNode.children.append(textureNode);
         }
     }
 
@@ -306,14 +286,14 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
     // connect Geometry to Model 
     FBXNode cNode;
     cNode.name = C_NODE_NAME;
-    cNode.properties = { CONNECTIONS_NODE_PROPERTY, _geometryID, _modelID };
+    cNode.properties = { CONNECTIONS_NODE_PROPERTY, geometryID, modelID };
     connectionsNode.children = { cNode };
 
     // connect all materials to model
     for (auto& materialID : _materialIDs) {
         FBXNode cNode;
         cNode.name = C_NODE_NAME;
-        cNode.properties = { CONNECTIONS_NODE_PROPERTY, materialID, _modelID };
+        cNode.properties = { CONNECTIONS_NODE_PROPERTY, materialID, modelID };
         connectionsNode.children.append(cNode);
     }
 
@@ -341,7 +321,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
     }
 
     // Make all generated nodes children of rootNode
-    rootNode.children = { globalSettingsNode, _objectNode, connectionsNode };
+    rootNode.children = { globalSettingsNode, objectNode, connectionsNode };
 }
 
 // Set properties for material nodes