From a56e0d80b63700a172d5241f3365f773b319ded6 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 27 May 2015 15:30:55 -0700 Subject: [PATCH] more work on renderable entities --- .../entities-renderer/src/RenderableEntityItem.cpp | 13 +++++++------ .../entities-renderer/src/RenderableEntityItem.h | 7 ++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp index d37eb4cff8..5be8f72365 100644 --- a/libraries/entities-renderer/src/RenderableEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp @@ -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); + } } } } } + + diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h index 2c81a31f6e..028bc5efa5 100644 --- a/libraries/entities-renderer/src/RenderableEntityItem.h +++ b/libraries/entities-renderer/src/RenderableEntityItem.h @@ -15,7 +15,6 @@ #include #include - 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