From 309dd4195eaa99993a383d28fbd3cf13b74f6d6a Mon Sep 17 00:00:00 2001 From: Jonathan Fransson Date: Fri, 10 May 2019 10:27:46 -0600 Subject: [PATCH] merge --- modules/space/tasks/generatedebrisvolumetask.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/space/tasks/generatedebrisvolumetask.cpp b/modules/space/tasks/generatedebrisvolumetask.cpp index 9f9b2fc5da..b225f84c64 100644 --- a/modules/space/tasks/generatedebrisvolumetask.cpp +++ b/modules/space/tasks/generatedebrisvolumetask.cpp @@ -397,9 +397,11 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal //3. calculate what voxel each debris is within for each time step. // and increment density with one for each debris in that voxel. - - //4. - + rawVolume.forEachVoxel([&](glm::uvec3 cell, float) { + + }); + //4. +