Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-13 04:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more debugging using github compiler runs

Browse source
This commit is contained in:
Heather Anderson 2021-09-03 19:12:54 -07:00 committed by ksuprynowicz
parent 23edfa3747
commit 16c2d76efa
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -48,7 +48,7 @@
const QString GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":true}}";
const QString NOT_GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":false}}";
static void staticScriptInitializer(ScriptManager* manager) {
void staticEntityScriptInitializer(ScriptManager* manager) {
auto scriptEngine = manager->engine().data();
auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
@ -76,7 +76,7 @@ static void staticScriptInitializer(ScriptManager* manager) {
manager->connect(manager, &ScriptManager::releaseEntityPacketSenderMessages, entityScriptingInterface.data(),
&EntityScriptingInterface::releaseEntityPacketSenderMessages, Qt::DirectConnection);
}
STATIC_SCRIPT_INITIALIZER(staticScriptInitializer);
STATIC_SCRIPT_INITIALIZER(staticEntityScriptInitializer);
EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership) :
_entityTree(nullptr),
@ -2433,7 +2433,7 @@ void EntityScriptingInterface::getMeshes(const QUuid& entityID, const ScriptValu
EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
if (!entity) {
qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID;
ScriptValueList args { engine->undefinedValue(), false };
ScriptValueList args{ engine->undefinedValue(), engine->newValue(false) };
callback.call(ScriptValue(), args);
return;
}
@ -2446,7 +2446,7 @@ void EntityScriptingInterface::getMeshes(const QUuid& entityID, const ScriptValu
ScriptValueList args{ resultAsScriptValue, engine->newValue(true) };
callback.call(ScriptValue(), args);
} else {
ScriptValueList args { engine->undefinedValue(), engine->newValue(false) };
ScriptValueList args{ engine->undefinedValue(), engine->newValue(false) };
callback.call(ScriptValue(), args);
}
}

2
libraries/entities/src/EntityScriptingInterface.h
View file

@ -2542,7 +2542,7 @@ protected:
private:
void attachDefaultEventHandlers(ScriptManager* manager); // called on first call to Script.addEventHandler
friend void staticScriptInitializer(ScriptManager* manager);
friend void staticEntityScriptInitializer(ScriptManager* manager);
private slots:
void releaseEntityPacketSenderMessages(bool wait);

2
libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
View file

@ -114,7 +114,7 @@ ScriptValue jsBindCallback(const ScriptValue& value) {
template <typename T>
T this_qobject_cast(ScriptEngine* engine) {
auto context = engine ? engine->currentContext() : nullptr;
return scriptvalue_cast<T>(context ? context->thisObject() : ScriptValue::NullValue);
return scriptvalue_cast<T>(context ? context->thisObject() : engine ? engine->nullValue() : ScriptValue());
}
QString toDebugString(QObject* tmp) {
QString s;

3
libraries/script-engine/CMakeLists.txt
View file

@ -7,7 +7,6 @@ if (NOT ANDROID)
target_quazip()
endif ()
link_hifi_libraries(shaders)
include_hifi_library_headers(networking)
link_hifi_libraries(networking)
include_hifi_library_headers(octree)
include_hifi_library_headers(shared)