From f8fe06213d56156687333a28878f36219bf3f45a Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Fri, 23 Feb 2018 09:11:23 -0500
Subject: [PATCH] CR feedback; whitespace / remove unnecessary diffs
---
.../src/graphics-scripting/ScriptableModel.cpp | 4 ++--
libraries/render-utils/src/Model.cpp | 4 ++--
libraries/render-utils/src/Model.h | 3 +--
libraries/render-utils/src/Model_temporary_hack.cpp.h | 1 +
libraries/script-engine/src/AssetScriptingInterface.cpp | 2 +-
libraries/script-engine/src/ScriptEngines.cpp | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index 306f1b18af..8ceb7de6a2 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -72,7 +72,7 @@ scriptable::ScriptableModelPointer scriptable::ScriptableModel::cloneModel(const
const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getConstMeshes() const {
QVector<scriptable::ScriptableMeshPointer> out;
- for(const auto& mesh : meshes) {
+ for (const auto& mesh : meshes) {
const scriptable::ScriptableMesh* m = qobject_cast<const scriptable::ScriptableMesh*>(&mesh);
if (!m) {
m = scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh);
@@ -87,7 +87,7 @@ const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::ge
QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshes() {
QVector<scriptable::ScriptableMeshPointer> out;
- for(auto& mesh : meshes) {
+ for (auto& mesh : meshes) {
scriptable::ScriptableMesh* m = qobject_cast<scriptable::ScriptableMesh*>(&mesh);
if (!m) {
m = scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index a083b027f3..6d735497c0 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -24,9 +24,9 @@
#include <PerfStat.h>
#include <ViewFrustum.h>
#include <GLMHelpers.h>
-#include <model-networking/SimpleMeshProxy.h>
#include <TBBHelpers.h>
+#include <model-networking/SimpleMeshProxy.h>
#include <graphics-scripting/Forward.h>
#include <graphics/BufferViewHelpers.h>
#include <DualQuaternion.h>
@@ -885,7 +885,7 @@ void Model::renderDebugMeshBoxes(gpu::Batch& batch) {
DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch, false, false, false, true, true);
- for(const auto& triangleSet : _modelSpaceMeshTriangleSets) {
+ for (const auto& triangleSet : _modelSpaceMeshTriangleSets) {
auto box = triangleSet.getBounds();
if (_debugMeshBoxesID == GeometryCache::UNKNOWN_ID) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 603153d535..b3c7551eb3 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -317,13 +317,12 @@ public:
int getResourceDownloadAttempts() { return _renderWatcher.getResourceDownloadAttempts(); }
int getResourceDownloadAttemptsRemaining() { return _renderWatcher.getResourceDownloadAttemptsRemaining(); }
+ Q_INVOKABLE MeshProxyList getMeshes() const;
virtual scriptable::ScriptableModelBase getScriptableModel() override;
virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
void scaleToFit();
- Q_INVOKABLE MeshProxyList getMeshes() const;
-
void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
diff --git a/libraries/render-utils/src/Model_temporary_hack.cpp.h b/libraries/render-utils/src/Model_temporary_hack.cpp.h
index 51318656e0..cfa6945571 100644
--- a/libraries/render-utils/src/Model_temporary_hack.cpp.h
+++ b/libraries/render-utils/src/Model_temporary_hack.cpp.h
@@ -1,3 +1,4 @@
+// FIXME: temporary workaround for duplicating the FBXModel when dynamically replacing an underlying mesh part
#include <graphics/BufferViewHelpers.h>
#include <graphics-scripting/GraphicsScriptingUtil.h>
class MyGeometryResource : public GeometryResource {
diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 750e612781..68c24ecc33 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -440,7 +440,7 @@ void AssetScriptingInterface::saveToCache(const QUrl& rawURL, const QByteArray&
JS_VERIFY(url.scheme() == "atp" || url.scheme() == "cache", "only 'atp' and 'cache' URL schemes supported");
JS_VERIFY(hash.isEmpty() || hash == hashDataHex(data), QString("invalid checksum hash for atp:HASH style URL (%1 != %2)").arg(hash, hashDataHex(data)));
- //qCDebug(scriptengine) << "saveToCache" << url.toDisplayString() << data << hash << metadata;
+ // qCDebug(scriptengine) << "saveToCache" << url.toDisplayString() << data << hash << metadata;
jsPromiseReady(Parent::saveToCache(url, data, metadata), scope, callback);
}
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 873c205706..871705d74b 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -535,7 +535,6 @@ void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) {
}
int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {
- // register our application services and set it off on its own thread
int ii=0;
for (auto initializer : _scriptInitializers) {
ii++;
@@ -554,6 +553,7 @@ void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {
loadScript(scriptName, userLoaded, false, false, true);
});
+ // register our application services and set it off on its own thread
runScriptInitializers(scriptEngine);
// FIXME disabling 'shift key' debugging for now. If you start up the application with