Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 02:55:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

patch review and removal of unnecessary differences

Browse source
This commit is contained in:
Heather Anderson 2021-09-04 03:23:44 -07:00 committed by ksuprynowicz
parent addcd08d1c
commit 06b0ebefac
9 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/MyAvatar.cpp
View file

@ -380,7 +380,6 @@ MyAvatar::MyAvatar(QThread* thread) :
MyAvatar::~MyAvatar() { MyAvatar::~MyAvatar() {
_lookAtTargetAvatar.reset(); _lookAtTargetAvatar.reset();
_scriptEngine.reset();
if (_addAvatarEntitiesToTreeTimer.isActive()) { if (_addAvatarEntitiesToTreeTimer.isActive()) {
_addAvatarEntitiesToTreeTimer.stop(); _addAvatarEntitiesToTreeTimer.stop();
} }

1
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -11,7 +11,6 @@
#include "AssetMappingsScriptingInterface.h" #include "AssetMappingsScriptingInterface.h"
#include <ScriptEngine.h>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QThread> #include <QtCore/QThread>

2
libraries/animation/CMakeLists.txt
View file

@ -1,10 +1,10 @@
set(TARGET_NAME animation) set(TARGET_NAME animation)
setup_hifi_library(Network) setup_hifi_library(Network)
link_hifi_libraries(shared graphics model-serializers script-engine) link_hifi_libraries(shared graphics model-serializers script-engine)
include_hifi_library_headers(networking)
include_hifi_library_headers(gpu) include_hifi_library_headers(gpu)
include_hifi_library_headers(hfm) include_hifi_library_headers(hfm)
include_hifi_library_headers(image) include_hifi_library_headers(image)
include_hifi_library_headers(networking)
target_nsight() target_nsight()

16
libraries/avatars-renderer/CMakeLists.txt
View file

@ -1,18 +1,18 @@
set(TARGET_NAME avatars-renderer) set(TARGET_NAME avatars-renderer)
setup_hifi_library(Network) setup_hifi_library(Network)
link_hifi_libraries(shared shaders gpu graphics animation material-networking model-networking render render-utils image entities-renderer physics recording) 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(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(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(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(task)
include_hifi_library_headers(workload) include_hifi_library_headers(workload)
include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h
include_hifi_library_headers(script-engine)
target_bullet() target_bullet()

2
libraries/avatars/src/AvatarData.h
View file

@ -49,7 +49,7 @@
#include <ViewFrustum.h> #include <ViewFrustum.h>
#include <shared/RateCounter.h> #include <shared/RateCounter.h>
#include <udt/SequenceNumber.h> #include <udt/SequenceNumber.h>
#include "Scriptable.h" #include <Scriptable.h>
#include <ScriptValue.h> #include <ScriptValue.h>
#include "AABox.h" #include "AABox.h"

2
libraries/controllers/src/controllers/impl/conditionals/ScriptConditional.cpp
View file

@ -10,8 +10,6 @@
#include <QtCore/QThread> #include <QtCore/QThread>
#include <ScriptValue.h>
using namespace controller; using namespace controller;
bool ScriptConditional::satisfied() { bool ScriptConditional::satisfied() {

18
libraries/entities-renderer/CMakeLists.txt
View file

@ -1,19 +1,19 @@
set(TARGET_NAME entities-renderer) set(TARGET_NAME entities-renderer)
setup_hifi_library(Network) 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) 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(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(avatars)
include_hifi_library_headers(controllers) 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(task)
include_hifi_library_headers(graphics-scripting) # for Forward.h
target_bullet() target_bullet()
target_polyvox() target_polyvox()

2
libraries/midi/src/Midi.cpp
View file

@ -140,8 +140,6 @@ STATIC_SCRIPT_INITIALIZER(+[](ScriptManager* manager) {
scriptEngine->registerGlobalObject("Midi", DependencyManager::get<Midi>().data()); scriptEngine->registerGlobalObject("Midi", DependencyManager::get<Midi>().data());
}); });
void CALLBACK MidiOutProc(HMIDIOUT hmo, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { void CALLBACK MidiOutProc(HMIDIOUT hmo, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) {
switch (wMsg) { switch (wMsg) {
case MOM_OPEN: case MOM_OPEN:

5
libraries/script-engine/src/qtscript/ArrayBufferViewClass.cpp
View file

@ -16,8 +16,9 @@ Q_DECLARE_METATYPE(QByteArray*)
ArrayBufferViewClass::ArrayBufferViewClass(ScriptEngineQtScript* scriptEngine) : ArrayBufferViewClass::ArrayBufferViewClass(ScriptEngineQtScript* scriptEngine) :
QObject(scriptEngine), QObject(scriptEngine),
QScriptClass(scriptEngine), QScriptClass(scriptEngine),
_scriptEngine(scriptEngine) { _scriptEngine(scriptEngine)
{
// Save string handles for quick lookup // Save string handles for quick lookup
_bufferName = engine()->toStringHandle(BUFFER_PROPERTY_NAME.toLatin1()); _bufferName = engine()->toStringHandle(BUFFER_PROPERTY_NAME.toLatin1());
_byteOffsetName = engine()->toStringHandle(BYTE_OFFSET_PROPERTY_NAME.toLatin1()); _byteOffsetName = engine()->toStringHandle(BYTE_OFFSET_PROPERTY_NAME.toLatin1());