Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 20:56:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash in Particle Entities and pendingChanges.updateItem()

Browse source
This commit is contained in:
ZappoMan 2015-07-28 14:56:38 -07:00
parent 31bce8a50e
commit c15161b71a
4 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -3482,7 +3482,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
pendingChanges.resetItem(WorldBoxRenderData::_item, worldBoxRenderPayload); pendingChanges.resetItem(WorldBoxRenderData::_item, worldBoxRenderPayload);
} else { } else {
pendingChanges.updateItem<WorldBoxRenderData>(WorldBoxRenderData::_item, pendingChanges.updateItem<WorldBoxRenderData>(WorldBoxRenderData::_item,
[](WorldBoxRenderData& payload) { [](WorldBoxRenderData& payload) {
payload._val++; payload._val++;

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

@ -93,7 +93,6 @@ void EntityTreeRenderer::clear() {
auto scene = _viewState->getMain3DScene(); auto scene = _viewState->getMain3DScene();
render::PendingChanges pendingChanges; render::PendingChanges pendingChanges;
foreach(auto entity, _entitiesInScene) { foreach(auto entity, _entitiesInScene) {
entity->removeFromScene(entity, scene, pendingChanges); entity->removeFromScene(entity, scene, pendingChanges);
} }

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

@ -174,7 +174,6 @@ uint32_t toRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
} }
void RenderableParticleEffectEntityItem::updateRenderItem() { void RenderableParticleEffectEntityItem::updateRenderItem() {
if (!_scene) { if (!_scene) {
return; return;
} }
@ -212,8 +211,7 @@ void RenderableParticleEffectEntityItem::updateRenderItem() {
} }
render::PendingChanges pendingChanges; render::PendingChanges pendingChanges;
pendingChanges.updateItem<ParticlePayload>(_renderItemId, [&](ParticlePayload& payload) { pendingChanges.updateItem<ParticlePayload>(_renderItemId, [this](ParticlePayload& payload) {
// update vertex buffer // update vertex buffer
auto vertexBuffer = payload.getVertexBuffer(); auto vertexBuffer = payload.getVertexBuffer();
size_t numBytes = sizeof(Vertex) * _vertices.size(); size_t numBytes = sizeof(Vertex) * _vertices.size();

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

@ -184,8 +184,8 @@ void Scene::processPendingChangesQueue() {
// Now we know for sure that we have enough items in the array to // Now we know for sure that we have enough items in the array to
// capture anything coming from the pendingChanges // capture anything coming from the pendingChanges
resetItems(consolidatedPendingChanges._resetItems, consolidatedPendingChanges._resetPayloads); resetItems(consolidatedPendingChanges._resetItems, consolidatedPendingChanges._resetPayloads);
removeItems(consolidatedPendingChanges._removedItems);
updateItems(consolidatedPendingChanges._updatedItems, consolidatedPendingChanges._updateFunctors); updateItems(consolidatedPendingChanges._updatedItems, consolidatedPendingChanges._updateFunctors);
removeItems(consolidatedPendingChanges._removedItems);
// ready to go back to rendering activities // ready to go back to rendering activities
_itemsMutex.unlock(); _itemsMutex.unlock();