mirror of
https://github.com/overte-org/overte.git
synced 2025-08-07 00:44:38 +02:00
working on build errors
This commit is contained in:
parent
6ad0b3412a
commit
a8dbe5e761
4 changed files with 6 additions and 2 deletions
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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)) {
|
||||||
|
|
|
@ -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,
|
||||||
|
|
Loading…
Reference in a new issue