Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:01:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

working on build errors

Browse source
This commit is contained in:
SamGondelman 2019-01-28 21:10:24 -08:00
parent 6ad0b3412a
commit a8dbe5e761
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -617,6 +617,8 @@ public:
switch (type) { switch (type) {
case NestableType::Entity: case NestableType::Entity:
return getEntityModelProvider(static_cast<EntityItemID>(uuid)); return getEntityModelProvider(static_cast<EntityItemID>(uuid));
case NestableType::Overlay:
return nullptr;
case NestableType::Avatar: case NestableType::Avatar:
return getAvatarModelProvider(uuid); return getAvatarModelProvider(uuid);
} }

2
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -147,6 +147,8 @@ bool WebEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointe
if (_pulseProperties != entity->getPulseProperties()) { if (_pulseProperties != entity->getPulseProperties()) {
return true; return true;
} }
return false;
})) { })) {
return true; return true;
} }

2
libraries/entities/src/EntityItemProperties.cpp
View file

@ -1926,7 +1926,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
properties.setProperty("localEntity", convertScriptValue(engine, getEntityHostType() == entity::HostType::LOCAL)); 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)); properties.setProperty("faceCamera", convertScriptValue(engine, getBillboardMode() == BillboardMode::YAW));
} }
if (!psuedoPropertyFlagsActive || psueudoPropertyFlags.test(EntityPsuedoPropertyFlag::IsFacingAvatar)) { if (!psuedoPropertyFlagsActive || psueudoPropertyFlags.test(EntityPsuedoPropertyFlag::IsFacingAvatar)) {

2
scripts/system/libraries/WebTablet.js
View file

@ -196,7 +196,7 @@ WebTablet = function (url, width, dpi, hand, location, visible) {
color: {red: 255, green: 255, blue: 255}, color: {red: 255, green: 255, blue: 255},
solid: true, solid: true,
innerRadius: 0.9, innerRadius: 0.9,
ignoreIntersection: true, ignorePickIntersection: true,
alpha: 0.0, alpha: 0.0,
visible: visible, visible: visible,
drawInFront: false, drawInFront: false,