From ef16b83362554bee855193ac35a91eb58a4b4eb2 Mon Sep 17 00:00:00 2001 From: Heather Anderson Date: Sat, 4 Sep 2021 03:23:44 -0700 Subject: [PATCH] patch review and removal of unnecessary differences --- interface/src/avatar/MyAvatar.cpp | 1 - .../AssetMappingsScriptingInterface.cpp | 1 - libraries/animation/CMakeLists.txt | 2 +- libraries/avatars-renderer/CMakeLists.txt | 16 ++++++++-------- libraries/avatars/src/AvatarData.h | 2 +- .../impl/conditionals/ScriptConditional.cpp | 2 -- libraries/entities-renderer/CMakeLists.txt | 18 +++++++++--------- libraries/midi/src/Midi.cpp | 2 -- .../src/qtscript/ArrayBufferViewClass.cpp | 5 +++-- 9 files changed, 22 insertions(+), 27 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index ccb89e62e9..b460e133c0 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -380,7 +380,6 @@ MyAvatar::MyAvatar(QThread* thread) : MyAvatar::~MyAvatar() { _lookAtTargetAvatar.reset(); - _scriptEngine.reset(); if (_addAvatarEntitiesToTreeTimer.isActive()) { _addAvatarEntitiesToTreeTimer.stop(); } diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.cpp b/interface/src/scripting/AssetMappingsScriptingInterface.cpp index 55c1fc36e6..ffb20cb349 100644 --- a/interface/src/scripting/AssetMappingsScriptingInterface.cpp +++ b/interface/src/scripting/AssetMappingsScriptingInterface.cpp @@ -11,7 +11,6 @@ #include "AssetMappingsScriptingInterface.h" -#include #include #include diff --git a/libraries/animation/CMakeLists.txt b/libraries/animation/CMakeLists.txt index a18f6c2482..d005480a31 100644 --- a/libraries/animation/CMakeLists.txt +++ b/libraries/animation/CMakeLists.txt @@ -1,10 +1,10 @@ set(TARGET_NAME animation) setup_hifi_library(Network) link_hifi_libraries(shared graphics model-serializers script-engine) +include_hifi_library_headers(networking) include_hifi_library_headers(gpu) include_hifi_library_headers(hfm) include_hifi_library_headers(image) -include_hifi_library_headers(networking) target_nsight() diff --git a/libraries/avatars-renderer/CMakeLists.txt b/libraries/avatars-renderer/CMakeLists.txt index dfc1126be5..964af7085e 100644 --- a/libraries/avatars-renderer/CMakeLists.txt +++ b/libraries/avatars-renderer/CMakeLists.txt @@ -1,18 +1,18 @@ set(TARGET_NAME avatars-renderer) setup_hifi_library(Network) link_hifi_libraries(shared shaders gpu graphics animation material-networking model-networking render render-utils image entities-renderer physics recording) -include_hifi_library_headers(audio) include_hifi_library_headers(avatars) -include_hifi_library_headers(entities) -include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h -include_hifi_library_headers(hfm) -include_hifi_library_headers(ktx) -include_hifi_library_headers(model-serializers) include_hifi_library_headers(networking) -include_hifi_library_headers(octree) +include_hifi_library_headers(hfm) +include_hifi_library_headers(model-serializers) +include_hifi_library_headers(ktx) include_hifi_library_headers(procedural) -include_hifi_library_headers(script-engine) +include_hifi_library_headers(audio) +include_hifi_library_headers(entities) +include_hifi_library_headers(octree) include_hifi_library_headers(task) include_hifi_library_headers(workload) +include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h +include_hifi_library_headers(script-engine) target_bullet() diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index d6a0d5e6fa..b2e2b06b87 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -49,7 +49,7 @@ #include #include #include -#include "Scriptable.h" +#include #include #include "AABox.h" diff --git a/libraries/controllers/src/controllers/impl/conditionals/ScriptConditional.cpp b/libraries/controllers/src/controllers/impl/conditionals/ScriptConditional.cpp index bd459ca3ff..277b63ed11 100644 --- a/libraries/controllers/src/controllers/impl/conditionals/ScriptConditional.cpp +++ b/libraries/controllers/src/controllers/impl/conditionals/ScriptConditional.cpp @@ -10,8 +10,6 @@ #include -#include - using namespace controller; bool ScriptConditional::satisfied() { diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt index 3dcf41c845..54e108247a 100644 --- a/libraries/entities-renderer/CMakeLists.txt +++ b/libraries/entities-renderer/CMakeLists.txt @@ -1,19 +1,19 @@ set(TARGET_NAME entities-renderer) setup_hifi_library(Network) link_hifi_libraries(shared workload gpu shaders procedural graphics material-networking model-networking script-engine render render-utils image qml ui pointers entities) -include_hifi_library_headers(animation) +include_hifi_library_headers(networking) +include_hifi_library_headers(gl) +include_hifi_library_headers(ktx) +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(model-serializers) include_hifi_library_headers(avatars) include_hifi_library_headers(controllers) -include_hifi_library_headers(gl) -include_hifi_library_headers(graphics-scripting) # for Forward.h -include_hifi_library_headers(hfm) -include_hifi_library_headers(ktx) -include_hifi_library_headers(model-serializers) -include_hifi_library_headers(networking) -include_hifi_library_headers(octree) -include_hifi_library_headers(physics) include_hifi_library_headers(task) +include_hifi_library_headers(graphics-scripting) # for Forward.h target_bullet() target_polyvox() diff --git a/libraries/midi/src/Midi.cpp b/libraries/midi/src/Midi.cpp index 6300c60453..c9b7b348a8 100644 --- a/libraries/midi/src/Midi.cpp +++ b/libraries/midi/src/Midi.cpp @@ -140,8 +140,6 @@ STATIC_SCRIPT_INITIALIZER(+[](ScriptManager* manager) { scriptEngine->registerGlobalObject("Midi", DependencyManager::get().data()); }); - - void CALLBACK MidiOutProc(HMIDIOUT hmo, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { switch (wMsg) { case MOM_OPEN: diff --git a/libraries/script-engine/src/qtscript/ArrayBufferViewClass.cpp b/libraries/script-engine/src/qtscript/ArrayBufferViewClass.cpp index 90ef563587..e175f753be 100644 --- a/libraries/script-engine/src/qtscript/ArrayBufferViewClass.cpp +++ b/libraries/script-engine/src/qtscript/ArrayBufferViewClass.cpp @@ -16,8 +16,9 @@ Q_DECLARE_METATYPE(QByteArray*) ArrayBufferViewClass::ArrayBufferViewClass(ScriptEngineQtScript* scriptEngine) : QObject(scriptEngine), -QScriptClass(scriptEngine), -_scriptEngine(scriptEngine) { + QScriptClass(scriptEngine), + _scriptEngine(scriptEngine) +{ // Save string handles for quick lookup _bufferName = engine()->toStringHandle(BUFFER_PROPERTY_NAME.toLatin1()); _byteOffsetName = engine()->toStringHandle(BYTE_OFFSET_PROPERTY_NAME.toLatin1());