Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 03:04:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more work on renderable entities

Browse source
This commit is contained in:
ZappoMan 2015-05-27 15:30:55 -07:00
parent 61712a6ac3
commit a56e0d80b6
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,14 +14,10 @@
namespace render {
template <> const ItemKey payloadGetKey(const RenderableEntityItem::Pointer& payload) {
qDebug() << "payloadGetKey()... for payload:" << payload.get();
ItemKey key = ItemKey::Builder::opaqueShape();
qDebug() << " key.isOpaque():" << key.isOpaque();
return key;
return ItemKey::Builder::opaqueShape();
}
template <> const Item::Bound payloadGetBound(const RenderableEntityItem::Pointer& payload) {
qDebug() << "payloadGetBound()... for payload:" << payload.get();
if (payload && payload->entity) {
return payload->entity->getAABox();
}
@ -35,8 +31,13 @@ namespace render {
args->_elementsTouched++;
if (payload && payload->entity) {
qDebug() << "rendering payload!! for entity:" << payload->entity->getEntityItemID();
payload->entity->render(args);
if (payload->entity->getType() == EntityTypes::Box) {
qDebug() << "rendering BOX type for entity:" << payload->entity->getEntityItemID();
payload->entity->render(args);
}
}
}
}
}

7
libraries/entities-renderer/src/RenderableEntityItem.h
View file

@ -15,7 +15,6 @@
#include <render/Scene.h>
#include <EntityItem.h>
class RenderableEntityItem {
public:
RenderableEntityItem(EntityItemPointer entity) : entity(entity) { }
@ -25,4 +24,10 @@ public:
EntityItemPointer entity;
};
namespace render {
template <> const ItemKey payloadGetKey(const RenderableEntityItem::Pointer& payload);
template <> const Item::Bound payloadGetBound(const RenderableEntityItem::Pointer& payload);
template <> void payloadRender(const RenderableEntityItem::Pointer& payload, RenderArgs* args);
}
#endif // hifi_RenderableEntityItem_h