From dfa6b03a6ba1feb3ef1f1e5da12cee284428bc20 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 1 Jul 2015 14:20:35 -0700 Subject: [PATCH] Making the first statusGetter noitify --- .../src/RenderableModelEntityItem.cpp | 20 ++++++++++++++++++- libraries/render/src/render/Scene.h | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index c5c92837bf..4bbe2cac52 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -229,7 +229,25 @@ void RenderableModelEntityItem::render(RenderArgs* args) { render::PendingChanges pendingChanges; if (_model->needsFixupInScene()) { _model->removeFromScene(scene, pendingChanges); - _model->addToScene(scene, pendingChanges); + + + render::Item::Status::Getter statusGetter = [this] () -> render::Item::Status::Value { + quint64 now = usecTimestampNow(); + /* if (now - entity->getLastEditedFromRemote() < 0.1f * USECS_PER_SECOND) { + return glm::vec4 redColor(1.0f, 0.0f, 0.0f, 1.0f); + renderBoundingBox(entity, args, 0.16f, redColor); + } + */ + /*if (now - this->getLastBroadcast() < 0.2f * USECS_PER_SECOND) { + return 256; + } + return 0;*/ + static int i = 0; + return (i++)%256; + + }; + + _model->addToScene(scene, pendingChanges, statusGetter); } scene->enqueuePendingChanges(pendingChanges); diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h index 75dc92dbdf..02bb03f285 100644 --- a/libraries/render/src/render/Scene.h +++ b/libraries/render/src/render/Scene.h @@ -210,7 +210,7 @@ public: void getValue(glm::vec4& value) { for (unsigned int i = 0; i < value.length(); i++) { if (i < _values.size()) { - value[i] = _values[i]() / 256; + value[i] = _values[i]() / 256.0f; } else { value[i] = 0.0f; }