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

allow entities to have multiple items

Browse source
This commit is contained in:
ZappoMan 2015-05-27 21:00:20 -07:00
parent 5ad9efbee4
commit 3f14a7a262
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,11 +98,13 @@ void EntityTreeRenderer::clear() {
qDebug() << "EntityTreeRenderer::clear() need to clear the scene... ";
render::Scene::PendingChanges pendingChanges;
QHashIterator<EntityItemID, render::ItemID> i(_entityToSceneItems);
while (i.hasNext()) {
i.next();
render::ItemID renderItem = i.value();
pendingChanges.removeItem(renderItem);
QList<EntityItemID> keys = _entityToSceneItems.uniqueKeys();
for (auto key : keys) {
QList<render::ItemID> values = _entityToSceneItems.values(key);
for (auto renderItem : values) {
pendingChanges.removeItem(renderItem);
}
}
_entityToSceneItems.clear();
_viewState->getMain3DScene()->enqueuePendingChanges(pendingChanges);
@ -1073,8 +1075,11 @@ void EntityTreeRenderer::deletingEntity(const EntityItemID& entityID) {
render::Scene::PendingChanges pendingChanges;
if (_entityToSceneItems.contains(entityID)) {
render::ItemID renderItem = _entityToSceneItems[entityID];
pendingChanges.removeItem(renderItem);
QList<render::ItemID> values = _entityToSceneItems.values(entityID);
for (render::ItemID renderItem : values) {
pendingChanges.removeItem(renderItem);
}
_viewState->getMain3DScene()->enqueuePendingChanges(pendingChanges);
}
}
@ -1087,7 +1092,7 @@ void EntityTreeRenderer::addingEntity(const EntityItemID& entityID) {
if (entity->canRenderInScene()) {
render::Scene::PendingChanges pendingChanges;
render::ItemID renderItem = _viewState->getMain3DScene()->allocateID();
_entityToSceneItems[entityID] = renderItem;
_entityToSceneItems.insert(entityID, renderItem);
auto renderData = RenderableEntityItem::Pointer(new RenderableEntityItem(entity));
auto renderPayload = render::PayloadPointer(new RenderableEntityItem::Payload(renderData));

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

@ -187,7 +187,7 @@ private:
float _previousStageHour;
int _previousStageDay;
QHash<EntityItemID, render::ItemID> _entityToSceneItems;
QMultiHash<EntityItemID, render::ItemID> _entityToSceneItems;
};