Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 23:56:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

light rendering as payload

Browse source
This commit is contained in:
ZappoMan 2015-06-03 20:46:47 -07:00
parent 6eb9091a01
commit 042384c5e2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,9 +32,7 @@ namespace render {
if (args) { if (args) {
args->_elementsTouched++; args->_elementsTouched++;
if (payload && payload->entity) { if (payload && payload->entity) {
if (payload->entity->getType() != EntityTypes::Model) { payload->entity->render(args);
payload->entity->render(args);
}
} }
} }
} }

4
libraries/entities-renderer/src/RenderableLightEntityItem.h
View file

@ -13,6 +13,7 @@
#define hifi_RenderableLightEntityItem_h #define hifi_RenderableLightEntityItem_h
#include <LightEntityItem.h> #include <LightEntityItem.h>
#include "RenderableEntityItem.h"
class RenderableLightEntityItem : public LightEntityItem { class RenderableLightEntityItem : public LightEntityItem {
public: public:
@ -22,12 +23,13 @@ public:
LightEntityItem(entityItemID, properties) LightEntityItem(entityItemID, properties)
{ } { }
virtual bool canRenderInScene() { return false; } // we don't yet play well with others
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args);
virtual bool supportsDetailedRayIntersection() const { return true; } virtual bool supportsDetailedRayIntersection() const { return true; }
virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face, bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face,
void** intersectedObject, bool precisionPicking) const; void** intersectedObject, bool precisionPicking) const;
SIMPLE_RENDERABLE();
}; };