Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3

Browse source
This commit is contained in:
Seth Alves 2016-05-13 13:33:39 -07:00
commit bfac7c6f68
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -799,13 +799,26 @@ void RenderableModelEntityItem::locationChanged(bool tellPhysics) {
_model->setRotation(getRotation());
_model->setTranslation(getPosition());
auto myMetaItemCopy = _myMetaItem;
void* key = (void*)this;
AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [myMetaItemCopy]() {
std::weak_ptr<RenderableModelEntityItem> weakSelf =
std::static_pointer_cast<RenderableModelEntityItem>(getThisPointer());
AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [weakSelf]() {
auto self = weakSelf.lock();
if (!self) {
return;
}
render::ItemID myMetaItem = self->getMetaRenderItem();
if (myMetaItem == render::Item::INVALID_ITEM_ID) {
return;
}
render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
render::PendingChanges pendingChanges;
pendingChanges.updateItem<RenderableModelEntityItemMeta>(myMetaItemCopy, [](RenderableModelEntityItemMeta& data){});
pendingChanges.updateItem(myMetaItem);
scene->enqueuePendingChanges(pendingChanges);
});
}

2
libraries/entities-renderer/src/RenderableModelEntityItem.h
View file

@ -89,6 +89,8 @@ public:
bool hasRenderAnimation() const { return !_renderAnimationProperties.getURL().isEmpty(); }
const QString& getRenderAnimationURL() const { return _renderAnimationProperties.getURL(); }
render::ItemID getMetaRenderItem() { return _myMetaItem; }
private:
QVariantMap parseTexturesToMap(QString textures);
void remapTextures();

5
libraries/render/src/render/Scene.cpp
View file

@ -157,6 +157,11 @@ void Scene::updateItems(const ItemIDs& ids, UpdateFunctors& functors) {
auto updateFunctor = functors.begin();
for (auto updateID : ids) {
if (updateID == Item::INVALID_ITEM_ID) {
updateFunctor++;
continue;
}
// Access the true item
auto& item = _items[updateID];
auto oldCell = item.getCell();