Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 05:34:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

no longer redefining payloadRender method in effort to avoid linux build errors

Browse source
This commit is contained in:
ericrius1 2015-08-03 15:51:11 -07:00
parent 9125b3a2a9
commit 94acb23f27
2 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities-renderer/src/RenderableEntityItem.cpp
View file

@ -18,6 +18,9 @@ namespace render {
if (payload->entity->getType() == EntityTypes::Light) {
return ItemKey::Builder::light();
}
if (payload && payload->entity->getType() == EntityTypes::PolyLine) {
return ItemKey::Builder::transparentShape();
}
}
return ItemKey::Builder::opaqueShape();
}

26
libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
View file

@ -123,32 +123,6 @@ void RenderablePolyLineEntityItem::updateGeometry() {
}
namespace render {
template <> const ItemKey payloadGetKey(const RenderableEntityItemProxy::Pointer& payload) {
if (payload && payload->entity) {
if (payload->entity->getType() == EntityTypes::Light) {
return ItemKey::Builder::light();
}
}
return ItemKey::Builder::transparentShape();
}
template <> const Item::Bound payloadGetBound(const RenderableEntityItemProxy::Pointer& payload) {
if (payload && payload->entity) {
return payload->entity->getAABox();
}
return render::Item::Bound();
}
template <> void payloadRender(const RenderableEntityItemProxy::Pointer& payload, RenderArgs* args) {
if (args) {
if (payload && payload->entity && payload->entity->getVisible()) {
payload->entity->render(args);
}
}
}
}
void RenderablePolyLineEntityItem::render(RenderArgs* args) {
QWriteLocker lock(&_quadReadWriteLock);