From a8dbe5e7619b605e5ebcd055fb5b684ca9630306 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Mon, 28 Jan 2019 21:10:24 -0800 Subject: [PATCH] working on build errors --- interface/src/Application.cpp | 2 ++ libraries/entities-renderer/src/RenderableWebEntityItem.cpp | 2 ++ libraries/entities/src/EntityItemProperties.cpp | 2 +- scripts/system/libraries/WebTablet.js | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 138d415515..6b71c51a6e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -617,6 +617,8 @@ public: switch (type) { case NestableType::Entity: return getEntityModelProvider(static_cast(uuid)); + case NestableType::Overlay: + return nullptr; case NestableType::Avatar: return getAvatarModelProvider(uuid); } diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp index 4403237fb7..ba136256cb 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp @@ -147,6 +147,8 @@ bool WebEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointe if (_pulseProperties != entity->getPulseProperties()) { return true; } + + return false; })) { return true; } diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index fbc897d8ae..9e087c3ac2 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -1926,7 +1926,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool properties.setProperty("localEntity", convertScriptValue(engine, getEntityHostType() == entity::HostType::LOCAL)); } - if (!psuedoPropertyFlagsActive || psueudoPropertyFlags.test(EntityPsuedoPropertyFlag::FaceCamera) && _type != EntityTypes::PolyLine) { + if ((!psuedoPropertyFlagsActive || psueudoPropertyFlags.test(EntityPsuedoPropertyFlag::FaceCamera)) && _type != EntityTypes::PolyLine) { properties.setProperty("faceCamera", convertScriptValue(engine, getBillboardMode() == BillboardMode::YAW)); } if (!psuedoPropertyFlagsActive || psueudoPropertyFlags.test(EntityPsuedoPropertyFlag::IsFacingAvatar)) { diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index f29edd8ff9..4178cd4aec 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -196,7 +196,7 @@ WebTablet = function (url, width, dpi, hand, location, visible) { color: {red: 255, green: 255, blue: 255}, solid: true, innerRadius: 0.9, - ignoreIntersection: true, + ignorePickIntersection: true, alpha: 0.0, visible: visible, drawInFront: false,